lei reindex: new command to reindex lei/store

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

diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm
index c45380d1c647af73e12d1029fbd012af8a80adab..277ed6bdaed7b646325e15bb9871ef0736363aae 100644 (file)
--- a/lib/PublicInbox/LeiStore.pm
+++ b/lib/PublicInbox/LeiStore.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Local storage (cache/memo) for lei(1), suitable for personal/private
@@ -32,6 +32,7 @@ use POSIX ();
 use IO::Handle (); # ->autoflush
 use Sys::Syslog qw(syslog openlog);
 use Errno qw(EEXIST ENOENT);
+use PublicInbox::Syscall qw(rename_noreplace);
 
 sub new {
        my (undef, $dir, $opt) = @_;
@@ -185,10 +186,7 @@ sub export1_kw_md ($$$$$) {
        my $dst = "$mdir/cur/$bn";
        for my $d (@try) {
                my $src = "$mdir/$d/$orig";
-               if (link($src, $dst)) {
-                       if (!unlink($src) and $! != ENOENT) {
-                               syslog('warning', "unlink($src): $!");
-                       }
+               if (rename_noreplace($src, $dst)) {
                        # TODO: verify oidbin?
                        $self->{lms}->mv_src("maildir:$mdir",
                                        $oidbin, \$orig, $bn);
@@ -196,7 +194,7 @@ sub export1_kw_md ($$$$$) {
                } elsif ($! == EEXIST) { # lost race with "lei export-kw"?
                        return;
                } elsif ($! != ENOENT) {
-                       syslog('warning', "link($src -> $dst): $!");
+                       syslog('warning', "rename_noreplace($src -> $dst): $!");
                }
        }
        for (@try) { return if -e "$mdir/$_/$orig" };
@@ -257,21 +255,16 @@ sub remove_eml_vmd { # remove just the VMD
 
 sub _lms_rw ($) { # it is important to have eidx processes open before lms
        my ($self) = @_;
-       my ($eidx, $tl) = eidx_init($self);
-       $self->{lms} //= do {
+       $self->{lms} // do {
                require PublicInbox::LeiMailSync;
+               my ($eidx, $tl) = eidx_init($self);
                my $f = "$self->{priv_eidx}->{topdir}/mail_sync.sqlite3";
                my $lms = PublicInbox::LeiMailSync->new($f);
                $lms->lms_write_prepare;
-               $lms;
+               $self->{lms} = $lms;
        };
 }
 
-sub set_sync_info {
-       my ($self, $oidhex, $folder, $id) = @_;
-       _lms_rw($self)->set_src(pack('H*', $oidhex), $folder, $id);
-}
-
 sub _remove_if_local { # git->cat_async arg
        my ($bref, $oidhex, $type, $size, $self) = @_;
        $self->{im}->remove($bref) if $bref;
@@ -342,6 +335,36 @@ sub _docids_and_maybe_kw ($$) {
        ($docids, [ sort keys %$kw ]);
 }
 
+sub _reindex_1 { # git->cat_async callback
+       my ($bref, $hex, $type, $size, $smsg) = @_;
+       my ($self, $eidx, $tl) = delete @$smsg{qw(-self -eidx -tl)};
+       $bref //= _lms_rw($self)->local_blob($hex, 1);
+       if ($bref) {
+               my $eml = PublicInbox::Eml->new($bref);
+               $smsg->{-merge_vmd} = 1; # preserve existing keywords
+               $eidx->idx_shard($smsg->{num})->index_eml($eml, $smsg);
+       } else {
+               warn("E: $type $hex\n");
+       }
+}
+
+sub reindex_art {
+       my ($self, $art) = @_;
+       my ($eidx, $tl) = eidx_init($self);
+       my $smsg = $eidx->{oidx}->get_art($art) // return;
+       return if $smsg->{bytes} == 0; # external-only message
+       @$smsg{qw(-self -eidx -tl)} = ($self, $eidx, $tl);
+       $eidx->git->cat_async($smsg->{blob} // die("no blob (#$art)"),
+                               \&_reindex_1, $smsg);
+}
+
+sub reindex_done {
+       my ($self) = @_;
+       my ($eidx, $tl) = eidx_init($self);
+       $eidx->git->async_wait_all;
+       # ->done to be called via sto_done_request
+}
+
 sub add_eml {
        my ($self, $eml, $vmd, $xoids) = @_;
        my $im = $self->{-fake_im} // $self->importer; # may create new epoch
@@ -351,7 +374,7 @@ sub add_eml {
        $smsg->{-eidx_git} = $eidx->git if !$self->{-fake_im};
        my $im_mark = $im->add($eml, undef, $smsg);
        if ($vmd && $vmd->{sync_info}) {
-               set_sync_info($self, $smsg->{blob}, @{$vmd->{sync_info}});
+               _lms_rw($self)->set_src($smsg->oidbin, @{$vmd->{sync_info}});
        }
        unless ($im_mark) { # duplicate blob returns undef
                return unless wantarray;
@@ -571,6 +594,12 @@ sub recv_and_run {
        $self->SUPER::recv_and_run(@args);
 }
 
+sub _sto_atexit { # dwaitpid callback
+       my ($args, $pid) = @_;
+       my $self = $args->[0];
+       warn "lei/store PID:$pid died \$?=$?\n" if $?;
+}
+
 sub write_prepare {
        my ($self, $lei) = @_;
        $lei // die 'BUG: $lei not passed';
@@ -587,6 +616,7 @@ sub write_prepare {
                                        -err_wr => $w,
                                        to_close => [ $r ],
                                });
+               $self->wq_wait_async(\&_sto_atexit); # outlives $lei
                require PublicInbox::LeiStoreErr;
                PublicInbox::LeiStoreErr->new($r, $lei);
        }