-# Copyright (C) 2019 all contributors <meta@public-inbox.org>
+#!perl -w
+# Copyright (C) all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
use strict;
-use warnings;
-use Test::More;
-use PublicInbox::MIME;
+use v5.10.1;
+use PublicInbox::TestCommon;
+use PublicInbox::Eml;
use PublicInbox::Inbox;
-use PublicInbox::InboxWritable;
-use File::Temp qw/tempdir/;
-require './t/common.perl';
-require_git(2.6);
-my $this = (split('/', __FILE__))[-1];
-
-foreach my $mod (qw(DBD::SQLite)) {
- eval "require $mod";
- plan skip_all => "$mod missing for $this" if $@;
-}
-
-my $path = 'blib/script';
-my $index = "$path/public-inbox-index";
-
-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 => "hello world\n",
-);
-
-sub import_index_incremental {
- my ($v, $level) = @_;
- my $tmpdir = tempdir("pi-$this-tmp-XXXXXX", TMPDIR => 1, CLEANUP => 1);
- my $ibx = PublicInbox::Inbox->new({
- mainrepo => "$tmpdir/testbox",
- name => "$this-$v",
- version => $v,
- -primary_address => 'test@example.com',
- indexlevel => $level,
- });
- my $im = PublicInbox::InboxWritable->new($ibx, {nproc=>1})->importer;
- $mime->header_set('Message-ID', '<m@1>');
- ok($im->add($mime), 'first message added');
- $im->done;
+require PublicInbox::Admin;
+my $PI_TEST_VERSION = $ENV{PI_TEST_VERSION} || 2;
+require_git('2.6') if $PI_TEST_VERSION == 2;
+require_mods(qw(DBD::SQLite));
+
+my $mime = 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
+
+hello world
+EOF
+
+my $import_index_incremental = sub {
+ my ($v, $level, $mime) = @_;
+ my $err = '';
+ my $this = "pi-$v-$level-indexlevels";
+ my ($tmpdir, $for_destroy) = tmpdir();
+ my $ibx = create_inbox "testbox$v", indexlevel => $level,
+ version => $v, tmpdir => "$tmpdir/v$v", sub {
+ $mime->header_set('Message-ID', '<m@1>');
+ $_[0]->add($mime) or BAIL_OUT;
+ };
+ my $im = $ibx->importer(0);
+ local $ENV{PI_CONFIG} = "$tmpdir/config";
# index master (required for v1)
- is(system($index, $ibx->{mainrepo}, "-L$level"), 0, 'index master OK');
+ my @cmd = (qw(-index -j0 --dangerous), $ibx->{inboxdir}, "-L$level");
+ push @cmd, '-c' if have_xapian_compact;
+ ok(run_script(\@cmd, undef, { 2 => \$err }), 'index master');
my $ro_master = PublicInbox::Inbox->new({
- mainrepo => $ibx->{mainrepo},
+ inboxdir => $ibx->{inboxdir},
indexlevel => $level
});
- my ($nr, $msgs) = $ro_master->recent;
- is($nr, 1, 'only one message in master, so far');
+ my $msgs = $ro_master->over->recent;
+ is(scalar(@$msgs), 1, 'only one message in master, so far');
is($msgs->[0]->{mid}, 'm@1', 'first message in master indexed');
# clone
- my @cmd = (qw(git clone --mirror -q));
+ @cmd = (qw(git clone --mirror -q));
my $mirror = "$tmpdir/mirror-$v";
if ($v == 1) {
- push @cmd, $ibx->{mainrepo}, $mirror;
+ push @cmd, $ibx->{inboxdir}, $mirror;
} else {
- push @cmd, "$ibx->{mainrepo}/git/0.git", "$mirror/git/0.git";
+ push @cmd, "$ibx->{inboxdir}/git/0.git", "$mirror/git/0.git";
}
my $fetch_dir = $cmd[-1];
- is(system(@cmd), 0, "v$v clone OK");
+ is(xsys(@cmd), 0, "v$v clone OK");
# inbox init
local $ENV{PI_CONFIG} = "$tmpdir/.picfg";
- @cmd = ("$path/public-inbox-init", '-L', $level,
+ @cmd = ('-init', '-L', $level,
'mirror', $mirror, '//example.com/test', 'test@example.com');
push @cmd, '-V2' if $v == 2;
- is(system(@cmd), 0, "v$v init OK");
+ ok(run_script(\@cmd), "v$v init OK");
# index mirror
- is(system($index, $mirror), 0, "v$v index mirror OK");
+ ok(run_script([qw(-index -j0), $mirror]), "v$v index mirror OK");
# read-only access
my $ro_mirror = PublicInbox::Inbox->new({
- mainrepo => $mirror,
- indexlevel => 'basic'
+ inboxdir => $mirror,
+ indexlevel => $level,
});
- ($nr, $msgs) = $ro_mirror->recent;
- is($nr, 1, 'only one message, so far');
+ $msgs = $ro_mirror->over->recent;
+ is(scalar(@$msgs), 1, 'only one message, so far');
is($msgs->[0]->{mid}, 'm@1', 'read first message');
# update master
$im->done;
# mirror updates
- is(system('git', "--git-dir=$fetch_dir", qw(fetch -q)), 0, 'fetch OK');
- is(system($index, $mirror), 0, "v$v index mirror again OK");
- ($nr, $msgs) = $ro_mirror->recent;
- is($nr, 2, '2nd message seen in mirror');
+ is(xsys('git', "--git-dir=$fetch_dir", qw(fetch -q)), 0, 'fetch OK');
+ ok(run_script([qw(-index -j0), $mirror]), "v$v index mirror again OK");
+ $msgs = $ro_mirror->over->recent;
+ is(scalar(@$msgs), 2, '2nd message seen in mirror');
is_deeply([sort { $a cmp $b } map { $_->{mid} } @$msgs],
['m@1','m@2'], 'got both messages in mirror');
# incremental index master (required for v1)
- is(system($index, $ibx->{mainrepo}, "-L$level"), 0, 'index master OK');
- ($nr, $msgs) = $ro_master->recent;
- is($nr, 2, '2nd message seen in master');
+ ok(run_script([qw(-index -j0), $ibx->{inboxdir}, "-L$level"]),
+ 'index master OK');
+ $msgs = $ro_master->over->recent;
+ is(scalar(@$msgs), 2, '2nd message seen in master');
is_deeply([sort { $a cmp $b } map { $_->{mid} } @$msgs],
['m@1','m@2'], 'got both messages in master');
+ my @rw_nums = map { $_->{num} } @{$ibx->over->query_ts(0, 0)};
+ is_deeply(\@rw_nums, [1, 2], 'master has expected NNTP articles');
+
+ my @ro_nums = map { $_->{num} } @{$ro_mirror->over->query_ts(0, 0)};
+ is_deeply(\@ro_nums, [1, 2], 'mirror has expected NNTP articles');
+
# remove message from master
ok($im->remove($mime), '2nd message removed');
$im->done;
+ @rw_nums = map { $_->{num} } @{$ibx->over->query_ts(0, 0)};
+ is_deeply(\@rw_nums, [1], 'unindex NNTP article'.$v.$level);
+
+ if ($level ne 'basic') {
+ ok(run_script(['-xcpdb', '-q', $mirror]), "v$v xcpdb OK");
+ is(PublicInbox::Admin::detect_indexlevel($ro_mirror), $level,
+ 'indexlevel detectable by Admin after xcpdb v' .$v.$level);
+ delete $ro_mirror->{$_} for (qw(over search));
+ my $mset = $ro_mirror->search->mset('m:m@2');
+ is($mset->size, 1, "v$v found m\@2 via Xapian on $level");
+ }
# sync the mirror
- is(system('git', "--git-dir=$fetch_dir", qw(fetch -q)), 0, 'fetch OK');
- is(system($index, $mirror), 0, "v$v index mirror again OK");
- ($nr, $msgs) = $ro_mirror->recent;
- is($nr, 1, '2nd message gone from mirror');
+ is(xsys('git', "--git-dir=$fetch_dir", qw(fetch -q)), 0, 'fetch OK');
+ ok(run_script([qw(-index -j0), $mirror]), "v$v index mirror again OK");
+ $msgs = $ro_mirror->over->recent;
+ is(scalar(@$msgs), 1, '2nd message gone from mirror');
is_deeply([map { $_->{mid} } @$msgs], ['m@1'],
'message unavailable in mirror');
if ($v == 2 && $level eq 'basic') {
- is_deeply([glob("$ibx->{mainrepo}/xap*/?/")], [],
- 'no Xapian partition directories for v2 basic');
+ is_deeply([glob("$ibx->{inboxdir}/xap*/?/")], [],
+ 'no Xapian shard directories for v2 basic');
}
-}
+ if ($level ne 'basic') {
+ my $mset = $ro_mirror->search->reopen->mset('m:m@2');
+ is($mset->size, 0,
+ "v$v m\@2 gone from Xapian in mirror on $level");
+ }
+
+ # add another message to master and have the mirror
+ # sync and reindex it
+ my @expect = map { $_->{num} } @{$ibx->over->query_ts(0, 0)};
+ foreach my $i (3..5) {
+ $mime->header_set('Message-ID', "<m\@$i>");
+ ok($im->add($mime), "#$i message added");
+ push @expect, $i;
+ }
+ $im->done;
+ is(xsys('git', "--git-dir=$fetch_dir", qw(fetch -q)), 0, 'fetch OK');
+ ok(run_script([qw(-index -j0 --reindex), $mirror]),
+ "v$v index --reindex mirror OK");
+ @ro_nums = map { $_->{num} } @{$ro_mirror->over->query_ts(0, 0)};
+ @rw_nums = map { $_->{num} } @{$ibx->over->query_ts(0, 0)};
+ is_deeply(\@rw_nums, \@expect, "v$v master has expected NNTP articles");
+ is_deeply(\@ro_nums, \@expect, "v$v mirror matches master articles");
+
+ is(PublicInbox::Admin::detect_indexlevel($ro_mirror), $level,
+ 'indexlevel detectable by Admin '.$v.$level);
+
+ SKIP: {
+ skip 'xapian-compact missing', 1 if !have_xapian_compact;
+ my $cmd = [ qw(-compact), $mirror ];
+ ok(run_script($cmd, undef, { 2 => \$err}), "compact $level")
+ or diag $err;
+ }
+};
+
+# we can probably cull some other tests
+$import_index_incremental->($PI_TEST_VERSION, 'basic', $mime);
-# we can probably cull some other tests and put full/medium tests, here
-for my $level (qw(basic)) {
- for my $v (1..2) {
- subtest("v$v indexlevel=$level" => sub {
- import_index_incremental($v, $level);
- })
+SKIP: {
+ require_mods(qw(Search::Xapian), 2);
+ foreach my $l (qw(medium full)) {
+ $import_index_incremental->($PI_TEST_VERSION, $l, $mime);
}
}