Lock: new base class for writable lockers

[public-inbox.git] / lib / PublicInbox / SearchIdx.pm

diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index ccec01811e63a7202a6866f8c730f1e9c997044d..0b9fb4bce101b92dded63034d04b0373f8f59291 100644 (file)
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -9,9 +9,8 @@
 package PublicInbox::SearchIdx;
 use strict;
 use warnings;
-use Fcntl qw(:flock :DEFAULT);
+use base qw(PublicInbox::Search PublicInbox::Lock);
 use PublicInbox::MIME;
-use base qw(PublicInbox::Search);
 use PublicInbox::MID qw/mid_clean id_compress mid_mime mids references/;
 use PublicInbox::MsgIter;
 use Carp qw(croak);
@@ -96,7 +95,7 @@ sub _xdb_release {
        my ($self) = @_;
        my $xdb = delete $self->{xdb} or croak 'not acquired';
        $xdb->close;
-       _lock_release($self) if $self->{creat};
+       $self->lock_release if $self->{creat};
        undef;
 }
 
@@ -107,33 +106,13 @@ sub _xdb_acquire {
        my $flag = Search::Xapian::DB_OPEN;
        if ($self->{creat}) {
                require File::Path;
-               _lock_acquire($self);
+               $self->lock_acquire;
                File::Path::mkpath($dir);
                $flag = Search::Xapian::DB_CREATE_OR_OPEN;
        }
        $self->{xdb} = Search::Xapian::WritableDatabase->new($dir, $flag);
 }
 
-# we only acquire the flock if creating or reindexing;
-# PublicInbox::Import already has the lock on its own.
-sub _lock_acquire {
-       my ($self) = @_;
-       croak 'already locked' if $self->{lockfh};
-       my $lock_path = $self->{lock_path} or return;
-       sysopen(my $lockfh, $lock_path, O_WRONLY|O_CREAT) or
-               die "failed to open lock $lock_path: $!\n";
-       flock($lockfh, LOCK_EX) or die "lock failed: $!\n";
-       $self->{lockfh} = $lockfh;
-}
-
-sub _lock_release {
-       my ($self) = @_;
-       return unless $self->{lock_path};
-       my $lockfh = delete $self->{lockfh} or croak 'not locked';
-       flock($lockfh, LOCK_UN) or die "unlock failed: $!\n";
-       close $lockfh or die "close failed: $!\n";
-}
-
 sub add_val ($$$) {
        my ($doc, $col, $num) = @_;
        $num = Search::Xapian::sortable_serialise($num);
@@ -440,6 +419,31 @@ sub remove_message {
        }
 }
 
+# MID is a hint in V2
+sub remove_by_oid {
+       my ($self, $oid, $mid) = @_;
+       my $db = $self->{xdb};
+
+       # XXX careful, we cannot use batch_do here since we conditionally
+       # delete documents based on other factors, so we cannot call
+       # find_doc_ids twice.
+       my ($head, $tail) = $self->find_doc_ids('Q' . $mid);
+       return if $head == $tail;
+
+       # there is only ONE element in @delete unless we
+       # have bugs in our v2writable deduplication check
+       my @delete;
+       for (; $head != $tail; $head->inc) {
+               my $docid = $head->get_docid;
+               my $doc = $db->get_document($docid);
+               my $smsg = PublicInbox::SearchMsg->wrap($doc, $mid);
+               $smsg->load_expand;
+               push(@delete, $docid) if $smsg->{blob} eq $oid;
+       }
+       $db->delete_document($_) foreach @delete;
+       scalar(@delete);
+}
+
 sub term_generator { # write-only
        my ($self) = @_;
 
@@ -896,4 +900,11 @@ sub remote_close {
        $? == 0 or die ref($self)." pid:$pid exited with: $?";
 }
 
+# triggers remove_by_oid in partition or skeleton
+sub remote_remove {
+       my ($self, $oid, $mid) = @_;
+       print { $self->{w} } "D $oid $mid\n" or
+                       die "failed to write remove $!";
+}
+
 1;