Changeset 32578 for main/trunk/greenstone2/perllib/plugouts/GreenstoneSQLPlugout.pm

Timestamp:

2018-11-06T19:26:08+13:00 (5 years ago)

Author:

ak19

Message:

Optimising. The gssql class internally has only one shared connection to the db, making the connection only the first time and disconnecting only when the last gssql is finished(). For keywords: this is implemented using the singleton coding (anti-) pattern. Now each perl process (import or buildcol) will connect to the SQL DB only once, not twice during import where it used to be once for GS SQL plugout and once for GSSQL plugin.

File:

• main/trunk/greenstone2/perllib/plugouts/GreenstoneSQLPlugout.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/plugouts/GreenstoneSQLPlugout.pm

@@ -143 +143 @@
     my $db_params = {
     'collection_name' => $ENV{'GSDLCOLLECTION'},
-    'verbosity' => 1    
+    'verbosity' => 1
     };
 
     my $gs_sql = new gssql($db_params);
     
-    # try connecting to the mysql db, if that fails it will die
-    # so don't bother preparing GreenstoneXMLPlugout by calling superclass' begin()
+    # try connecting to the mysql db, die if that fails
+    # So don't bother preparing GreenstoneXMLPlugout by calling superclass' begin() yet
     if(!$gs_sql->connect_to_db({
     'db_driver' => $self->{'db_driver'},
@@ -181 +181 @@
     # This is fatal for the plugout, let's terminate here after disconnecting again
     # PrintError would already have displayed the warning message on load fail
-    $gs_sql->disconnect_from_db()
-        || warn("Unable to disconnect from database.\n");
+    $gs_sql->force_disconnect_from_db(); # disconnect_from_db() will issue a warning on error
     die("Could not use db $db_name and/or prepare its tables. Can't proceed.\n");
     }
@@ -205 +204 @@
     $self->SUPER::end(@_);    
     
-    $self->{'gs_sql'}->disconnect_from_db() || warn("Unable to disconnect from database " . $self->{'site_name'} . "\n"); # disconnect_from_db() will also issue a warning, but this may be clearer
+    $self->{'gs_sql'}->finished(); # will disconnect from db if last instance
+    delete $self->{'gs_sql'}; # key gs_sql no longer exists, not just the value being undef
 }