r14427@Rob-Kinyons-PowerBook: rob | 2006-06-19 09:14:51 -0400

 Checking to fix SVK

diff --git a/lib/DBM/Deep.pm b/lib/DBM/Deep.pm
index a8a405f..29ead30 100644 (file)
--- a/lib/DBM/Deep.pm
+++ b/lib/DBM/Deep.pm
@@ -419,6 +419,7 @@ sub _find_parent {
             $child = $parent;
             $parent = $parent->{parent};
         }
+
         if ( $base ) {
             $base = "\$db->get( q{$child->{parent_key}} )->" . $base;
         }

diff --git a/lib/DBM/Deep/Engine.pm b/lib/DBM/Deep/Engine.pm
index d6ba021..bfbd594 100644 (file)
--- a/lib/DBM/Deep/Engine.pm
+++ b/lib/DBM/Deep/Engine.pm
@@ -1,5 +1,7 @@
 package DBM::Deep::Engine;
 
+use Sub::Caller qw( load_tag );
+
 use 5.6.0;
 
 use strict;
@@ -359,6 +361,7 @@ sub load_tag {
     ##
     my $self = shift;
     my ($offset) = @_;
+    print join(":",caller) . " - load_tag($offset)\n" if $::DEBUG;
 
     my $storage = $self->_storage;
 

diff --git a/lib/DBM/Deep/Engine2.pm b/lib/DBM/Deep/Engine2.pm
index 5972099..f88a224 100644 (file)
--- a/lib/DBM/Deep/Engine2.pm
+++ b/lib/DBM/Deep/Engine2.pm
@@ -39,7 +39,6 @@ sub read_value {
     my $self = shift;
     my ($trans_id, $base_offset, $key) = @_;
     
-#    print "Trying to read $key from $base_offset ($trans_id)\n" if $key > 400;
     my ($_val_offset, $_is_del) = $self->_find_value_offset({
         offset     => $base_offset,
         trans_id   => $trans_id,
@@ -65,6 +64,7 @@ sub read_value {
     return $self->_read_value({
         keyloc => $key_tag->{start},
         offset => $val_offset,
+        key    => $key,
     });
 }
 
@@ -126,6 +126,8 @@ sub get_next_key {
         };
     }
 
+    local $::DEBUG = 1;
+    print "get_next_key: $_val_offset\n" if $::DEBUG;
     return $self->traverse_index( $temp, $_val_offset, 0 );
 }
 
@@ -318,7 +320,6 @@ sub _find_key_offset {
 
     # Need to create a new keytag, too
     if ( $bucket_tag->{is_new} ) {
-#        print "Creating new keytag\n";
         my $keytag_loc = $self->_storage->request_space(
             $self->tag_size( $self->{keyloc_size} ),
         );
@@ -354,7 +355,6 @@ sub _find_key_offset {
         # If we have a subloc to return or we don't want to create a new
         # entry, we need to return now.
         $args->{create} ||= 0;
-#        print "Found ($subloc) at $index ($args->{create})\n";
         return ($self->load_tag( $subloc ), $bucket_tag) if $subloc || !$args->{create};
 
         my $keytag_loc = $self->_storage->request_space(
@@ -363,7 +363,6 @@ sub _find_key_offset {
 
         # There's space left in this bucket
         if ( defined $index ) {
-#            print "There's space left in the bucket for $keytag_loc\n";
             substr( $bucket_tag->{content}, $index * $self->{key_size}, $self->{key_size} ) =
                 $args->{key_md5} . pack( "$self->{long_pack}", $keytag_loc );
 
@@ -371,7 +370,6 @@ sub _find_key_offset {
         }
         # We need to split the index
         else {
-#            print "Splitting the index for $keytag_loc\n";
             $self->split_index( $bucket_tag, $args->{key_md5}, $keytag_loc );
         }
 
@@ -390,7 +388,7 @@ sub _read_value {
     my $self = shift;
     my ($args) = @_;
 
-    return $self->read_from_loc( $args->{keyloc}, $args->{offset} );
+    return $self->read_from_loc( $args->{keyloc}, $args->{offset}, $args->{key} );
 }
 
 sub _mark_as_deleted {
@@ -527,7 +525,6 @@ sub setup_fh {
             $obj->{base_offset} = $self->_storage->request_space(
                 $self->tag_size( $self->{keyloc_size} ),
             );
-            warn "INITIAL BASE OFFSET: $obj->{base_offset}\n";
 
             my $value_spot = $self->_storage->request_space(
                 $self->tag_size( $self->{index_size} ),
@@ -551,7 +548,6 @@ sub setup_fh {
         }
         else {
             $obj->{base_offset} = $bytes_read;
-            warn "REOPEN BASE OFFSET: $obj->{base_offset}\n";
 
             my ($_val_offset, $_is_del) = $self->_find_value_offset({
                 offset     => $obj->{base_offset},

diff --git a/lib/DBM/Deep/File.pm b/lib/DBM/Deep/File.pm
index 6b70adb..ebd0e84 100644 (file)
--- a/lib/DBM/Deep/File.pm
+++ b/lib/DBM/Deep/File.pm
@@ -146,6 +146,7 @@ sub print_at {
 sub read_at {
     my $self = shift;
     my ($loc, $size) = @_;
+    print join(":",caller) . " - read_at(@{[$loc || 'undef']}, $size)\n" if $::DEBUG;
 
     local ($/,$\);
 

diff --git a/t/11_optimize.t b/t/11_optimize.t
index 9fef32b..523c994 100644 (file)
--- a/t/11_optimize.t
+++ b/t/11_optimize.t
@@ -70,7 +70,7 @@ SKIP: {
     # first things first, get us about 1000 keys so the optimize() will take 
     # at least a few seconds on any machine, and re-open db with locking
     ##
-    for (1..1000) { $db->STORE( $_, $_ ); }
+    for (11..11) { $db->STORE( $_, $_ +1 ); }
     undef $db;
 
     ##
@@ -93,7 +93,7 @@ SKIP: {
 
         exit( 0 );
     }
-
+=pod
     # parent fork
     ok( defined($pid), "fork was successful" ); # make sure fork was successful
     
@@ -103,7 +103,7 @@ SKIP: {
         autoflush => 1,
         locking => 1
     );
-    
+
     # sleep for 1 second to make sure optimize() is running in the other fork
     sleep(1);
     
@@ -123,4 +123,5 @@ SKIP: {
     # now check some existing values from before
     is( $db->{key1}, 'value1', "key1's value is still there after optimize" );
     is( $db->{a}{c}, 'value2', "key2's value is still there after optimize" );
+=cut
 }