use strict;
use warnings;
+our $VERSION = q(0.99_01);
+
use Fcntl qw( :DEFAULT :flock :seek );
use Digest::MD5 ();
use Scalar::Util ();
use DBM::Deep::Engine;
use DBM::Deep::File;
-use vars qw( $VERSION );
-$VERSION = q(0.99_01);
-
##
# Setup constants for users to pass to new()
##
-sub TYPE_HASH () { DBM::Deep::Engine->SIG_HASH }
-sub TYPE_ARRAY () { DBM::Deep::Engine->SIG_ARRAY }
+sub TYPE_HASH () { DBM::Deep::Engine->SIG_HASH }
+sub TYPE_ARRAY () { DBM::Deep::Engine->SIG_ARRAY }
sub _get_args {
my $proto = shift;
sub commit {
my $self = shift->_get_self;
- # At this point, we need to replay the actions taken
- $self->_fileobj->end_transaction;
+ $self->_fileobj->commit_transaction;
return 1;
}
my $self = shift;
my $base = '';
+ #XXX This if() is redundant
if ( my $parent = $self->{parent} ) {
my $child = $self;
- while ( 1 ) {
+ while ( $parent->{parent} ) {
$base = (
$parent->_type eq TYPE_HASH
? "\{$child->{parent_key}\}"
$child = $parent;
$parent = $parent->{parent};
- last unless $parent;
+ }
+ if ( $base ) {
+ $base = "\$db->get( '$child->{parent_key}' )->" . $base;
+ }
+ else {
+ $base = "\$db->get( '$child->{parent_key}' )";
}
}
- return '$db->' . $base;
+ return $base;
}
sub STORE {
$self->_throw_error( 'Cannot write to a readonly filehandle' );
}
- if ( defined $orig_key ) {
- my $lhs = $self->_find_parent;
- if ( $self->_type eq TYPE_HASH ) {
- $lhs .= "\{$orig_key\}";
- }
- else {
- $lhs .= "\[$orig_key\]";
- }
-
+ #XXX The second condition needs to disappear
+ if ( defined $orig_key && !( $self->_type eq TYPE_ARRAY && $orig_key eq 'length') ) {
my $rhs;
my $r = Scalar::Util::reftype( $value ) || '';
$rhs = "bless $rhs, '$c'";
}
- $self->_fileobj->audit( "$lhs = $rhs;" );
+ my $lhs = $self->_find_parent;
+ if ( $lhs ) {
+ if ( $self->_type eq TYPE_HASH ) {
+ $lhs .= "->\{$orig_key\}";
+ }
+ else {
+ $lhs .= "->\[$orig_key\]";
+ }
+
+ $lhs .= "=$rhs;";
+ }
+ else {
+ $lhs = "\$db->put('$orig_key',$rhs);";
+ }
+
+ $self->_fileobj->audit($lhs);
}
##
##
# Add key/value to bucket list
##
- my $result = $self->{engine}->add_bucket( $tag, $md5, $key, $value, undef, $orig_key );
+ $self->{engine}->add_bucket( $tag, $md5, $key, $value, undef, $orig_key );
$self->unlock();
- return $result;
+ return 1;
}
sub FETCH {
##
$self->lock( LOCK_SH );
- my $tag = $self->{engine}->find_bucket_list( $self->_base_offset, $md5 );
+ my $tag = $self->{engine}->find_bucket_list( $self->_base_offset, $md5 );#, { create => 1 } );
+ #XXX This needs to autovivify
if (!$tag) {
$self->unlock();
return;
if ( defined $orig_key ) {
my $lhs = $self->_find_parent;
- if ( $self->_type eq TYPE_HASH ) {
- $lhs .= "\{$orig_key\}";
+ if ( $lhs ) {
+ $self->_fileobj->audit( "delete $lhs;" );
}
else {
- $lhs .= "\[$orig_key]\]";
+ $self->_fileobj->audit( "\$db->delete('$orig_key');" );
}
-
- $self->_fileobj->audit( "delete $lhs;" );
}
##