search: replace ->query with ->mset

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

diff --git a/t/v2mirror.t b/t/v2mirror.t
index ecf968912f6eb768a4edfa5630661bbdf23e44a2..81b9544d905bd1726f4b7a1e9d256d7b468e330f 100644 (file)
--- a/t/v2mirror.t
+++ b/t/v2mirror.t
@@ -4,6 +4,7 @@ use strict;
 use warnings;
 use Test::More;
 use PublicInbox::TestCommon;
+use File::Path qw(remove_tree);
 use Cwd qw(abs_path);
 require_git(2.6);
 local $ENV{HOME} = abs_path('t');
@@ -15,7 +16,7 @@ use IO::Socket;
 use POSIX qw(dup2);
 use_ok 'PublicInbox::V2Writable';
 use PublicInbox::InboxWritable;
-use PublicInbox::MIME;
+use PublicInbox::Eml;
 use PublicInbox::Config;
 # FIXME: too much setup
 my ($tmpdir, $for_destroy) = tmpdir();
@@ -38,7 +39,7 @@ $ibx->{version} = 2;
 my $v2w = PublicInbox::V2Writable->new($ibx, 1);
 ok $v2w, 'v2w loaded';
 $v2w->{parallel} = 0;
-my $mime = PublicInbox::MIME->new(<<'');
+my $mime = PublicInbox::Eml->new(<<'');
 From: Me <me@example.com>
 To: You <you@example.com>
 Subject: a
@@ -80,11 +81,13 @@ foreach my $i (0..$epoch_max) {
        ok(-d "$tmpdir/m/git/$i.git", "mirror $i OK");
 }
 
-@cmd = ("-init", '-V2', 'm', "$tmpdir/m", 'http://example.com/m',
+@cmd = ("-init", '-j1', '-V2', 'm', "$tmpdir/m", 'http://example.com/m',
        'alt@example.com');
 ok(run_script(\@cmd), 'initialized public-inbox -V2');
+my @shards = glob("$tmpdir/m/xap*/?");
+is(scalar(@shards), 1, 'got a single shard on init');
 
-ok(run_script(['-index', "$tmpdir/m"]), 'indexed');
+ok(run_script([qw(-index -j0), "$tmpdir/m"]), 'indexed');
 
 my $mibx = { inboxdir => "$tmpdir/m", address => 'alt@example.com' };
 $mibx = PublicInbox::Inbox->new($mibx);
@@ -109,11 +112,11 @@ my $fetch_each_epoch = sub {
 
 $fetch_each_epoch->();
 
-my $mset = $mibx->search->reopen->query('m:15@example.com', {mset => 1});
+my $mset = $mibx->search->reopen->mset('m:15@example.com');
 is(scalar($mset->items), 0, 'new message not found in mirror, yet');
-ok(run_script(["-index", "$tmpdir/m"]), 'index updated');
+ok(run_script([qw(-index -j0), "$tmpdir/m"]), 'index updated');
 is_deeply([$mibx->mm->minmax], [$ibx->mm->minmax], 'index synched minmax');
-$mset = $mibx->search->reopen->query('m:15@example.com', {mset => 1});
+$mset = $mibx->search->reopen->mset('m:15@example.com');
 is(scalar($mset->items), 1, 'found message in mirror');
 
 # purge:
@@ -131,10 +134,10 @@ $mime->header_set('Subject', 'subject = 10');
 
 $v2w->done;
 
-my $msgs = $mibx->search->{over_ro}->get_thread('10@example.com');
+my $msgs = $mibx->over->get_thread('10@example.com');
 my $to_purge = $msgs->[0]->{blob};
 like($to_purge, qr/\A[a-f0-9]{40,}\z/, 'read blob to be purged');
-$mset = $ibx->search->reopen->query('m:10@example.com', {mset => 1});
+$mset = $ibx->search->reopen->mset('m:10@example.com');
 is(scalar($mset->items), 0, 'purged message gone from origin');
 
 $fetch_each_epoch->();
@@ -142,7 +145,7 @@ $fetch_each_epoch->();
        $ibx->cleanup;
        PublicInbox::InboxWritable::cleanup($mibx);
        $v2w->done;
-       my $cmd = [ '-index', '--prune', "$tmpdir/m" ];
+       my $cmd = [ qw(-index --prune -j0), "$tmpdir/m" ];
        my ($out, $err) = ('', '');
        my $opt = { 1 => \$out, 2 => \$err };
        ok(run_script($cmd, undef, $opt), '-index --prune');
@@ -150,11 +153,11 @@ $fetch_each_epoch->();
        unlike($err, qr/fatal/, 'no scary fatal error shown');
 }
 
-$mset = $mibx->search->reopen->query('m:10@example.com', {mset => 1});
+$mset = $mibx->search->reopen->mset('m:10@example.com');
 is(scalar($mset->items), 0, 'purged message not found in mirror');
 is_deeply([$mibx->mm->minmax], [$ibx->mm->minmax], 'minmax still synced');
 for my $i ((1..9),(11..15)) {
-       $mset = $mibx->search->query("m:$i\@example.com", {mset => 1});
+       $mset = $mibx->search->mset("m:$i\@example.com");
        is(scalar($mset->items), 1, "$i\@example.com remains visible");
 }
 is($mibx->git->check($to_purge), undef, 'unindex+prune successful in mirror');
@@ -168,7 +171,7 @@ is($mibx->git->check($to_purge), undef, 'unindex+prune successful in mirror');
 
 # deletes happen in a different fetch window
 {
-       $mset = $mibx->search->reopen->query('m:1@example.com', {mset => 1});
+       $mset = $mibx->search->reopen->mset('m:1@example.com');
        is(scalar($mset->items), 1, '1@example.com visible in mirror');
        $mime->header_set('Message-ID', '<1@example.com>');
        $mime->header_set('Subject', 'subject = 1');
@@ -178,15 +181,28 @@ is($mibx->git->check($to_purge), undef, 'unindex+prune successful in mirror');
        $fetch_each_epoch->();
        PublicInbox::InboxWritable::cleanup($mibx);
 
-       my $cmd = [ "-index", "$tmpdir/m" ];
+       my $cmd = [ qw(-index -j0), "$tmpdir/m" ];
        my ($out, $err) = ('', '');
        my $opt = { 1 => \$out, 2 => \$err };
        ok(run_script($cmd, undef, $opt), 'index ran');
        is($err, '', 'no errors reported by index');
-       $mset = $mibx->search->reopen->query('m:1@example.com', {mset => 1});
+       $mset = $mibx->search->reopen->mset('m:1@example.com');
        is(scalar($mset->items), 0, '1@example.com no longer visible in mirror');
 }
 
+if ('sequential-shard') {
+       $mset = $mibx->search->mset('m:15@example.com');
+       is(scalar($mset->items), 1, 'large message not indexed');
+       remove_tree(glob("$tmpdir/m/xap*"), glob("$tmpdir/m/msgmap.*"));
+       my $cmd = [ qw(-index -j9 --sequential-shard), "$tmpdir/m" ];
+       ok(run_script($cmd), '--sequential-shard works');
+       my @shards = glob("$tmpdir/m/xap*/?");
+       is(scalar(@shards), 8, 'got expected shard count');
+       PublicInbox::InboxWritable::cleanup($mibx);
+       $mset = $mibx->search->mset('m:15@example.com');
+       is(scalar($mset->items), 1, 'search works after --sequential-shard');
+}
+
 if ('max size') {
        $mime->header_set('Message-ID', '<2big@a>');
        my $max = '2k';
@@ -196,11 +212,11 @@ if ('max size') {
        $ibx->cleanup;
        $fetch_each_epoch->();
        PublicInbox::InboxWritable::cleanup($mibx);
-       my $cmd = ['-index', "$tmpdir/m", "--max-size=$max" ];
+       my $cmd = [qw(-index -j0), "$tmpdir/m", "--max-size=$max" ];
        my $opt = { 2 => \(my $err) };
        ok(run_script($cmd, undef, $opt), 'indexed with --max-size');
        like($err, qr/skipping [a-f0-9]{40,}/, 'warned about skipping message');
-       $mset = $mibx->search->reopen->query('m:2big@a', {mset =>1});
+       $mset = $mibx->search->reopen->mset('m:2big@a');
        is(scalar($mset->items), 0, 'large message not indexed');
 
        {
@@ -211,10 +227,10 @@ if ('max size') {
 EOF
                close $fh or die;
        }
-       $cmd = ['-index', "$tmpdir/m", "--reindex" ];
+       $cmd = [ qw(-index -j0 --reindex), "$tmpdir/m" ];
        ok(run_script($cmd, undef, $opt), 'reindexed w/ indexMaxSize in file');
        like($err, qr/skipping [a-f0-9]{40,}/, 'warned about skipping message');
-       $mset = $mibx->search->reopen->query('m:2big@a', {mset =>1});
+       $mset = $mibx->search->reopen->mset('m:2big@a');
        is(scalar($mset->items), 0, 'large message not re-indexed');
 }