X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fxcpdb-reshard.t;h=8516b90793104c53c22d0b3b19def65ac1e0dbb3;hb=c589b65c54ce2507f38114990e3a722fd6cdfe3d;hp=9f0034f1581305b5c32ab29f463876385087790a;hpb=cb850caf867e3e6920233c1c1ab7120cac054af8;p=public-inbox.git
diff --git a/t/xcpdb-reshard.t b/t/xcpdb-reshard.t
index 9f0034f1..8516b907 100644
--- a/t/xcpdb-reshard.t
+++ b/t/xcpdb-reshard.t
@@ -1,58 +1,54 @@
-# Copyright (C) 2019 all contributors
+#!perl -w
+# Copyright (C) 2019-2021 all contributors
# License: AGPL-3.0+
use strict;
-use warnings;
-use Test::More;
+use v5.10.1;
use PublicInbox::TestCommon;
require_mods(qw(DBD::SQLite Search::Xapian));
require_git('2.6');
-use PublicInbox::MIME;
-use PublicInbox::InboxWritable;
+use PublicInbox::Eml;
require PublicInbox::Search;
-my $mime = PublicInbox::MIME->create(
- header => [
- From => 'a@example.com',
- To => 'test@example.com',
- Subject => 'this is a subject',
- Date => 'Fri, 02 Oct 1993 00:00:00 +0000',
- ],
- body => '',
-);
-
-my ($this) = (split('/', $0))[-1];
my ($tmpdir, $for_destroy) = tmpdir();
-local $ENV{PI_CONFIG} = "$tmpdir/config";
-my $ibx = PublicInbox::Inbox->new({
- inboxdir => "$tmpdir/testbox",
- name => $this,
- version => 2,
- -primary_address => 'test@example.com',
- indexlevel => 'medium',
-});
-my @xcpdb = qw(-xcpdb -q);
-my $nproc = 8;
+my $nproc = 8;
my $ndoc = 13;
-my $im = PublicInbox::InboxWritable->new($ibx, {nproc => $nproc})->importer(1);
-for my $i (1..$ndoc) {
- $mime->header_set('Message-ID', "");
- ok($im->add($mime), "message $i added");
-}
-$im->done;
+my $ibx = create_inbox 'test', version => 2, indexlevel => 'medium',
+ tmpdir => "$tmpdir/testbox", nproc => $nproc, sub {
+ my ($im, $ibx) = @_;
+ my $eml = PublicInbox::Eml->new(<<'EOF');
+From: a@example.com
+To: test@example.com
+Subject: this is a subject
+Date: Fri, 02 Oct 1993 00:00:00 +0000
+
+EOF
+ for my $i (1..$ndoc) {
+ $eml->header_set('Message-ID', "");
+ ok($im->add($eml), "message $i added");
+ }
+ open my $fh, '>', "$ibx->{inboxdir}/empty" or BAIL_OUT "open $!";
+};
+my $env = { PI_CONFIG => "$ibx->{inboxdir}/empty" };
my @shards = grep(m!/\d+\z!, glob("$ibx->{inboxdir}/xap*/*"));
-is(scalar(@shards), $nproc, 'got expected shards');
+is(scalar(@shards), $nproc - 1, 'got expected shards');
my $orig = $ibx->over->query_xover(1, $ndoc);
my %nums = map {; "$_->{num}" => 1 } @$orig;
+my @xcpdb = qw(-xcpdb -q);
+my $XapianDatabase = do {
+ no warnings 'once';
+ $PublicInbox::Search::X{Database};
+};
# ensure we can go up or down in shards, or stay the same:
for my $R (qw(2 4 1 3 3)) {
delete $ibx->{search}; # release old handles
my $cmd = [@xcpdb, "-R$R", $ibx->{inboxdir}];
- push @$cmd, '--compact' if $R == 1;
- ok(run_script($cmd), "xcpdb -R$R");
+ push @$cmd, '--compact' if $R == 1 && have_xapian_compact;
+ ok(run_script($cmd, $env), "xcpdb -R$R");
my @new_shards = grep(m!/\d+\z!, glob("$ibx->{inboxdir}/xap*/*"));
is(scalar(@new_shards), $R, 'resharded to two shards');
- my $msgs = $ibx->search->query('s:this');
+ my $mset = $ibx->search->mset('s:this');
+ my $msgs = $ibx->search->mset_to_smsg($ibx, $mset);
is(scalar(@$msgs), $ndoc, 'got expected docs after resharding');
my %by_mid = map {; "$_->{mid}" => $_ } @$msgs;
ok($by_mid{"m$_\@example.com"}, "$_ exists") for (1..$ndoc);
@@ -62,10 +58,6 @@ for my $R (qw(2 4 1 3 3)) {
# ensure docids in Xapian match NNTP article numbers
my $tot = 0;
my %tmp = %nums;
- my $XapianDatabase = do {
- no warnings 'once';
- $PublicInbox::Search::X{Database};
- };
foreach my $d (@new_shards) {
my $xdb = $XapianDatabase->new($d);
$tot += $xdb->get_doccount;
@@ -80,6 +72,4 @@ for my $R (qw(2 4 1 3 3)) {
}
is(scalar keys %tmp, 0, 'all docids seen');
}
-
-done_testing();
-1;
+done_testing;