index|extindex: support --dangerous flag

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

diff --git a/lib/PublicInbox/ExtSearchIdx.pm b/lib/PublicInbox/ExtSearchIdx.pm
index f479cf9e1a3fd4ee42ff9e03eeba26b26c1b1411..7c44a1a406308604c1319b91eaa7130a0be645d2 100644 (file)
--- a/lib/PublicInbox/ExtSearchIdx.pm
+++ b/lib/PublicInbox/ExtSearchIdx.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>
 
 # Detached/external index cross inbox search indexing support
@@ -59,6 +59,7 @@ sub new {
                nproc_shards({ nproc => $opt->{jobs} });
        my $oidx = PublicInbox::OverIdx->new("$self->{xpfx}/over.sqlite3");
        $self->{-no_fsync} = $oidx->{-no_fsync} = 1 if !$opt->{fsync};
+       $self->{-dangerous} = 1 if $opt->{dangerous};
        $self->{oidx} = $oidx;
        $self
 }
@@ -292,8 +293,8 @@ sub ck_existing { # git->cat_async callback
 
 # is the messages visible in the inbox currently being indexed?
 # return the number if so
-sub cur_ibx_xnum ($$) {
-       my ($req, $bref) = @_;
+sub cur_ibx_xnum ($$;$) {
+       my ($req, $bref, $mismatch) = @_;
        my $ibx = $req->{ibx} or die 'BUG: current {ibx} missing';
 
        $req->{eml} = PublicInbox::Eml->new($bref);
@@ -303,6 +304,7 @@ sub cur_ibx_xnum ($$) {
                my ($id, $prev);
                while (my $x = $ibx->over->next_by_mid($mid, \$id, \$prev)) {
                        return $x->{num} if $x->{blob} eq $req->{oid};
+                       push @$mismatch, $x if $mismatch;
                }
        }
        undef;
@@ -317,8 +319,15 @@ sub index_oid { # git->cat_async callback for 'm'
                blob => $oid,
        }, 'PublicInbox::Smsg';
        $new_smsg->set_bytes($$bref, $size);
-       defined($req->{xnum} = cur_ibx_xnum($req, $bref)) or return;
        ++${$req->{nr}};
+       my $mismatch = [];
+       $req->{xnum} = cur_ibx_xnum($req, $bref, $mismatch) // do {
+               warn "# deleted\n";
+               warn "# mismatch $_->{blob}\n" for @$mismatch;
+               ${$req->{latest_cmt}} = $req->{cur_cmt} //
+                       die "BUG: {cur_cmt} unset ($oid)\n";
+               return;
+       };
        do_step($req);
 }