our $VERSION = q(1.0014);
use Data::Dumper ();
-use Fcntl qw( :flock );
use Scalar::Util ();
use DBM::Deep::Engine;
return bless $self, $class;
}
+sub DESTROY {
+ my $self = shift;
+
+ # If we have an error, don't flush - we might be flushing bad stuff. -RobK, 2008-06-26
+ die $@ if $@;
+
+ #XXX For some reason, this causes an allocation error in the final scope close
+ # of t/08_deephash.t. -RobK, 2008-06-28
+ $self->_get_self->_engine->flush;
+}
+
# This initializer is called from the various TIE* methods. new() calls tie(),
# which allows for a single point of entry.
sub _init {
my $class = shift;
my ($args) = @_;
- $args->{storage} = DBM::Deep::File->new( $args )
- unless exists $args->{storage};
-
# locking implicitly enables autoflush
if ($args->{locking}) { $args->{autoflush} = 1; }
type => TYPE_HASH,
base_offset => undef,
staleness => undef,
-
- storage => undef,
engine => undef,
}, $class;
eval {
local $SIG{'__DIE__'};
- $self->lock;
+ $self->lock_exclusive;
$self->_engine->setup_fh( $self );
- $self->_storage->set_inode;
$self->unlock;
}; if ( $@ ) {
my $e = $@;
return DBM::Deep::Array->TIEARRAY( @_ );
}
-sub lock {
+sub lock_exclusive {
+ my $self = shift->_get_self;
+ return $self->_engine->lock_exclusive( $self );
+}
+*lock = \&lock_exclusive;
+sub lock_shared {
my $self = shift->_get_self;
- return $self->_storage->lock( $self, @_ );
+ return $self->_engine->lock_shared( $self );
}
sub unlock {
my $self = shift->_get_self;
- return $self->_storage->unlock( $self, @_ );
+ return $self->_engine->unlock( $self );
}
sub _copy_value {
my $temp = $self->_repr;
- $self->lock();
+ $self->lock_exclusive;
$self->_copy_node( $temp );
- $self->unlock();
+ $self->unlock;
my $classname = $self->_engine->get_classname( $self );
if ( defined $classname ) {
my $self = shift->_get_self;
#XXX Need to create a new test for this
-# if ($self->_storage->{links} > 1) {
+# if ($self->_engine->storage->{links} > 1) {
# $self->_throw_error("Cannot optimize: reference count is greater than 1");
# }
#XXX Do we have to lock the tempfile?
#XXX Should we use tempfile() here instead of a hard-coded name?
- my $temp_filename = $self->_storage->{file} . '.tmp';
+ my $temp_filename = $self->_engine->storage->{file} . '.tmp';
my $db_temp = DBM::Deep->new(
file => $temp_filename,
type => $self->_type,
)),
);
- $self->lock();
+ $self->lock_exclusive;
$self->_engine->clear_cache;
$self->_copy_node( $db_temp );
- $db_temp->_storage->close;
+ $db_temp->_engine->storage->close;
undef $db_temp;
##
# Attempt to copy user, group and permissions over to new file
##
- $self->_storage->copy_stats( $temp_filename );
+ $self->_engine->storage->copy_stats( $temp_filename );
# q.v. perlport for more information on this variable
if ( $^O eq 'MSWin32' || $^O eq 'cygwin' ) {
# before it is overwritten with rename(). This could be redone
# with a soft copy.
##
- $self->unlock();
- $self->_storage->close;
+ $self->unlock;
+ $self->_engine->storage->close;
}
- if (!rename $temp_filename, $self->_storage->{file}) {
+ if (!rename $temp_filename, $self->_engine->storage->{file}) {
unlink $temp_filename;
- $self->unlock();
+ $self->unlock;
$self->_throw_error("Optimize failed: Cannot copy temp file over original: $!");
}
- $self->unlock();
- $self->_storage->close;
+ $self->unlock;
+ $self->_engine->storage->close;
- $self->_storage->open;
- $self->lock();
+ $self->_engine->storage->open;
+ $self->lock_exclusive;
$self->_engine->setup_fh( $self );
- $self->unlock();
+ $self->unlock;
return 1;
}
type => $self->_type,
base_offset => $self->_base_offset,
staleness => $self->_staleness,
- storage => $self->_storage,
engine => $self->_engine,
);
}
my $func = shift;
if ( $is_legal_filter{$type} ) {
- $self->_storage->{"filter_$type"} = $func;
+ $self->_engine->storage->{"filter_$type"} = $func;
return 1;
}
return $self->{engine};
}
-sub _storage {
- my $self = $_[0]->_get_self;
- return $self->{storage};
-}
-
sub _type {
my $self = $_[0]->_get_self;
return $self->{type};
##
my $self = shift->_get_self;
my ($key, $value) = @_;
- warn "STORE($self, $key, $value)\n" if DEBUG;
+ warn "STORE($self, $key, @{[defined$value?$value:'undef']})\n" if DEBUG;
- unless ( $self->_storage->is_writable ) {
+ unless ( $self->_engine->storage->is_writable ) {
$self->_throw_error( 'Cannot write to a readonly filehandle' );
}
- ##
- # Request exclusive lock for writing
- ##
- $self->lock( LOCK_EX );
+ $self->lock_exclusive;
# User may be storing a complex value, in which case we do not want it run
# through the filtering system.
- if ( !ref($value) && $self->_storage->{filter_store_value} ) {
- $value = $self->_storage->{filter_store_value}->( $value );
+ if ( !ref($value) && $self->_engine->storage->{filter_store_value} ) {
+ $value = $self->_engine->storage->{filter_store_value}->( $value );
}
$self->_engine->write_value( $self, $key, $value);
- $self->unlock();
+ $self->unlock;
return 1;
}
my ($key) = @_;
warn "FETCH($self,$key)\n" if DEBUG;
- ##
- # Request shared lock for reading
- ##
- $self->lock( LOCK_SH );
+ $self->lock_shared;
my $result = $self->_engine->read_value( $self, $key);
- $self->unlock();
+ $self->unlock;
# Filters only apply to scalar values, so the ref check is making
# sure the fetched bucket is a scalar, not a child hash or array.
- return ($result && !ref($result) && $self->_storage->{filter_fetch_value})
- ? $self->_storage->{filter_fetch_value}->($result)
+ return ($result && !ref($result) && $self->_engine->storage->{filter_fetch_value})
+ ? $self->_engine->storage->{filter_fetch_value}->($result)
: $result;
}
my ($key) = @_;
warn "DELETE($self,$key)\n" if DEBUG;
- unless ( $self->_storage->is_writable ) {
+ unless ( $self->_engine->storage->is_writable ) {
$self->_throw_error( 'Cannot write to a readonly filehandle' );
}
- ##
- # Request exclusive lock for writing
- ##
- $self->lock( LOCK_EX );
+ $self->lock_exclusive;
##
# Delete bucket
##
my $value = $self->_engine->delete_key( $self, $key);
- if (defined $value && !ref($value) && $self->_storage->{filter_fetch_value}) {
- $value = $self->_storage->{filter_fetch_value}->($value);
+ if (defined $value && !ref($value) && $self->_engine->storage->{filter_fetch_value}) {
+ $value = $self->_engine->storage->{filter_fetch_value}->($value);
}
- $self->unlock();
+ $self->unlock;
return $value;
}
my ($key) = @_;
warn "EXISTS($self,$key)\n" if DEBUG;
- ##
- # Request shared lock for reading
- ##
- $self->lock( LOCK_SH );
+ $self->lock_shared;
my $result = $self->_engine->key_exists( $self, $key );
- $self->unlock();
+ $self->unlock;
return $result;
}
my $self = shift->_get_self;
warn "CLEAR($self)\n" if DEBUG;
- unless ( $self->_storage->is_writable ) {
+ unless ( $self->_engine->storage->is_writable ) {
$self->_throw_error( 'Cannot write to a readonly filehandle' );
}
- ##
- # Request exclusive lock for writing
- ##
- $self->lock( LOCK_EX );
+ $self->lock_exclusive;
#XXX Rewrite this dreck to do it in the engine as a tight loop vs.
# iterating over keys - such a WASTE - is this required for transactional
$self->STORESIZE( 0 );
}
- $self->unlock();
+ $self->unlock;
return 1;
}
projects / dbsrgits/DBM-Deep.git / blobdiff