searchidxshard: clear $msgref buffer properly

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

diff --git a/lib/PublicInbox/SearchIdxShard.pm b/lib/PublicInbox/SearchIdxShard.pm
index baf7352a3d9ca36c9c03e9e17da2a31cb1f15ab5..75521b43a4087badcc5daa2bccc5adcd9323956d 100644 (file)
--- a/lib/PublicInbox/SearchIdxShard.pm
+++ b/lib/PublicInbox/SearchIdxShard.pm
@@ -11,14 +11,14 @@ use IO::Handle (); # autoflush
 use PublicInbox::Eml;
 
 sub new {
-       my ($class, $v2writable, $shard) = @_;
-       my $ibx = $v2writable->{-inbox};
+       my ($class, $v2w, $shard) = @_;
+       my $ibx = $v2w->{ibx};
        my $self = $class->SUPER::new($ibx, 1, $shard);
        # create the DB before forking:
-       $self->_xdb_acquire;
-       $self->set_indexlevel;
-       $self->_xdb_release;
-       $self->spawn_worker($v2writable, $shard) if $v2writable->{parallel};
+       $self->idx_acquire;
+       $self->set_metadata_once;
+       $self->idx_release;
+       $self->spawn_worker($v2w, $shard) if $v2w->{parallel};
        $self;
 }
 
@@ -26,8 +26,6 @@ sub spawn_worker {
        my ($self, $v2w, $shard) = @_;
        my ($r, $w);
        pipe($r, $w) or die "pipe failed: $!\n";
-       binmode $r, ':raw';
-       binmode $w, ':raw';
        $w->autoflush(1);
        my $pid = fork;
        defined $pid or die "fork failed: $!\n";
@@ -58,16 +56,14 @@ sub shard_worker_loop ($$$$$) {
                if ($line eq "commit\n") {
                        $self->commit_txn_lazy;
                } elsif ($line eq "close\n") {
-                       $self->_xdb_release;
+                       $self->idx_release;
                } elsif ($line eq "barrier\n") {
                        $self->commit_txn_lazy;
                        # no need to lock < 512 bytes is atomic under POSIX
                        print $bnote "barrier $shard\n" or
                                        die "write failed for barrier $!\n";
-               } elsif ($line =~ /\AD ([a-f0-9]{40,}) (.+)\n\z/s) {
-                       my ($oid, $mid) = ($1, $2);
-                       $self->begin_txn_lazy;
-                       $self->remove_by_oid($oid, $mid);
+               } elsif ($line =~ /\AD ([a-f0-9]{40,}) ([0-9]+)\n\z/s) {
+                       $self->remove_by_oid($1, $2 + 0);
                } else {
                        chomp $line;
                        # n.b. $mid may contain spaces(!)
@@ -93,16 +89,20 @@ sub shard_worker_loop ($$$$$) {
 
 # called by V2Writable
 sub index_raw {
-       my ($self, $msgref, $mime, $smsg) = @_;
+       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)}),
                        "\n", $$msgref or die "failed to write shard $!\n";
        } else {
-               $$msgref = undef;
+               if ($eml) {
+                       undef $$msgref;
+               } else { # --xapian-only + --sequential-shard:
+                       $eml = PublicInbox::Eml->new($msgref);
+               }
                $self->begin_txn_lazy;
-               $self->add_message($mime, $smsg);
+               $self->add_message($eml, $smsg);
        }
 }