search: replace ->query with ->mset

[public-inbox.git] / t / v2reindex.t

diff --git a/t/v2reindex.t b/t/v2reindex.t
index 77deffb4ba9d780bc837a69d01028bea96f02f21..ae1570edbdd57876be3993da76467751c768777d 100644 (file)
--- a/t/v2reindex.t
+++ b/t/v2reindex.t
@@ -10,6 +10,7 @@ use PublicInbox::TestCommon;
 require_git(2.6);
 require_mods(qw(DBD::SQLite Search::Xapian));
 use_ok 'PublicInbox::V2Writable';
+use_ok 'PublicInbox::OverIdx';
 my ($inboxdir, $for_destroy) = tmpdir();
 my $ibx_config = {
        inboxdir => $inboxdir,
@@ -152,7 +153,7 @@ ok(!-d $xap, 'Xapian directories removed again');
        delete $ibx->{mm};
        is_deeply([ $ibx->mm->minmax ], $minmax, 'minmax unchanged');
        is($ibx->mm->num_highwater, 10, 'num_highwater as expected');
-       my $mset = $ibx->search->query($phrase, {mset=>1});
+       my $mset = $ibx->search->mset($phrase);
        isnt($mset->size, 0, "phrase search succeeds on indexlevel=full");
        for (glob("$xap/*/*")) { $sizes{$ibx->{indexlevel}} += -s _ if -f $_ }
 
@@ -183,12 +184,12 @@ ok(!-d $xap, 'Xapian directories removed again');
                # not sure why, but Xapian seems to fallback to terms and
                # phrase searches still work
                delete $ibx->{search};
-               my $mset = $ibx->search->query($phrase, {mset=>1});
+               my $mset = $ibx->search->mset($phrase);
                is($mset->size, 0, 'phrase search does not work on medium');
        }
        my $words = $phrase;
        $words =~ tr/"'//d;
-       my $mset = $ibx->search->query($words, {mset=>1});
+       my $mset = $ibx->search->mset($words);
        isnt($mset->size, 0, "normal search works on indexlevel=medium");
        for (glob("$xap/*/*")) { $sizes{$ibx->{indexlevel}} += -s _ if -f $_ }
 
@@ -423,6 +424,46 @@ ok(!-d $xap, 'Xapian directories removed again');
                  ], 'msgmap as expected' );
 }
 
+my $check_rethread = sub {
+       my ($desc) = @_;
+       my @warn;
+       local $SIG{__WARN__} = sub { push @warn, @_ };
+       my %config = %$ibx_config;
+       my $ibx = PublicInbox::Inbox->new(\%config);
+       my $f = $ibx->over->{dbh}->sqlite_db_filename;
+       my $over = PublicInbox::OverIdx->new($f);
+       my $dbh = $over->dbh;
+       my $non_ghost_tids = sub {
+               $dbh->selectall_arrayref(<<'');
+SELECT tid FROM over WHERE num > 0 ORDER BY tid ASC
+
+       };
+       my $before = $non_ghost_tids->();
+
+       # mess up threading:
+       my $tid = PublicInbox::OverIdx::get_counter($dbh, 'thread');
+       my $nr = $dbh->do('UPDATE over SET tid = ?', undef, $tid);
+       diag "messing up all threads with tid=$tid";
+
+       my $v2w = PublicInbox::V2Writable->new($ibx);
+       my @pr;
+       my $pr = sub { push @pr, @_ };
+       $v2w->index_sync({reindex => 1, rethread => 1, -progress => $pr});
+       # diag "@pr"; # nobody cares
+       is_deeply(\@warn, [], 'no warnings on reindex + rethread');
+
+       my @n = $dbh->selectrow_array(<<EOS, undef, $tid);
+SELECT COUNT(*) FROM over WHERE tid <= ?
+EOS
+       is_deeply(\@n, [ 0 ], 'rethread dropped old threadids');
+       my $after = $non_ghost_tids->();
+       ok($after->[0]->[0] > $before->[-1]->[0],
+               'all tids greater than before');
+       is(scalar @$after, scalar @$before, 'thread count unchanged');
+};
+
+$check_rethread->('no-monster');
+
 # A real example from linux-renesas-soc on lore where a 3-headed monster
 # of a message has 3 sets of common headers.  Another normal message
 # previously existed with a single Message-ID that conflicts with one
@@ -490,11 +531,16 @@ EOF
 
        my %uniq;
        for my $s (qw(uno dos tres)) {
-               my $msgs = $ibx->search->query("s:$s");
+               my $mset = $ibx->search->mset("s:$s");
+               my $msgs = $ibx->search->mset_to_smsg($ibx, $mset);
                is(scalar(@$msgs), 1, "only one result for `$s'");
                $uniq{$msgs->[0]->{num}}++;
        }
        is_deeply([values %uniq], [3], 'search on different subjects');
 }
 
+# XXX: not deterministic when dealing with ambiguous messages, oh well
+$check_rethread->('3-headed-monster once');
+$check_rethread->('3-headed-monster twice');
+
 done_testing();