Changeset 30517 for main/trunk/greenstone2/perllib

Timestamp:

2016-05-09T16:53:48+12:00 (8 years ago)

Author:

ak19

Message:

Fixing incremental-rebuild when the database is gdbm. At this point (see buildcolutils.pm), the code needs to deactivate the collection before calling make_infodatabase(), since otherwise there's a lock on the gdbm database which prevents successful incremental-rebuild and activation.

Location:

main/trunk/greenstone2/perllib

Files:

• DBDrivers/BaseDBDriver.pm (modified) (2 diffs)
• DBDrivers/JDBM.pm (modified) (1 diff)
• basebuilder.pm (modified) (1 diff)
• buildcolutils.pm (modified) (3 diffs)
• dbutil.pm (modified) (1 diff)
• extrabuilder.pm (modified) (1 diff)
• inexport.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/DBDrivers/BaseDBDriver.pm

@@ -57 +57 @@
     $self->{'supports_persistentconnection'} = 0;
     $self->{'supports_rss'} = 0;
+    $self->{'supports_concurrent_read_and_write'} = 0;
     $self->{'supports_set'} = 0;
     $self->{'write_only'} = 0; # Some drivers are one way - i.e. STDOUTXML
@@ -383 +384 @@
 
 
+## @function supportsConcurrentReadAndWrite(void)  => integer
+#
+sub supportsConcurrentReadAndWrite 
+{
+    my $self = shift(@_);
+    return $self->{'supports_concurrent_read_and_write'};
+}
+## supportsConcurrentReadAndWrite(void) => integer ##
+
+
 ## @function supportsSet(void) => integer
 #

main/trunk/greenstone2/perllib/DBDrivers/JDBM.pm

@@ -50 +50 @@
     my $self = DBDrivers::70HyphenFormat->new(@_);
     $self->{'default_file_extension'} = 'jdb';
+    $self->{'supports_concurrent_read_and_write'} = 1;
 
     # Executables need a little extra work since we are using Java

main/trunk/greenstone2/perllib/basebuilder.pm

@@ -397 +397 @@
 }
 
+# By default, builders do support make_infodatabase()
+sub supports_make_infodatabase {
+    return 1;
+}
 
 

main/trunk/greenstone2/perllib/buildcolutils.pm

@@ -674 +674 @@
     #   processor [jmt12]
     map { local $_=$_; $_->build_indexes($indexname, $indexlevel); } @builders;
-    map { local $_=$_; $_->make_infodatabase(); }  @builders;
+
+    # when incrementally rebuilding a collection using a gdbm database, need to 
+    # deactivate the collecitob before make_infodatabase()
+    map { 
+    local $_=$_; 
+
+    if($_->supports_make_infodatabase()) {
+        my $infodbtype = $_->{'infodbtype'};
+        my $dbSupportsConcurrentRW = &dbutil::supportsConcurrentReadAndWrite($infodbtype);
+    
+        if(!$dbSupportsConcurrentRW) {
+        #$self->{'justdeactivate'} = 1;
+        #$self->activate_collection();
+        #$self->{'justdeactivate'} = 0;
+        $self->activate_collection("just_deactivate");      
+        }
+        $_->make_infodatabase();        
+    }
+
+    }  @builders;
+
     map { local $_=$_; $_->collect_specific(); } @builders;
   }
@@ -759 +779 @@
 sub activate_collection
 {
-  my $self = shift(@_);
+  my $self = shift(@_);  
+  my $activation_cmd = shift(@_);
+  my($just_activate, $just_deactivate);
+  if(defined $activation_cmd) {
+      $just_deactivate = 1 if($activation_cmd eq "just_deactivate");
+      $just_activate = 1 if($activation_cmd eq "just_activate");
+      if($activation_cmd eq "just_deactivate_and_activate") {
+      $just_deactivate = 1;
+      $just_activate = 1;
+      }
+  }
+
   # if buildcol.pl was run with -activate, need to run activate.pl
   # now that building's complete
@@ -773 +804 @@
     push(@activate_argv, '-keepold') if ($self->{'keepold'});
     push(@activate_argv, '-incremental') if ($self->{'incremental'});
+    push(@activate_argv, '-justactivate') if ($just_activate || $self->{'justactivate'});
+    push(@activate_argv, '-justdeactivate') if ($just_deactivate || $self->{'justdeactivate'});
     my $quoted_argv = join(' ', map { "\"$_\"" } @activate_argv);
     my $activatecol_cmd = '"' . &util::get_perl_exec(). '" -S activate.pl ' . $quoted_argv . ' "' . $self->get_collection() . '"';

main/trunk/greenstone2/perllib/dbutil.pm

@@ -532 +532 @@
 
 
+## @function supportsConcurrentReadAndWrite(string)  => boolean
+#
+sub supportsConcurrentReadAndWrite
+{
+    my $infodb_type = shift(@_);
+    my $driver = _loadDBDriver($infodb_type);
+    return $driver->supportsConcurrentReadAndWrite();
+}
+## supportsConcurrentReadAndWrite(string) => boolean ##
+
+
 ## @function write_infodb_entry(string, *) => void
 #

main/trunk/greenstone2/perllib/extrabuilder.pm

@@ -113 +113 @@
 }
 
+# for now, orthogonalbuilder subclasses don't support/require make_infodatabase()
+sub supports_make_infodatabase {
+    return 0;
+}
+
 sub make_infodatabase {
     my $self = shift (@_);

main/trunk/greenstone2/perllib/inexport.pm

@@ -1284 +1284 @@
         if ($existing_f =~ m/^$situated_dir/) {
 
-        print STDERR "**** Existing file $existing_f\nis located within\n$situated_dir\n";
+#       print STDERR "**** Existing file $existing_f\nis located within\n$situated_dir\n";
 
         push(@$reindex_files,$existing_f);