about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2018-08-05 08:19:25 +0000
committerEric Wong <e@80x24.org>2018-08-05 21:09:04 +0000
commitce5494b5b830e9b8b60815ccd81218390dc0d5db (patch)
tree9c56b355aba80f03473e8dc23fe648f9bfd32cb3
parent0c22c3e3a99527ebf04a647ca287ea2fc9bdeddd (diff)
downloadpublic-inbox-ce5494b5b830e9b8b60815ccd81218390dc0d5db.tar.gz
Otherwise, walking backwards through history could mean the root
message in a thread forgets its `tid' and it prevents messages
from being looked up by it.

This bug was hidden by the fact that `sid' matches were often
good enough to link threads together.
-rw-r--r--lib/PublicInbox/OverIdx.pm11
-rw-r--r--t/search-thr-index.t40
2 files changed, 49 insertions, 2 deletions
diff --git a/lib/PublicInbox/OverIdx.pm b/lib/PublicInbox/OverIdx.pm
index 62fec0da..cc9bd7d4 100644
--- a/lib/PublicInbox/OverIdx.pm
+++ b/lib/PublicInbox/OverIdx.pm
@@ -79,8 +79,15 @@ sub mid2id {
 }
 
 sub delete_by_num {
-        my ($self, $num) = @_;
+        my ($self, $num, $tid_ref) = @_;
         my $dbh = $self->{dbh};
+        if ($tid_ref) {
+                my $sth = $dbh->prepare_cached(<<'', undef, 1);
+SELECT tid FROM over WHERE num = ? LIMIT 1
+
+                $sth->execute($num);
+                $$tid_ref = $sth->fetchrow_array; # may be undef
+        }
         foreach (qw(over id2num)) {
                 $dbh->prepare_cached(<<"")->execute($num);
 DELETE FROM $_ WHERE num = ?
@@ -262,7 +269,7 @@ sub add_over {
         my $vivified = 0;
 
         $self->begin_lazy;
-        $self->delete_by_num($num);
+        $self->delete_by_num($num, \$old_tid);
         foreach my $mid (@$mids) {
                 my $v = 0;
                 each_by_mid($self, $mid, ['tid'], sub {
diff --git a/t/search-thr-index.t b/t/search-thr-index.t
index 2aa97bff..ab6d1b0f 100644
--- a/t/search-thr-index.t
+++ b/t/search-thr-index.t
@@ -48,9 +48,49 @@ foreach (reverse split(/\n\n/, $data)) {
 }
 
 my $prev;
+my %tids;
+my $dbh = $rw->{over}->connect;
 foreach my $mid (@mids) {
         my $msgs = $rw->{over}->get_thread($mid);
         is(3, scalar(@$msgs), "got all messages from $mid");
+        foreach my $m (@$msgs) {
+                my $tid = $dbh->selectrow_array(<<'', undef, $m->{num});
+SELECT tid FROM over WHERE num = ? LIMIT 1
+
+                $tids{$tid}++;
+        }
+}
+
+is(scalar keys %tids, 1, 'all messages have the same tid');
+
+$rw->commit_txn_lazy;
+
+$xdb = $rw->begin_txn_lazy;
+{
+        my $mime = Email::MIME->new(<<'');
+Subject: [RFC 00/14]
+Message-Id: <1-bw@g>
+From: bw@g
+To: git@vger.kernel.org
+
+        my $dbh = $rw->{over}->connect;
+        my ($id, $prev);
+        my $reidx = $rw->{over}->next_by_mid('1-bw@g', \$id, \$prev);
+        ok(defined $reidx);
+        my $num = $reidx->{num};
+        my $tid0 = $dbh->selectrow_array(<<'', undef, $num);
+SELECT tid FROM over WHERE num = ? LIMIT 1
+
+        my $bytes = bytes::length($mime->as_string);
+        my $mid = mids($mime->header_obj)->[0];
+        my $doc_id = $rw->add_message($mime, $bytes, $num, 'ignored', $mid);
+        ok($doc_id, 'message reindexed'. $mid);
+        is($doc_id, $num, "article number unchanged: $num");
+
+        my $tid1 = $dbh->selectrow_array(<<'', undef, $num);
+SELECT tid FROM over WHERE num = ? LIMIT 1
+
+        is($tid1, $tid0, 'tid unchanged on reindex');
 }
 
 $rw->commit_txn_lazy;