Due to the asynchronous nature of SMTP, it is possible for the
root message of a thread (with no References/In-Reply-To)
to arrive last in a series. We must preserve the thread_id
of the ghost message in this case, as we do for vivifiying
non-root ghosts.
---
MANIFEST | 1 +
lib/PublicInbox/SearchIdx.pm | 2 +-
t/search-thr-index.t | 58 ++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 60 insertions(+), 1 deletion(-)
create mode 100644 t/search-thr-index.t
diff --git a/MANIFEST b/MANIFEST
index f16843a..d1e0952 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -157,6 +157,7 @@ t/psgi_attach.t
t/psgi_mount.t
t/psgi_text.t
t/qspawn.t
+t/search-thr-index.t
t/search.t
t/spamcheck_spamc.t
t/spawn.t
diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index 8a529c6..e4e3c81 100644
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -330,7 +330,7 @@ sub link_message {
merge_threads($self, $tid, $ptid);
}
} else {
- $tid = $self->next_thread_id;
+ $tid = defined $old_tid ? $old_tid : $self->next_thread_id;
}
$doc->add_term(xpfx('thread') . $tid);
}
diff --git a/t/search-thr-index.t b/t/search-thr-index.t
new file mode 100644
index 0000000..6549554
--- /dev/null
+++ b/t/search-thr-index.t
@@ -0,0 +1,58 @@
+# Copyright (C) 2017 all contributors <[email protected]>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+use strict;
+use warnings;
+use Test::More;
+use File::Temp qw/tempdir/;
+use Email::MIME;
+eval { require PublicInbox::SearchIdx; };
+plan skip_all => "Xapian missing for search" if $@;
+my $tmpdir = tempdir('pi-search-thr-index.XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my $git_dir = "$tmpdir/a.git";
+
+is(0, system(qw(git init -q --bare), $git_dir), "git init (main)");
+my $rw = PublicInbox::SearchIdx->new($git_dir, 1);
+ok($rw, "search indexer created");
+my $data = <<'EOF';
+Subject: [RFC 00/14]
+Message-Id: <1-bw@g>
+
+Subject: [RFC 09/14]
+Message-Id: <10-bw@g>
+In-Reply-To: <1-bw@g>
+References: <1-bw@g>
+
+Subject: [RFC 03/14]
+Message-Id: <4-bw@g>
+In-Reply-To: <1-bw@g>
+References: <1-bw@g>
+
+EOF
+
+my $num = 0;
+# nb. using internal API, fragile!
+my $xdb = $rw->_xdb_acquire;
+$xdb->begin_transaction;
+my @mids;
+
+foreach (reverse split(/\n\n/, $data)) {
+ $_ .= "\n";
+ my $mime = Email::MIME->new(\$_);
+ $mime->header_set('From' => 'bw@g');
+ $mime->header_set('To' => '[email protected]');
+ my $bytes = bytes::length($mime->as_string);
+ my $doc_id = $rw->add_message($mime, $bytes, ++$num, 'ignored');
+ my $mid = $mime->header('Message-Id');
+ push @mids, $mid;
+ ok($doc_id, 'message added: '. $mid);
+}
+
+my $prev;
+foreach my $mid (@mids) {
+ my $res = $rw->get_thread($mid);
+ is(3, $res->{total}, "got all messages from $mid");
+}
+
+done_testing();
+
+1;
--
EW
