Merge remote-tracking branch 'origin/lei' into eidx

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

diff --git a/lib/PublicInbox/SearchIdxShard.pm b/lib/PublicInbox/SearchIdxShard.pm
index ee00858b0a32d3cc0fa50cc95abd70120231586c..87b0bad62ed2ab5ae47f138460fd9730e4e9d255 100644 (file)
--- a/lib/PublicInbox/SearchIdxShard.pm
+++ b/lib/PublicInbox/SearchIdxShard.pm
@@ -69,33 +69,37 @@ sub shard_worker_loop ($$$$$) {
        $0 = "shard[$shard]";
        $self->begin_txn_lazy;
        while (my $line = readline($r)) {
+               chomp $line;
                $v2w->{current_info} = "[$shard] $line";
-               if ($line eq "commit\n") {
+               if ($line eq 'commit') {
                        $self->commit_txn_lazy;
-               } elsif ($line eq "close\n") {
+               } elsif ($line eq 'close') {
                        $self->idx_release;
-               } elsif ($line eq "barrier\n") {
+               } elsif ($line eq 'barrier') {
                        $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 ([0-9]+)\n\z/s) {
+               } elsif ($line =~ /\AD ([0-9]+)\z/s) {
                        $self->remove_by_docid($1 + 0);
                } elsif ($line =~ s/\A\+X //) {
                        my ($len, $docid, $eidx_key) = split(/ /, $line, 3);
-                       chomp $eidx_key;
                        $self->add_eidx_info($docid, $eidx_key, eml($r, $len));
                } elsif ($line =~ s/\A-X //) {
                        my ($len, $docid, $eidx_key) = split(/ /, $line, 3);
-                       chomp $eidx_key;
                        $self->remove_eidx_info($docid, $eidx_key,
                                                        eml($r, $len));
-               } elsif ($line =~ s/\AO ([^\n]+)\n//) {
+               } elsif ($line =~ s/\A=K (\d+) //) {
+                       $self->set_keywords($1 + 0, split(/ /, $line));
+               } elsif ($line =~ s/\A-K (\d+) //) {
+                       $self->remove_keywords($1 + 0, split(/ /, $line));
+               } elsif ($line =~ s/\A\+K (\d+) //) {
+                       $self->add_keywords($1 + 0, split(/ /, $line));
+               } elsif ($line =~ s/\AO ([^\n]+)//) {
                        my $over_fn = $1;
                        $over_fn =~ tr/\0/\n/;
                        $self->over_check(PublicInbox::Over->new($over_fn));
                } else {
-                       chomp $line;
                        my $eidx_key;
                        if ($line =~ s/\AX=(.+)\0//) {
                                $eidx_key = $1;
@@ -212,6 +216,33 @@ sub shard_remove {
        }
 }
 
+sub shard_set_keywords {
+       my ($self, $docid, @kw) = @_;
+       if (my $w = $self->{w}) { # triggers remove_by_docid in a shard child
+               print $w "=K $docid @kw\n" or die "failed to write: $!";
+       } else { # same process
+               $self->set_keywords($docid, @kw);
+       }
+}
+
+sub shard_remove_keywords {
+       my ($self, $docid, @kw) = @_;
+       if (my $w = $self->{w}) { # triggers remove_by_docid in a shard child
+               print $w "-K $docid @kw\n" or die "failed to write: $!";
+       } else { # same process
+               $self->remove_keywords($docid, @kw);
+       }
+}
+
+sub shard_add_keywords {
+       my ($self, $docid, @kw) = @_;
+       if (my $w = $self->{w}) { # triggers remove_by_docid in a shard child
+               print $w "+K $docid @kw\n" or die "failed to write: $!";
+       } else { # same process
+               $self->add_keywords($docid, @kw);
+       }
+}
+
 sub shard_over_check {
        my ($self, $over) = @_;
        if (my $w = $self->{w}) { # triggers remove_by_docid in a shard child