searchidxshard: further improve {current_info} readability

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

diff --git a/lib/PublicInbox/SearchIdxShard.pm b/lib/PublicInbox/SearchIdxShard.pm
index ac01340cc658e41f02ede68cd13d838159cc77a3..1333b30529e857b5fb205dc4b24e0c8275b30e66 100644 (file)
--- a/lib/PublicInbox/SearchIdxShard.pm
+++ b/lib/PublicInbox/SearchIdxShard.pm
@@ -75,20 +75,21 @@ sub shard_worker_loop ($$$$$) {
                } elsif ($line =~ /\AD ([a-f0-9]{40,}) ([0-9]+)\n\z/s) {
                        $self->remove_by_oid($1, $2 + 0);
                } elsif ($line =~ s/\A\+X //) {
-                       my ($len, $docid, $xnum, $oid, $eidx_key) =
-                                                       split(/ /, $line, 5);
-                       $self->add_xref3($docid, $xnum, $oid, $eidx_key,
-                                               eml($r, $len));
+                       my ($len, $docid, $oid, $eidx_key) =
+                                                       split(/ /, $line, 4);
+                       $self->add_eidx_info($docid, $oid, $eidx_key,
+                                                       eml($r, $len));
                } elsif ($line =~ s/\A-X //) {
-                       my ($len, $docid, $xnum, $oid, $eidx_key) =
-                                                       split(/ /, $line, 5);
-                       $self->remove_xref3($docid, $xnum, $oid,
-                                               $eidx_key, eml($r, $len));
+                       my ($len, $docid, $oid, $eidx_key) =
+                                                       split(/ /, $line, 4);
+                       $self->remove_eidx_info($docid, $oid, $eidx_key,
+                                                       eml($r, $len));
                } else {
                        chomp $line;
                        my $eidx_key;
-                       if ($line =~ s/\AX(.+)\0//) {
+                       if ($line =~ s/\AX=(.+)\0//) {
                                $eidx_key = $1;
+                               $v2w->{current_info} =~ s/\0/\\0 /;
                        }
                        # n.b. $mid may contain spaces(!)
                        my ($len, $bytes, $num, $oid, $ds, $ts, $tid, $mid)
@@ -113,14 +114,11 @@ sub shard_worker_loop ($$$$$) {
 sub index_raw {
        my ($self, $msgref, $eml, $smsg, $ibx) = @_;
        if (my $w = $self->{w}) {
-               if ($ibx) {
-                       print $w 'X', $ibx->eidx_key, "\0" or die
-                               "failed to write shard: $!\n";
-               }
+               my @ekey = $ibx ? ('X='.$ibx->eidx_key."\0") : ();
                $msgref //= \($eml->as_string);
                $smsg->{raw_bytes} //= length($$msgref);
                # mid must be last, it can contain spaces (but not LF)
-               print $w join(' ', @$smsg{qw(raw_bytes bytes
+               print $w @ekey, join(' ', @$smsg{qw(raw_bytes bytes
                                                num blob ds ts tid mid)}),
                        "\n", $$msgref or die "failed to write shard $!\n";
        } else {
@@ -135,20 +133,20 @@ sub index_raw {
        }
 }
 
-sub shard_add_xref3 {
-       my ($self, $docid, $xnum, $oid, $xibx, $eml) = @_;
+sub shard_add_eidx_info {
+       my ($self, $docid, $oid, $xibx, $eml) = @_;
        my $eidx_key = $xibx->eidx_key;
        if (my $w = $self->{w}) {
                my $hdr = $eml->header_obj->as_string;
                my $len = length($hdr);
-               print $w "+X $len $docid $xnum $oid $eidx_key\n", $hdr or
+               print $w "+X $len $docid $oid $eidx_key\n", $hdr or
                        die "failed to write shard: $!";
        } else {
-               $self->add_xref3($docid, $xnum, $oid, $eidx_key, $eml);
+               $self->add_eidx_info($docid, $oid, $eidx_key, $eml);
        }
 }
 
-sub shard_remove_xref3 {
+sub shard_remove_eidx_info {
        my ($self, $docid, $oid, $xibx, $eml) = @_;
        my $eidx_key = $xibx->eidx_key;
        if (my $w = $self->{w}) {
@@ -157,7 +155,7 @@ sub shard_remove_xref3 {
                print $w "-X $len $docid $oid $eidx_key\n", $hdr or
                        die "failed to write shard: $!";
        } else {
-               $self->remove_xref3($docid, $oid, $eidx_key, $eml);
+               $self->remove_eidx_info($docid, $oid, $eidx_key, $eml);
        }
 }