Changeset 30347 for gs2-extensions/tdb/trunk/perllib/dbutil.pm

Timestamp:

2015-12-10T12:19:20+13:00 (8 years ago)

Author:

jmt12

Message:

Continuing to refactor driver code to move shared code up to parent classes. Have all the basic drivers done...

File:

• gs2-extensions/tdb/trunk/perllib/dbutil.pm (modified) (7 diffs)

gs2-extensions/tdb/trunk/perllib/dbutil.pm

@@ -37 +37 @@
     }
     # Are we running standalone? In which case the INC won't be correct
-    #if (!caller) {
-    # Ensure the INC includes the path to FileUtils.pm
-    unshift(@INC, $ENV{'GSDLHOME'} . '/perllib');
-
-    #}
-    require DBDrivers::GDBM;
-    my $driver = DBDrivers::GDBM->new(1);
+    my $perllib_path = $ENV{'GSDLHOME'} . '/perllib';
+    my $all_inc = join(':', @INC);
+    if ($all_inc !~ /$perllib_path/) {
+    unshift(@INC, $perllib_path);
+    }
 }
 
@@ -240 +238 @@
          'tea' => ['a drink with jam and bread'],
          'doh' => ['which brings us back to']};
+    $test_count = 0;
+    $pass_count = 0;
+    $skip_count = 0;
     print "===== DBUtils Testing Suite =====\n";
     print "For each driver specified, run a battery of tests\n";
@@ -259 +260 @@
     &_addPathsToINC();
     foreach my $driver_name (@drivers) {
-        print "* Testing: " . $driver_name . "\n";
+        my $t1 = [gettimeofday()];
+        print "=== Testing: " . $driver_name . " ===\n";
         my $driver = _loadDBDriver($driver_name);
         my $db_path = $driver->get_infodb_file_path('test','/tmp/');
@@ -274 +276 @@
         &_printTest('writing raw entry', 1);
         # 3. Close handle
-        $driver->close_infodb_handle($db_handle);
-        &_printTest('closing handle', (tell($db_handle) < 1));
+        $driver->close_infodb_write_handle($db_handle);
+        if ($driver->supportsPersistentConnection()) {
+        $test_count += 1;
+        $skip_count += 1;
+        print " - Skipping test as persistent drivers delay 'close'.\n";
+        }
+        else {
+        &_printTest('closing handle', (tell($db_handle) < 1));
+        }
         # 4a. Read entry
         my $data3 = $driver->read_infodb_entry($db_path, 'Alpha');
@@ -302 +311 @@
         my $db_handle2 = $driver->open_infodb_write_handle($db_path, 'append');
         $driver->delete_infodb_entry($db_handle2, 'Alpha');
-        $driver->close_infodb_handle($db_handle2);
+        $driver->close_infodb_write_handle($db_handle2);
         my $keys2 = {};
         $driver->read_infodb_keys($db_path, $keys2);
@@ -308 +317 @@
         # 8. Remove test db
         #unlink($db_path);
+        my $t2 = [gettimeofday()];
+        my $elapsed1 = tv_interval($t1, $t2);
+        print " - Testing took " . $elapsed1 . " seconds\n";
     }
     print "===== Results =====\n";
@@ -320 +332 @@
     print "Warning! No drivers specified - expected as arguments to call\n";
     }
-    my $t1 = [gettimeofday()];
-    my $elapsed = tv_interval($t0, $t1);
-    print "===== Complete in " . $elapsed . " seconds =====\n";
+    my $t3 = [gettimeofday()];
+    my $elapsed2 = tv_interval($t0, $t3);
+    print "===== Complete in " . $elapsed2 . " seconds =====\n";
     print "\n";
     exit(0);