Changeset 32578 for main/trunk/greenstone2/perllib/plugins/GreenstoneSQLPlugin.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/plugins/GreenstoneSQLPlugin.pm (modified) (4 diffs)

main/trunk/greenstone2/perllib/plugins/GreenstoneSQLPlugin.pm

@@ -250 +250 @@
     #return undef unless $self->can_process_this_file($file); # NO, DON'T DO THIS (inherited remove_one behaviour) HERE: 
            # WE DON'T CARE IF IT'S AN IMAGE FILE THAT WAS DELETED.
-           # WE CARE ABOUT REMOVING THE DOCOID OF THAT IMAGE FILE FROM THE SQL DB
+           # WE CARE ABOUT REMOVING THE DOC_OID OF THAT IMAGE FILE FROM THE SQL DB
            # SO DON'T RETURN IF CAN'T_PROCESS_THIS_FILE
     
@@ -430 +430 @@
                });
 
-    # try connecting to the mysql db, if that fails it will die
+    # try connecting to the mysql db, die if that fails
     if(!$gs_sql->connect_to_db({
     'db_driver' => $self->{'db_driver'},
@@ -452 +452 @@
     # 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();
     die("Could not use db $db_name. Can't proceed.\n");
     }
@@ -475 +474 @@
     if($self->{'gs_sql'}) { # only want to work with sql db if buildcol.pl, gs_sql won't have
     # a value except during buildcol, so when processor =~ m/buildproc$/.
-    $self->{'gs_sql'}->disconnect_from_db()
-        || warn("Unable to disconnect from database " . $self->{'site_name'} . "\n");
-
-    # explicitly delete gs_sql key (setting key to undef has a different meaning from deleting)
-    # so all future use has to make the connection again
+    $self->{'gs_sql'}->finished();
+
+    # Clear gs_sql (setting key to undef has a different meaning from deleting:
+    # undef makes key still exist but its value is unded whereas delete deletes the key)
+    # So all future use has to make the connection again
     delete $self->{'gs_sql'};
     }