package DBM::Deep::Array;
-use 5.6.0;
+use 5.006_000;
use strict;
-use warnings;
-
-our $VERSION = '0.99_03';
+use warnings FATAL => 'all';
# This is to allow DBM::Deep::Array to handle negative indices on
# its own. Otherwise, Perl would intercept the call to negative
eval { local $SIG{'__DIE__'}; tied( @{$_[0]} ) } || $_[0]
}
-sub _repr { shift;[ @_ ] }
-
-sub _import {
- my $self = shift;
- my ($struct) = @_;
-
- eval {
- local $SIG{'__DIE__'};
- $self->push( @$struct );
- }; if ($@) {
- $self->_throw_error("Cannot import: type mismatch");
- }
+sub _repr { [] }
- return 1;
-}
sub TIEARRAY {
my $class = shift;
my $args = $class->_get_args( @_ );
$args->{type} = $class->TYPE_ARRAY;
- return $class->_init($args);
+ my $self = $class->_init($args);
+
+# $self->STORESIZE;
+
+ return $self;
}
sub FETCH {
my $self = shift->_get_self;
my ($key) = @_;
+ warn "ARRAY:FETCH( $key )\n" if DBM::Deep::DEBUG;
- $self->lock( $self->LOCK_SH );
+ $self->lock_shared;
- my $orig_key;
- if ( $key =~ /^-?\d+$/ ) {
+ if ( !defined $key ) {
+ $self->unlock;
+ DBM::Deep->_throw_error( "Cannot use an undefined array index." );
+ }
+ elsif ( $key =~ /^-?\d+$/ ) {
if ( $key < 0 ) {
$key += $self->FETCHSIZE;
unless ( $key >= 0 ) {
return;
}
}
- $orig_key = $key;
}
- else {
- $orig_key = undef;
+ elsif ( $key ne 'length' ) {
+ $self->unlock;
+ DBM::Deep->_throw_error( "Cannot use '$key' as an array index." );
}
- my $rv = $self->SUPER::FETCH( $key, $orig_key );
+ my $rv = $self->SUPER::FETCH( $key );
$self->unlock;
sub STORE {
my $self = shift->_get_self;
my ($key, $value) = @_;
+ warn "ARRAY::STORE($self, $key)\n" if DBM::Deep::DEBUG;
- $self->lock( $self->LOCK_EX );
+ $self->lock_exclusive;
my $size;
my $idx_is_numeric;
- if ( $key =~ /^\-?\d+$/ ) {
+ if ( !defined $key ) {
+ $self->unlock;
+ DBM::Deep->_throw_error( "Cannot use an undefined array index." );
+ }
+ elsif ( $key =~ /^-?\d+$/ ) {
$idx_is_numeric = 1;
if ( $key < 0 ) {
$size = $self->FETCHSIZE;
$key += $size
}
}
+ elsif ( $key ne 'length' ) {
+ $self->unlock;
+ DBM::Deep->_throw_error( "Cannot use '$key' as an array index." );
+ }
- my $rv = $self->SUPER::STORE( $key, $value, ($key eq 'length' ? undef : $key) );
+ my $rv = $self->SUPER::STORE( $key, $value );
if ( $idx_is_numeric ) {
$size = $self->FETCHSIZE unless defined $size;
sub EXISTS {
my $self = shift->_get_self;
my ($key) = @_;
+ warn "ARRAY::EXISTS($self, $key)\n" if DBM::Deep::DEBUG;
- $self->lock( $self->LOCK_SH );
+ $self->lock_shared;
- if ( $key =~ /^\-?\d+$/ ) {
+ if ( !defined $key ) {
+ $self->unlock;
+ DBM::Deep->_throw_error( "Cannot use an undefined array index." );
+ }
+ elsif ( $key =~ /^-?\d+$/ ) {
if ( $key < 0 ) {
$key += $self->FETCHSIZE;
unless ( $key >= 0 ) {
}
}
}
+ elsif ( $key ne 'length' ) {
+ $self->unlock;
+ DBM::Deep->_throw_error( "Cannot use '$key' as an array index." );
+ }
my $rv = $self->SUPER::EXISTS( $key );
sub DELETE {
my $self = shift->_get_self;
my ($key) = @_;
+ warn "ARRAY::DELETE($self,$key)\n" if DBM::Deep::DEBUG;
- $self->lock( $self->LOCK_EX );
+ $self->lock_exclusive;
my $size = $self->FETCHSIZE;
- if ( $key =~ /^-?\d+$/ ) {
+ if ( !defined $key ) {
+ $self->unlock;
+ DBM::Deep->_throw_error( "Cannot use an undefined array index." );
+ }
+ elsif ( $key =~ /^-?\d+$/ ) {
if ( $key < 0 ) {
$key += $size;
unless ( $key >= 0 ) {
}
}
}
+ elsif ( $key ne 'length' ) {
+ $self->unlock;
+ DBM::Deep->_throw_error( "Cannot use '$key' as an array index." );
+ }
my $rv = $self->SUPER::DELETE( $key );
if ($rv && $key == $size - 1) {
- $self->STORESIZE( $key, ($key eq 'length' ? undef : $key) );
+ $self->STORESIZE( $key );
}
$self->unlock;
return $rv;
}
+# Now that we have a real Reference sector, we should store arrayzize there. However,
+# arraysize needs to be transactionally-aware, so a simple location to store it isn't
+# going to work.
sub FETCHSIZE {
my $self = shift->_get_self;
+ warn "ARRAY::FETCHSIZE($self)\n" if DBM::Deep::DEBUG;
- $self->lock( $self->LOCK_SH );
+ $self->lock_shared;
- my $SAVE_FILTER = $self->_storage->{filter_fetch_value};
- $self->_storage->{filter_fetch_value} = undef;
+ my $SAVE_FILTER = $self->_engine->storage->{filter_fetch_value};
+ $self->_engine->storage->{filter_fetch_value} = undef;
- my $packed_size = $self->FETCH('length');
+ # If there is no flushing, then things get out of sync.
+# warn "FETCHSIZE BEG: " . $self->_engine->_dump_file;
+ my $size = $self->FETCH('length') || 0;
+# warn "FETCHSIZE AFT: " . $self->_engine->_dump_file;
- $self->_storage->{filter_fetch_value} = $SAVE_FILTER;
+ $self->_engine->storage->{filter_fetch_value} = $SAVE_FILTER;
$self->unlock;
- if ($packed_size) {
- return int(unpack($self->_engine->{long_pack}, $packed_size));
- }
+# warn "FETCHSIZE END: " . $self->_engine->_dump_file;
- return 0;
+ return $size;
}
sub STORESIZE {
my $self = shift->_get_self;
my ($new_length) = @_;
+ warn "ARRAY::STORESIZE($self, $new_length)\n" if DBM::Deep::DEBUG;
- $self->lock( $self->LOCK_EX );
+ $self->lock_exclusive;
- my $SAVE_FILTER = $self->_storage->{filter_store_value};
- $self->_storage->{filter_store_value} = undef;
+ my $SAVE_FILTER = $self->_engine->storage->{filter_store_value};
+ $self->_engine->storage->{filter_store_value} = undef;
- my $result = $self->STORE('length', pack($self->_engine->{long_pack}, $new_length), 'length');
+ my $result = $self->STORE('length', $new_length, 'length');
- $self->_storage->{filter_store_value} = $SAVE_FILTER;
+ $self->_engine->storage->{filter_store_value} = $SAVE_FILTER;
$self->unlock;
sub POP {
my $self = shift->_get_self;
+ warn "ARRAY::POP($self)\n" if DBM::Deep::DEBUG;
- $self->lock( $self->LOCK_EX );
+ $self->lock_exclusive;
my $length = $self->FETCHSIZE();
sub PUSH {
my $self = shift->_get_self;
+ warn "ARRAY::PUSH($self)\n" if DBM::Deep::DEBUG;
- $self->lock( $self->LOCK_EX );
+ $self->lock_exclusive;
my $length = $self->FETCHSIZE();
return $length;
}
+# XXX This really needs to be something more direct within the file, not a
+# fetch and re-store. -RobK, 2007-09-20
+sub _move_value {
+ my $self = shift;
+ my ($old_key, $new_key) = @_;
+
+ return $self->_engine->make_reference( $self, $old_key, $new_key );
+}
+
sub SHIFT {
my $self = shift->_get_self;
+ warn "ARRAY::SHIFT($self)\n" if DBM::Deep::DEBUG;
- $self->lock( $self->LOCK_EX );
+ $self->lock_exclusive;
my $length = $self->FETCHSIZE();
- if ($length) {
- my $content = $self->FETCH( 0 );
+ if ( !$length ) {
+ $self->unlock;
+ return;
+ }
+
+ my $content = $self->DELETE( 0 );
+ # Unless the deletion above has cleared the array ...
+ if ( $length > 1 ) {
for (my $i = 0; $i < $length - 1; $i++) {
- $self->STORE( $i, $self->FETCH($i + 1) );
+ $self->_move_value( $i+1, $i );
}
+
$self->DELETE( $length - 1 );
+ }
- $self->unlock;
+ $self->unlock;
- return $content;
- }
- else {
- $self->unlock;
- return;
- }
+ return $content;
}
sub UNSHIFT {
my $self = shift->_get_self;
+ warn "ARRAY::UNSHIFT($self)\n" if DBM::Deep::DEBUG;
my @new_elements = @_;
- $self->lock( $self->LOCK_EX );
+ $self->lock_exclusive;
my $length = $self->FETCHSIZE();
my $new_size = scalar @new_elements;
if ($length) {
for (my $i = $length - 1; $i >= 0; $i--) {
- $self->STORE( $i + $new_size, $self->FETCH($i) );
+ $self->_move_value( $i, $i+$new_size );
}
+
+# warn "BEFORE: " . $self->_dump_file;
+ $self->STORESIZE( $length + $new_size );
}
+# $self->_engine->flush;
for (my $i = 0; $i < $new_size; $i++) {
$self->STORE( $i, $new_elements[$i] );
}
+ warn "AFTER : " . $self->_dump_file;
$self->unlock;
sub SPLICE {
my $self = shift->_get_self;
+ warn "ARRAY::SPLICE($self)\n" if DBM::Deep::DEBUG;
- $self->lock( $self->LOCK_EX );
+ $self->lock_exclusive;
my $length = $self->FETCHSIZE();
if ( $new_size != $splice_length ) {
if ($new_size > $splice_length) {
for (my $i = $length - 1; $i >= $offset + $splice_length; $i--) {
- $self->STORE( $i + ($new_size - $splice_length), $self->FETCH($i) );
+ $self->_move_value( $i, $i + ($new_size - $splice_length) );
}
+ $self->STORESIZE( $length + $new_size - $splice_length );
}
else {
for (my $i = $offset + $splice_length; $i < $length; $i++) {
- $self->STORE( $i + ($new_size - $splice_length), $self->FETCH($i) );
+ $self->_move_value( $i, $i + ($new_size - $splice_length) );
}
for (my $i = 0; $i < $splice_length - $new_size; $i++) {
$self->DELETE( $length - 1 );
return wantarray ? @old_elements : $old_elements[-1];
}
-# We don't need to define it, yet.
+# We don't need to populate it, yet.
# It will be useful, though, when we split out HASH and ARRAY
sub EXTEND {
+ warn "ARRAY::EXTEND()\n" if DBM::Deep::DEBUG;
##
# Perl will call EXTEND() when the array is likely to grow.
# We don't care, but include it because it gets called at times.
my $length = $self->length();
for (my $index = 0; $index < $length; $index++) {
- my $value = $self->get($index);
- $self->_copy_value( \$db_temp->[$index], $value );
+ $self->_copy_value( \$db_temp->[$index], $self->get($index) );
}
return 1;
projects / dbsrgits/DBM-Deep.git / blobdiff