cached singletons for most cases. The external reference issue is starting to come...

[dbsrgits/DBM-Deep.git] / lib / DBM / Deep / Hash.pm

diff --git a/lib/DBM/Deep/Hash.pm b/lib/DBM/Deep/Hash.pm
index 9ce962a..a342d62 100644 (file)
--- a/lib/DBM/Deep/Hash.pm
+++ b/lib/DBM/Deep/Hash.pm
@@ -1,11 +1,11 @@
 package DBM::Deep::Hash;
 
-use 5.6.0;
+use 5.006_000;
 
 use strict;
 use warnings;
 
-our $VERSION = q(0.99_03);
+our $VERSION = q(1.0005);
 
 use base 'DBM::Deep';
 
@@ -20,13 +20,8 @@ sub _import {
     my $self = shift;
     my ($struct) = @_;
 
-    eval {
-        local $SIG{'__DIE__'};
-        foreach my $key (keys %$struct) {
-            $self->put($key, $struct->{$key});
-        }
-    }; if ($@) {
-        $self->_throw_error("Cannot import: type mismatch");
+    foreach my $key (keys %$struct) {
+        $self->put($key, $struct->{$key});
     }
 
     return 1;
@@ -46,6 +41,7 @@ sub TIEHASH {
 
 sub FETCH {
     my $self = shift->_get_self;
+    DBM::Deep->_throw_error( "Cannot use an undefined hash key." ) unless defined $_[0];
     my $key = ($self->_storage->{filter_store_key})
         ? $self->_storage->{filter_store_key}->($_[0])
         : $_[0];
@@ -55,7 +51,8 @@ sub FETCH {
 
 sub STORE {
     my $self = shift->_get_self;
-       my $key = ($self->_storage->{filter_store_key})
+    DBM::Deep->_throw_error( "Cannot use an undefined hash key." ) unless defined $_[0];
+    my $key = ($self->_storage->{filter_store_key})
         ? $self->_storage->{filter_store_key}->($_[0])
         : $_[0];
     my $value = $_[1];
@@ -65,7 +62,8 @@ sub STORE {
 
 sub EXISTS {
     my $self = shift->_get_self;
-       my $key = ($self->_storage->{filter_store_key})
+    DBM::Deep->_throw_error( "Cannot use an undefined hash key." ) unless defined $_[0];
+    my $key = ($self->_storage->{filter_store_key})
         ? $self->_storage->{filter_store_key}->($_[0])
         : $_[0];
 
@@ -74,7 +72,8 @@ sub EXISTS {
 
 sub DELETE {
     my $self = shift->_get_self;
-       my $key = ($self->_storage->{filter_store_key})
+    DBM::Deep->_throw_error( "Cannot use an undefined hash key." ) unless defined $_[0];
+    my $key = ($self->_storage->{filter_store_key})
         ? $self->_storage->{filter_store_key}->($_[0])
         : $_[0];
 
@@ -82,45 +81,45 @@ sub DELETE {
 }
 
 sub FIRSTKEY {
-       ##
-       # Locate and return first key (in no particular order)
-       ##
+    ##
+    # Locate and return first key (in no particular order)
+    ##
     my $self = shift->_get_self;
 
-       ##
-       # Request shared lock for reading
-       ##
-       $self->lock( $self->LOCK_SH );
-       
-       my $result = $self->_engine->get_next_key($self->_storage->transaction_id, $self->_base_offset);
-       
-       $self->unlock();
-       
-       return ($result && $self->_storage->{filter_fetch_key})
+    ##
+    # Request shared lock for reading
+    ##
+    $self->lock( $self->LOCK_SH );
+    
+    my $result = $self->_engine->get_next_key( $self );
+    
+    $self->unlock();
+    
+    return ($result && $self->_storage->{filter_fetch_key})
         ? $self->_storage->{filter_fetch_key}->($result)
         : $result;
 }
 
 sub NEXTKEY {
-       ##
-       # Return next key (in no particular order), given previous one
-       ##
+    ##
+    # Return next key (in no particular order), given previous one
+    ##
     my $self = shift->_get_self;
 
-       my $prev_key = ($self->_storage->{filter_store_key})
+    my $prev_key = ($self->_storage->{filter_store_key})
         ? $self->_storage->{filter_store_key}->($_[0])
         : $_[0];
 
-       ##
-       # Request shared lock for reading
-       ##
-       $self->lock( $self->LOCK_SH );
-       
-       my $result = $self->_engine->get_next_key( $self->_storage->transaction_id, $self->_base_offset, $prev_key );
-       
-       $self->unlock();
-       
-       return ($result && $self->_storage->{filter_fetch_key})
+    ##
+    # Request shared lock for reading
+    ##
+    $self->lock( $self->LOCK_SH );
+    
+    my $result = $self->_engine->get_next_key( $self, $prev_key );
+    
+    $self->unlock();
+    
+    return ($result && $self->_storage->{filter_fetch_key})
         ? $self->_storage->{filter_fetch_key}->($result)
         : $result;
 }