From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 2/9] extindex: delete stale messages from over.sqlite3
Date: Tue, 15 Dec 2020 02:02:17 +0000 [thread overview]
Message-ID: <20201215020224.11739-3-e@80x24.org> (raw)
In-Reply-To: <20201215020224.11739-1-e@80x24.org>
In addition to removing stale messages from Xapian, we must
also remove them from over.sqlite3.
---
lib/PublicInbox/ExtSearchIdx.pm | 1 +
t/extsearch.t | 12 ++++++++++++
2 files changed, 13 insertions(+)
diff --git a/lib/PublicInbox/ExtSearchIdx.pm b/lib/PublicInbox/ExtSearchIdx.pm
index 394a89d4..ec86a7c0 100644
--- a/lib/PublicInbox/ExtSearchIdx.pm
+++ b/lib/PublicInbox/ExtSearchIdx.pm
@@ -533,6 +533,7 @@ DELETE FROM xref3 WHERE ibx_id = ? AND xnum = ? AND oidbin = ?
my $xr3 = $self->{oidx}->get_xref3($docid);
my $idx = $self->idx_shard($docid);
if (scalar(@$xr3) == 0) { # all gone
+ $self->{oidx}->delete_by_num($docid);
$self->{oidx}->eidxq_del($docid);
$idx->shard_remove($docid);
} else { # enqueue for reindex of remaining messages
diff --git a/t/extsearch.t b/t/extsearch.t
index f16ec0d1..4a8a9f49 100644
--- a/t/extsearch.t
+++ b/t/extsearch.t
@@ -268,18 +268,30 @@ if ('reindex catches missed messages') {
my $new = $oidx->get_art($max + 1);
is($new->{subject}, $eml->header('Subject'), 'new message added');
+ $es->{xdb}->reopen;
+ my $mset = $es->mset("mid:$new->{mid}");
+ is($mset->size, 1, 'previously unseen, now indexed in Xapian');
+
ok($im->remove($eml), 'remove new message from v2 inbox');
$im->done;
my $cmt_c = $v2ibx->mm->last_commit_xap($schema_version, 0);
is($oidx->eidx_meta($lc_key, $cmt_c), $cmt_b,
'bump lc-v2 meta again to skip v2 remove');
$err = '';
+ $oidx->dbh_close;
ok(run_script([qw(-extindex --reindex), "$home/extindex",
$v2ibx->{inboxdir}], undef, $opt),
'--reindex for stale');
@err = split(/^/, $err);
is(scalar(@err), 1, 'only one warning');
like($err[0], qr/\(#$new->{num}\): stale/, 'got stale message warning');
+ is($oidx->get_art($new->{num}), undef,
+ 'stale message gone from over');
+ is_deeply($oidx->get_xref3($new->{num}), [],
+ 'stale message has no xref3');
+ $es->{xdb}->reopen;
+ $mset = $es->mset("mid:$new->{mid}");
+ is($mset->size, 0, 'stale mid gone Xapian');
}
if ('remove v1test and test gc') {
next prev parent reply other threads:[~2020-12-15 2:02 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-11 3:37 [PATCH] extindex: preliminary --reindex support Eric Wong
2020-12-12 19:53 ` [PATCH 2/1] extindex: reindex: drop stale rows from over.sqlite3 Eric Wong
2020-12-15 2:02 ` [PATCH 0/9] extindex: --reindex support Eric Wong
2020-12-15 2:02 ` [PATCH 1/9] extindex: preliminary " Eric Wong
2020-12-15 2:02 ` Eric Wong [this message]
2020-12-15 2:02 ` [PATCH 3/9] over: sort xref3 by xnum if ibx_id repeats Eric Wong
2020-12-15 2:02 ` [PATCH 4/9] extindex: support --rethread and content bifurcation Eric Wong
2020-12-15 2:02 ` [PATCH 5/9] extsearchidx: reindex works on Xapian, too Eric Wong
2020-12-15 2:02 ` [PATCH 6/9] extsearchidx: checkpoint releases locks Eric Wong
2020-12-15 2:02 ` [PATCH 7/9] extsearchidx: simplify reindex code paths Eric Wong
2020-12-15 2:02 ` [PATCH 8/9] extsearchidx: reindex releases over.sqlite3 handles properly Eric Wong
2020-12-15 2:02 ` [PATCH 9/9] searchidxshard: simplify newline elimination Eric Wong
2020-12-16 6:40 ` [PATCH 0/9] extindex: --reindex support Eric Wong
2020-12-16 23:04 ` [PATCH 10/9] extsearchidx: lock eidxq on full --reindex Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201215020224.11739-3-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).