From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id E9F5C1F9F3 for ; Mon, 18 Oct 2021 05:09:05 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/2] extindex: show mismatches for messages deleted from inbox Date: Mon, 18 Oct 2021 05:09:04 +0000 Message-Id: <20211018050905.21275-2-e@80x24.org> In-Reply-To: <20211018050905.21275-1-e@80x24.org> References: <20211018050905.21275-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: There seems to be a bug in v2 inbox reindexing somewhere... --- lib/PublicInbox/ExtSearchIdx.pm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/PublicInbox/ExtSearchIdx.pm b/lib/PublicInbox/ExtSearchIdx.pm index f479cf9e1a3f..4b46fa1622ea 100644 --- a/lib/PublicInbox/ExtSearchIdx.pm +++ b/lib/PublicInbox/ExtSearchIdx.pm @@ -292,8 +292,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 +303,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 +318,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); }