www: improve navigation around contemporary threads

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

diff --git a/lib/PublicInbox/SearchIdxShard.pm b/lib/PublicInbox/SearchIdxShard.pm
index 20077e08fa2edc13ef17926d7bc55789559f628d..f23d23d06f4772b2db98afc909fcb29792baeae1 100644 (file)
--- a/lib/PublicInbox/SearchIdxShard.pm
+++ b/lib/PublicInbox/SearchIdxShard.pm
@@ -1,7 +1,7 @@
 # Copyright (C) 2018-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
-# used to interface with a single Xapian shard in V2 repos.
+# Internal interface for a single Xapian shard in V2 inboxes.
 # See L<public-inbox-v2-format(5)> for more info on how we shard Xapian
 package PublicInbox::SearchIdxShard;
 use strict;
@@ -47,6 +47,7 @@ sub spawn_worker {
        close $r or die "failed to close: $!";
 }
 
+# this reads all the writes to $self->{w} from the parent process
 sub shard_worker_loop ($$$$$) {
        my ($self, $v2w, $r, $shard, $bnote) = @_;
        $0 = "pi-v2-shard[$shard]";
@@ -67,8 +68,8 @@ sub shard_worker_loop ($$$$$) {
                } else {
                        chomp $line;
                        # n.b. $mid may contain spaces(!)
-                       my ($to_read, $bytes, $num, $blob, $ds, $ts, $mid) =
-                                                       split(/ /, $line, 7);
+                       my ($to_read, $bytes, $num, $blob, $ds, $ts, $tid, $mid)
+                               = split(/ /, $line, 8);
                        $self->begin_txn_lazy;
                        my $n = read($r, my $msg, $to_read) or die "read: $!\n";
                        $n == $to_read or die "short read: $n != $to_read\n";
@@ -78,6 +79,7 @@ sub shard_worker_loop ($$$$$) {
                                num => $num + 0,
                                blob => $blob,
                                mid => $mid,
+                               tid => $tid,
                                ds => $ds,
                                ts => $ts,
                        }, 'PublicInbox::Smsg';
@@ -87,17 +89,16 @@ sub shard_worker_loop ($$$$$) {
        $self->worker_done;
 }
 
-# called by V2Writable
 sub index_raw {
        my ($self, $msgref, $eml, $smsg) = @_;
        if (my $w = $self->{w}) {
                # mid must be last, it can contain spaces (but not LF)
                print $w join(' ', @$smsg{qw(raw_bytes bytes
-                                               num blob ds ts mid)}),
+                                               num blob ds ts tid mid)}),
                        "\n", $$msgref or die "failed to write shard $!\n";
        } else {
                if ($eml) {
-                       $$msgref = undef;
+                       undef $$msgref;
                } else { # --xapian-only + --sequential-shard:
                        $eml = PublicInbox::Eml->new($msgref);
                }
@@ -110,8 +111,7 @@ sub atfork_child {
        close $_[0]->{w} or die "failed to close write pipe: $!\n";
 }
 
-# called by V2Writable:
-sub remote_barrier {
+sub shard_barrier {
        my ($self) = @_;
        if (my $w = $self->{w}) {
                print $w "barrier\n" or die "failed to print: $!";
@@ -120,4 +120,36 @@ sub remote_barrier {
        }
 }
 
+sub shard_commit {
+       my ($self) = @_;
+       if (my $w = $self->{w}) {
+               print $w "commit\n" or die "failed to write commit: $!";
+       } else {
+               $self->commit_txn_lazy;
+       }
+}
+
+sub shard_close {
+       my ($self) = @_;
+       if (my $w = delete $self->{w}) {
+               my $pid = delete $self->{pid} or die "no process to wait on\n";
+               print $w "close\n" or die "failed to write to pid:$pid: $!\n";
+               close $w or die "failed to close pipe for pid:$pid: $!\n";
+               waitpid($pid, 0) == $pid or die "remote process did not finish";
+               $? == 0 or die ref($self)." pid:$pid exited with: $?";
+       } else {
+               die "transaction in progress $self\n" if $self->{txn};
+               $self->idx_release if $self->{xdb};
+       }
+}
+
+sub shard_remove {
+       my ($self, $oid, $num) = @_;
+       if (my $w = $self->{w}) { # triggers remove_by_oid in a shard child
+               print $w "D $oid $num\n" or die "failed to write remove $!";
+       } else { # same process
+               $self->remove_by_oid($oid, $num);
+       }
+}
+
 1;