From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 2/3] Revert "searchidx: reindex clobbers old thread IDs"
Date: Mon, 6 Feb 2017 21:55:29 +0000 [thread overview]
Message-ID: <20170206215530.25722-3-e@80x24.org> (raw)
In-Reply-To: <20170206215530.25722-1-e@80x24.org>
Oops, that's broken, too. I guess the only way to reindex
after fixing the thread detection is to start from scratch.
This reverts commit 5d91adedf5f33ef1cb87df2a86306ddf370b4f8d.
---
lib/PublicInbox/SearchIdx.pm | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index bc003c6..1142ca7 100644
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -157,10 +157,6 @@ sub add_message {
# it will also clobber any existing regular message
$doc_id = $smsg->{doc_id};
$old_tid = $smsg->thread_id;
-
- # no need to remove_term for old_tid, we use a new
- # doc to replace the old one when reindexing:
- $old_tid = undef if $self->{reindex};
}
$smsg = PublicInbox::SearchMsg->new($mime);
my $doc = $smsg->{doc};
@@ -468,7 +464,7 @@ sub _git_log {
sub _index_sync {
my ($self, $opts) = @_;
my $tip = $opts->{ref} || 'HEAD';
- $self->{reindex} = $opts->{reindex};
+ my $reindex = $opts->{reindex};
my ($mkey, $last_commit, $lx, $xlog);
$self->{git}->batch_prepare;
my $xdb = _xdb_acquire($self);
@@ -478,7 +474,7 @@ sub _index_sync {
$mkey = 'last_commit';
$last_commit = $xdb->get_metadata('last_commit');
$lx = $last_commit;
- if ($self->{reindex}) {
+ if ($reindex) {
$lx = '';
$mkey = undef if $last_commit ne '';
}
--
EW
next prev parent reply other threads:[~2017-02-06 21:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-06 21:55 [PATCH 0/3] force reindex for threading changes Eric Wong
2017-02-06 21:55 ` [PATCH 1/3] searchidx: reindex clobbers old thread IDs Eric Wong
2017-02-06 21:55 ` Eric Wong [this message]
2017-02-06 21:55 ` [PATCH 3/3] search: schema version bump for empty References/In-Reply-To 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=20170206215530.25722-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).