/[wait]/trunk/lib/WAIT/Table.pm

This is repository of my old source code which isn't updated any more. Go to git.rot13.org for current projects!

Diff of /trunk/lib/WAIT/Table.pm

Parent Directory | Revision Log | View Patch Patch

-cvs-head/lib/WAIT/Table.pm
revision 24 by ulpfr,
Sat Nov 11 17:21:28 2000 UTC
+trunk/lib/WAIT/Table.pm
revision 88 by dpavlin,
Mon May 24 13:44:01 2004 UTC
 Line 4
  # Author          : Ulrich Pfeifer
  # Created On      : Thu Aug  8 13:05:10 1996
  # Last Modified By: Ulrich Pfeifer
- # Last Modified On: Fri May 19 14:51:14 2000
+ # Last Modified On: Sat Apr 27 17:20:31 2002
  # Language        : CPerl
- # Update Count    : 133
+ # Update Count    : 172
  # Status          : Unknown, Use with caution!
  #
  # Copyright (c) 1996-1997, Ulrich Pfeifer
 Line 32 
 require WAIT::Parse::Base;
  use strict;
  use Carp;
  # use autouse Carp => qw( croak($) );
- use DB_File;
+ use BerkeleyDB;
  use Fcntl;
  use LockFile::Simple ();
 Line 159 
 sub new {
    }
    $self->{file}     = $parm{file}     or croak "No file specified";
-   if (-d  $self->{file}){
+   if (-e  $self->{file}){
-     warn "Warning: Directory '$self->{file}' already exists\n";
+     warn "Warning: file '$self->{file}' already exists\n";
-   } elsif (!mkdir($self->{file}, 0775)) {
-     croak "Could not 'mkdir $self->{file}': $!\n";
    }
-   my $lockmgr = LockFile::Simple->make(-autoclean => 1);
-   # aquire a write lock
-   $self->{write_lock} = $lockmgr->lock($self->{file} . '/write')
-     or die "Can't lock '$self->{file}/write'";
    $self->{djk}      = $parm{djk}      if defined $parm{djk};
    $self->{layout}   = $parm{layout} || new WAIT::Parse::Base;
    $self->{access}   = $parm{access} if defined $parm{access};
-Line 178 
 sub new {
+Line 171 
 sub new {
    $self->{indexes}  = {};
    bless $self, $type;
+   # Checking for readers is not necessary, but let's go with the
+   # generic method.
+   $self->getlock(O_RDWR|O_CREAT); # dies when failing
    # Call create_index() and create_index() for compatibility
    for (@{$self->{keyset}||[]}) {
      #carp "Specification of indexes at table create time is deprecated";
-Line 223 
 sub create_index {
+Line 221 
 sub create_index {
    my $name = join '-', @_;
    $self->{indexes}->{$name} =
-     new WAIT::Index file => $self->{file}.'/'.$name, attr => $_;
+     new WAIT::Index file => $self->{file}, name => $name, attr => $_;
  }
  =head2 Creating an inverted index
-Line 323 
 Must be called via C<WAIT::Database::dro
+Line 321 
 Must be called via C<WAIT::Database::dro
  sub drop {
    my $self = shift;
+   unless ($self->{write_lock}){
+     warn "Cannot drop table without write lock. Nothing done";
+     return;
+   }
    if ((caller)[0] eq 'WAIT::Database') { # database knows about this
      $self->close;               # just make sure
      my $file = $self->{file};
      for (values %{$self->{indexes}}) {
        $_->drop;
      }
-     unlink "$file/records";
+     rmdir "$file.read" or warn "Could not rmdir '$file/read'";
-     # $self->unlock;
+     unlink "$file";
-     ! (!-e $file or rmdir $file);
    } else {
      croak ref($self)."::drop called directly";
    }
-Line 372 
 sub open {
+Line 377 
 sub open {
      }
      require WAIT::InvertedIndex;
    }
+   $self->getlock($self->{mode});
+   my $dbmode = ($self->{mode} & O_CREAT) ? DB_CREATE : 0;
    unless (defined $self->{dbh}) {
      if ($USE_RECNO) {
-       $self->{dbh} = tie(@{$self->{db}}, 'DB_File', $file,
+       tie(%{$self->{db}}, 'BerkeleyDB::Recno',
-                          $self->{mode}, 0664, $DB_RECNO);
+           -Filename => $self->{file},
+           -Subname  => 'records',
+           -Flags    => $dbmode);
      } else {
        $self->{dbh} =
-         tie(%{$self->{db}}, 'DB_File', $file,
+         tie(%{$self->{db}}, 'BerkeleyDB::Btree',
-                          $self->{mode}, 0664, $DB_BTREE);
+             -Filename => $self->{file},
+             -Subname  => 'records',
+             -Mode     => 0664,
+             -Flags    => $dbmode);
      }
    }
-   # Locking
-   #
-   # We allow multiple readers to coexists.  But write access excludes
-   # all read access vice versa.  In practice read access on tables
-   # open for writing will mostly work ;-)
-   my $lockmgr = LockFile::Simple->make(-autoclean => 1);
-   # aquire a write lock. We might hold one acquired in create() already
-   $self->{write_lock} ||= $lockmgr->lock($self->{file} . '/write')
-     or die "Can't lock '$self->{file}/write'";
-   my $lockdir = $self->{file} . '/read';
-   unless (-d $lockdir) {
-     mkdir $lockdir, 0755 or die "Could not mkdir $lockdir: $!";
-   }
-   if ($self->{mode} & O_RDWR) {
-     # this is a hack.  We do not check for reopening ...
-     return $self if $self->{write_lock};
-     # If we actually want to write we must check if there are any readers
-     opendir DIR, $lockdir or
-       die "Could not opendir '$lockdir': $!";
-     for my $lockfile (grep { -f "$lockdir/$_" } readdir DIR) {
-       # check if the locks are still valid.
-       # Since we are protected by a write lock, we could use a pline file.
-       # But we want to use the stale testing from LockFile::Simple.
-       if (my $lck = $lockmgr->trylock("$lockdir/$lockfile")) {
-         warn "Removing stale lockfile '$lockdir/$lockfile'";
-         $lck->release;
-       } else {
-         $self->{write_lock}->release;
-         die "Cannot write table '$file' while it's in use";
-       }
-     }
-   } else {
-     # this is a hack.  We do not check for reopening ...
-     return $self if $self->{read_lock};
-     # We are a reader. So we release the write lock
-     my $id = time;
-     while (-f "$lockdir/$id.lock") { # here assume ".lock" format!
-       $id++;
-     }
-     $self->{read_lock} = $lockmgr->lock("$lockdir/$id");
-     $self->{write_lock}->release;
-     delete $self->{write_lock};
-   }
    $self;
  }
-Line 609 
 sub delete {
+Line 574 
 sub delete {
  }
  sub unpack {
-   my $self = shift;
+   my($self, $tuple) = @_;
-   my $tuple = shift;
-   return unless defined $tuple;
+   unless (defined $tuple){
+     # require Carp; # unfortunately gives us "bizarre copy...." :-(((((
+     warn("Debug: somebody called unpack without argument tuple!");
+     return;
+   }
    my $att;
    my @result;
-Line 626 
 sub unpack {
+Line 595 
 sub unpack {
  sub set {
    my ($self, $iattr, $value) = @_;
-   unless ($self->{write_lock}) {
+   unless ($self->{write_lock}){
-     die "Cannot set attribute $iattr without having a write lock. Nothing done";
+     warn "Cannot set iattr[$iattr] without write lock. Nothing done";
+     return;
    }
+   # in the rare case that they haven't written a single record yet, we
+   # make sure, the inverted inherits our $self->{mode}:
+   defined $self->{db} or $self->open;
    for my $att (keys %{$self->{inverted}}) {
-     if ($] > 5.003) {         # avoid bug in perl up to 5.003_05
+     require WAIT::InvertedIndex;
+     if ($^V gt v5.003) {         # avoid bug in perl up to 5.003_05
        my $idx;
        for $idx (@{$self->{inverted}->{$att}}) {
          $idx->set($iattr, $value);
-Line 649 
 sub close {
+Line 625 
 sub close {
    if (exists $self->{'access'}) {
      eval {$self->{'access'}->close}; # dont bother if not opened
    }
-   for (values %{$self->{indexes}}) {
+   if ($WAIT::Index::VERSION) {
-     require WAIT::Index;
+     for (values %{$self->{indexes}}) {
-     $_->close();
+       $_->close();
+     }
    }
-   if (defined $self->{inverted}) {
+   if (defined $self->{inverted} && $WAIT::InvertedIndex::VERSION) {
-     require WAIT::InvertedIndex;
+     # require WAIT::InvertedIndex; Uli: we can avoid closing indexes:
+     # if WAIT::InvertedIndex has not been loaded, they cannot have
+     # been altered so far
      my $att;
      for $att (keys %{$self->{inverted}}) {
        if ($] > 5.003) {         # avoid bug in perl up to 5.003_05
-Line 683 
 sub close {
+Line 662 
 sub close {
 ;
  }
+ # Locking
+ #
+ # We allow multiple readers to coexists.  But write access excludes
+ # all read access and vice versa.  In practice read access on tables
+ # open for writing will mostly work ;-)
+ # If a "write" lock is requested, an existing "read" lock will be
+ # released.  If a "read" lock ist requested, an existing "write" lock
+ # will be released.  Requiring a lock already hold has no effect.
+ sub getlock {
+   my ($self, $mode) = @_;
+   # autoclean cleans on DESTROY, stale sends SIGZERO to the owner
+   #
+   my $lockmgr = LockFile::Simple->make(-autoclean => 1, -stale => 1);
+   my $file    = $self->{file};
+   my $lockdir = $self->{file} . '.read';
+   unless (-d $lockdir) {
+     mkdir $lockdir, 0755 or die "Could not mkdir $lockdir: $!";
+   }
+   if ($mode & O_RDWR) {         # Get a write lock.  Release it again
+                                 # and die if there is any valid
+                                 # readers.
+     # Have a write lock already
+     return $self if $self->{write_lock};
+     if ($self->{read_lock}) {   # We are a becoming a writer now. So
+                                 # we release the read lock to avoid
+                                 # blocking ourselves.
+       $self->{read_lock}->release;
+       delete $self->{read_lock};
+     }
+     # Get the preliminary write lock
+     $self->{write_lock} = $lockmgr->lock($self->{file} . '.write')
+       or die "Can't lock '$self->{file}.write'";
+     # If we actually want to write we must check if there are any
+     # readers.  The write lock is confirmed if wen cannot find any
+     # valid readers.
+     local *DIR;
+     opendir DIR, $lockdir or
+       die "Could not opendir '$lockdir': $!";
+     for my $lockfile (grep { -f "$lockdir/$_" } readdir DIR) {
+       # Check if the locks are still valid.  Since we are protected by
+       # a write lock, we could use a plain file.  But we want to use
+       # the stale testing from LockFile::Simple.
+       if (my $lck = $lockmgr->trylock("$lockdir/$lockfile")) {
+         warn "Removing stale lockfile '$lockdir/$lockfile'";
+         $lck->release;
+       } else {                  # Found an active reader, rats!
+         $self->{write_lock}->release;
+         die "Cannot write table '$file' while it's in use";
+       }
+     }
+     closedir DIR;
+   } else {
+     # Have a read lock already
+     return $self if $self->{read_lock};
+     # Get the preliminary write lock to protect the directory
+     # operations.
+     my $write_lock = $lockmgr->lock($self->{file} . '.read/write')
+       or die "Can't lock '$self->{file}.read/write'";
+     # Find a new read slot.  Maybe the plain file would be better?
+     my $id = time;
+     while (-f "$lockdir/$id.lock") { # here assume ".lock" format!
+       $id++;
+     }
+     $self->{read_lock} = $lockmgr->lock("$lockdir/$id")
+       or die "Can't lock '$lockdir/$id'";
+     # We are a reader now. So we release the write lock
+     $write_lock->release;
+   }
+   return $self;
+ }
  sub unlock {
    my $self = shift;
-Line 704 
 sub unlock {
+Line 769 
 sub unlock {
  sub DESTROY {
    my $self = shift;
-   warn "Table handle destroyed without closing it first"
+   if ($self->{write_lock} || $self->{read_lock}) {
-     if $self->{write_lock} || $self->{read_lock};
+     warn "Table handle destroyed without closing it first";
+     $self->unlock;
+   }
  }
  sub open_scan {

 Legend:



Removed from v.24
 


changed lines


 
Added in v.88
 Legend:



Removed from v.24
 


changed lines


 
Added in v.88
-Removed from v.24
+Added in v.88

	ViewVC Help
Powered by ViewVC 1.1.26