use Test::More;
use PublicInbox::MIME;
use PublicInbox::Inbox;
+use PublicInbox::InboxWritable;
use File::Temp qw/tempdir/;
require './t/common.perl';
require_git(2.6);
my $this = (split('/', __FILE__))[-1];
-# TODO: remove Search::Xapian as a requirement for basic
-foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
+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 $xcpdb = "$path/public-inbox-xcpdb";
my $mime = PublicInbox::MIME->create(
header => [
-primary_address => 'test@example.com',
indexlevel => $level,
});
- my $cls = "PublicInbox::V${v}Writable";
- use_ok $cls;
- my $im = $cls->new($ibx, {nproc=>1});
+ 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;
# index master (required for v1)
- is(system($index, $ibx->{mainrepo}), 0, 'index master OK');
- my $ro_master = PublicInbox::Inbox->new({mainrepo => $ibx->{mainrepo}});
+ is(system($index, $ibx->{mainrepo}, "-L$level"), 0, 'index master OK');
+ my $ro_master = PublicInbox::Inbox->new({
+ mainrepo => $ibx->{mainrepo},
+ indexlevel => $level
+ });
my ($nr, $msgs) = $ro_master->recent;
is($nr, 1, 'only one message in master, so far');
is($msgs->[0]->{mid}, 'm@1', 'first message in master indexed');
is(system($index, $mirror), 0, "v$v index mirror OK");
# read-only access
- my $ro_mirror = PublicInbox::Inbox->new({mainrepo => $mirror});
+ my $ro_mirror = PublicInbox::Inbox->new({
+ mainrepo => $mirror,
+ indexlevel => 'basic'
+ });
($nr, $msgs) = $ro_mirror->recent;
is($nr, 1, 'only one message, so far');
is($msgs->[0]->{mid}, 'm@1', 'read first message');
['m@1','m@2'], 'got both messages in mirror');
# incremental index master (required for v1)
- is(system($index, $ibx->{mainrepo}), 0, 'index master OK');
+ is(system($index, $ibx->{mainrepo}, "-L$level"), 0, 'index master OK');
($nr, $msgs) = $ro_master->recent;
is($nr, 2, '2nd message seen in master');
is_deeply([sort { $a cmp $b } map { $_->{mid} } @$msgs],
ok($im->remove($mime), '2nd message removed');
$im->done;
+ if ($level ne 'basic') {
+ is(system($xcpdb, $mirror), 0, "v$v xcpdb OK");
+ delete $ro_mirror->{$_} for (qw(over search));
+ ($nr, $msgs) = $ro_mirror->search->query('m:m@2');
+ is($nr, 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");
is($nr, 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');
+ }
+ if ($level ne 'basic') {
+ ($nr, $msgs) = $ro_mirror->search->reopen->query('m:m@2');
+ is($nr, 0, "v$v m\@2 gone from Xapian in mirror on $level");
+ }
}
# we can probably cull some other tests and put full/medium tests, here
}
}
+SKIP: {
+ require PublicInbox::Search;
+ PublicInbox::Search::load_xapian() or skip 'Search::Xapian missing', 2;
+ for my $v (1..2) {
+ subtest("v$v indexlevel=medium" => sub {
+ import_index_incremental($v, 'medium');
+ })
+ }
+}
+
done_testing();