From 6e83825a9e49ca68694c20ddfed54368d5f3e075 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 6 Feb 2017 21:37:26 +0000 Subject: Revert "searchidx: reindex clobbers old thread IDs" 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(-) (limited to 'lib/PublicInbox') diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm index bc003c6c..1142ca7a 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 ''; } -- cgit v1.2.3-24-ge0c7