X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fsearch-thr-index.t;h=4b26f2ee34580c9d3e074afe83f5513fcc0466e9;hb=9bd675d33ad1e49bd2ebe12a1d216216e61380de;hp=c3534f6b6720cda0c1912bd55232d879c3c15bec;hpb=3d41aa23f35501ca92aab8aa42980fa73f7fa74f;p=public-inbox.git
diff --git a/t/search-thr-index.t b/t/search-thr-index.t
index c3534f6b..4b26f2ee 100644
--- a/t/search-thr-index.t
+++ b/t/search-thr-index.t
@@ -1,17 +1,25 @@
-# Copyright (C) 2017-2018 all contributors
+# Copyright (C) 2017-2019 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
+use bytes (); # only for bytes::length
use Test::More;
use File::Temp qw/tempdir/;
+use PublicInbox::MID qw(mids);
use Email::MIME;
-eval { require PublicInbox::SearchIdx; };
-plan skip_all => "Xapian missing for search" if $@;
+my @mods = qw(DBI DBD::SQLite Search::Xapian);
+foreach my $mod (@mods) {
+ eval "require $mod";
+ plan skip_all => "missing $mod for $0" if $@;
+}
+require PublicInbox::SearchIdx;
+require PublicInbox::Inbox;
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);
+my $ibx = PublicInbox::Inbox->new({mainrepo => $git_dir});
+my $rw = PublicInbox::SearchIdx->new($ibx, 1);
ok($rw, "search indexer created");
my $data = <<'EOF';
Subject: [RFC 00/14]
@@ -31,8 +39,7 @@ EOF
my $num = 0;
# nb. using internal API, fragile!
-my $xdb = $rw->_xdb_acquire;
-$xdb->begin_transaction;
+my $xdb = $rw->begin_txn_lazy;
my @mids;
foreach (reverse split(/\n\n/, $data)) {
@@ -41,18 +48,60 @@ foreach (reverse split(/\n\n/, $data)) {
$mime->header_set('From' => 'bw@g');
$mime->header_set('To' => 'git@vger.kernel.org');
my $bytes = bytes::length($mime->as_string);
- my $doc_id = $rw->add_message($mime, $bytes, ++$num, 'ignored');
- my $mid = $mime->header('Message-Id');
+ my $mid = mids($mime->header_obj)->[0];
+ my $doc_id = $rw->add_message($mime, $bytes, ++$num, 'ignored', $mid);
push @mids, $mid;
ok($doc_id, 'message added: '. $mid);
}
my $prev;
+my %tids;
+my $dbh = $rw->{over}->connect;
foreach my $mid (@mids) {
- my $res = $rw->get_thread($mid);
- is(3, $res->{total}, "got all messages from $mid");
+ 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;
+
done_testing();
1;