v2writable: support "barrier" operation to avoid reforking

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

diff --git a/lib/PublicInbox/SearchIdxPart.pm b/lib/PublicInbox/SearchIdxPart.pm
index bffa53255f447ab40a6c01a94ba8822f70ce55fc..dd7ace67adcf04b09abb9d217676c4d53f8da3ba 100644 (file)
--- a/lib/PublicInbox/SearchIdxPart.pm
+++ b/lib/PublicInbox/SearchIdxPart.pm
@@ -6,9 +6,9 @@ use warnings;
 use base qw(PublicInbox::SearchIdx);
 
 sub new {
-       my ($class, $v2writable, $part, $threader) = @_;
+       my ($class, $v2writable, $part, $skel) = @_;
        my $self = $class->SUPER::new($v2writable->{-inbox}, 1, $part);
-       $self->{threader} = $threader;
+       $self->{skeleton} = $skel;
        my ($r, $w);
        pipe($r, $w) or die "pipe failed: $!\n";
        binmode $r, ':raw';
@@ -45,12 +45,18 @@ sub partition_worker_loop ($$$) {
                if ($line eq "commit\n") {
                        $xdb->commit_transaction if $txn;
                        $txn = undef;
+                       $self->{skeleton}->remote_commit;
                } elsif ($line eq "close\n") {
                        $self->_xdb_release;
                        $xdb = $txn = undef;
+               } elsif ($line eq "barrier\n") {
+                       $xdb->commit_transaction if $txn;
+                       $txn = undef;
+                       print { $self->{skeleton}->{w} } "barrier $part\n" or
+                                       die "write failed to skeleton: $!\n";
                } else {
                        chomp $line;
-                       my ($len, $artnum, $object_id) = split(/ /, $line);
+                       my ($len, $artnum, $oid, $mid0) = split(/ /, $line);
                        $xdb ||= $self->_xdb_acquire;
                        if (!$txn) {
                                $xdb->begin_transaction;
@@ -59,7 +65,8 @@ sub partition_worker_loop ($$$) {
                        my $n = read($r, my $msg, $len) or die "read: $!\n";
                        $n == $len or die "short read: $n != $len\n";
                        my $mime = PublicInbox::MIME->new(\$msg);
-                       $self->index_blob($mime, $len, $artnum, $object_id);
+                       $artnum = int($artnum);
+                       $self->add_message($mime, $n, $artnum, $oid, $mid0);
                }
        }
        warn "$$ still in transaction\n" if $txn;
@@ -68,9 +75,9 @@ sub partition_worker_loop ($$$) {
 
 # called by V2Writable
 sub index_raw {
-       my ($self, $len, $msgref, $artnum, $object_id) = @_;
+       my ($self, $len, $msgref, $artnum, $object_id, $mid0) = @_;
        my $w = $self->{w};
-       print $w "$len $artnum $object_id\n", $$msgref or die
+       print $w "$len $artnum $object_id $mid0\n", $$msgref or die
                "failed to write partition $!\n";
        $w->flush or die "failed to flush: $!\n";
 }
@@ -79,4 +86,11 @@ sub atfork_child {
        close $_[0]->{w} or die "failed to close write pipe: $!\n";
 }
 
+# called by V2Writable:
+sub barrier {
+       my $w = $_[0]->{w};
+       print $w "barrier\n" or die "failed to print: $!";
+       $w->flush or die "failed to flush: $!";
+}
+
 1;