use PublicInbox::ContentId qw(content_digest);
use File::Temp qw/tempdir/;
use File::Path qw(remove_tree);
+require './t/common.perl';
+require_git(2.6);
foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
eval "require $mod";
body => "hello world\n",
);
my $minmax;
+my $msgmap;
+my ($mark1, $mark2, $mark3, $mark4);
{
my %config = %$ibx_config;
my $ibx = PublicInbox::Inbox->new(\%config);
$mime->header_set('Message-Id', "<$i\@example.com>");
ok($im->add($mime), "message $i added");
if ($i == 4) {
+ $mark1 = $im->get_mark($im->{tip});
$im->remove($mime);
+ $mark2 = $im->get_mark($im->{tip});
}
}
if ('test remove later') {
+ $mark3 = $im->get_mark($im->{tip});
$mime->header_set('Message-Id', "<5\@example.com>");
$im->remove($mime);
+ $mark4 = $im->get_mark($im->{tip});
}
$im->done;
$minmax = [ $ibx->mm->minmax ];
ok(defined $minmax->[0] && defined $minmax->[1], 'minmax defined');
is_deeply($minmax, [ 1, 10 ], 'minmax as expected');
+ is($ibx->mm->num_highwater, 10, 'num_highwater as expected');
+
+ my ($min, $max) = @$minmax;
+ $msgmap = $ibx->mm->msg_range(\$min, $max);
+ is_deeply($msgmap, [
+ [1, '1@example.com' ],
+ [2, '2@example.com' ],
+ [3, '3@example.com' ],
+ [6, '6@example.com' ],
+ [7, '7@example.com' ],
+ [8, '8@example.com' ],
+ [9, '9@example.com' ],
+ [10, '10@example.com' ],
+ ], 'msgmap as expected');
}
{
eval { $rw->index_sync({reindex => 1}) };
is($@, '', 'no error from reindexing');
$im->done;
+
+ is($ibx->mm->num_highwater, 10, 'num_highwater as expected');
+
+ my ($min, $max) = $ibx->mm->minmax;
+ is_deeply($ibx->mm->msg_range(\$min, $max), $msgmap, 'msgmap unchanged');
}
my $xap = "$mainrepo/public-inbox/xapian".PublicInbox::Search::SCHEMA_VERSION();
delete $ibx->{mm};
is_deeply([ $ibx->mm->minmax ], $minmax, 'minmax unchanged');
+ is($ibx->mm->num_highwater, 10, 'num_highwater as expected');
+
+ my ($min, $max) = $ibx->mm->minmax;
+ is_deeply($ibx->mm->msg_range(\$min, $max), $msgmap, 'msgmap unchanged');
}
ok(unlink "$mainrepo/public-inbox/msgmap.sqlite3", 'remove msgmap');
ok(-d $xap, 'Xapian directories recreated');
delete $ibx->{mm};
is_deeply([ $ibx->mm->minmax ], $minmax, 'minmax unchanged');
+ is($ibx->mm->num_highwater, 10, 'num_highwater as expected');
+
+ my ($min, $max) = $ibx->mm->minmax;
+ is_deeply($ibx->mm->msg_range(\$min, $max), $msgmap, 'msgmap unchanged');
}
ok(unlink "$mainrepo/public-inbox/msgmap.sqlite3", 'remove msgmap');
ok(-d $xap, 'Xapian directories recreated');
delete $ibx->{mm};
is_deeply([ $ibx->mm->minmax ], $minmax, 'minmax unchanged');
+ is($ibx->mm->num_highwater, 10, 'num_highwater as expected');
+
+ my ($min, $max) = @$minmax;
+ is_deeply($ibx->mm->msg_range(\$min, $max), $msgmap, 'msgmap unchanged');
}
ok(unlink "$mainrepo/public-inbox/msgmap.sqlite3", 'remove msgmap');
ok(-d $xap, 'Xapian directories recreated');
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('hello world', {mset=>1});
isnt($mset->size, 0, 'got Xapian search results');
+
+ my ($min, $max) = $ibx->mm->minmax;
+ is_deeply($ibx->mm->msg_range(\$min, $max), $msgmap, 'msgmap unchanged');
}
ok(unlink "$mainrepo/public-inbox/msgmap.sqlite3", 'remove msgmap');
ok(-d $xap, 'Xapian directories recreated');
delete $ibx->{mm};
is_deeply([ $ibx->mm->minmax ], $minmax, 'minmax unchanged');
- my $mset = $ibx->search->reopen->query('hello world', {mset=>1});
- is($mset->size, 0, "no Xapian search results");
+ is($ibx->mm->num_highwater, 10, 'num_highwater as expected');
+ isnt($ibx->search, 'no search for basic');
+
+ my ($min, $max) = $ibx->mm->minmax;
+ is_deeply($ibx->mm->msg_range(\$min, $max), $msgmap, 'msgmap unchanged');
}
# upgrade existing basic to medium
is_deeply(\@warn, [], 'no warnings');
my $mset = $ibx->search->reopen->query('hello world', {mset=>1});
isnt($mset->size, 0, 'search OK after basic -> medium');
+
+ is($ibx->mm->num_highwater, 10, 'num_highwater as expected');
+
+ my ($min, $max) = $ibx->mm->minmax;
+ is_deeply($ibx->mm->msg_range(\$min, $max), $msgmap, 'msgmap unchanged');
+}
+
+# An incremental indexing test
+ok(unlink "$mainrepo/public-inbox/msgmap.sqlite3", 'remove msgmap');
+remove_tree($xap);
+ok(!-d $xap, 'Xapian directories removed again');
+{
+ my @warn;
+ local $SIG{__WARN__} = sub { push @warn, @_ };
+ my %config = %$ibx_config;
+ my $ibx = PublicInbox::Inbox->new(\%config);
+ my $im = PublicInbox::Import->new($ibx->git, undef, undef, $ibx);
+ my $rw = PublicInbox::SearchIdx->new($ibx, 1);
+ # mark1 4 simple additions in the same index_sync
+ eval { $rw->index_sync({ref => $mark1}) };
+ is($@, '', 'no error from reindexing without msgmap');
+ is_deeply(\@warn, [], 'no warnings');
+ $im->done;
+ my ($min, $max) = $ibx->mm->minmax;
+ is($min, 1, 'min as expected');
+ is($max, 4, 'max as expected');
+ is($ibx->mm->num_highwater, 4, 'num_highwater as expected');
+ is_deeply($ibx->mm->msg_range(\$min, $max),
+ [
+ [1, '1@example.com' ],
+ [2, '2@example.com' ],
+ [3, '3@example.com' ],
+ [4, '4@example.com' ],
+ ], 'msgmap as expected' );
+}
+{
+ my @warn;
+ local $SIG{__WARN__} = sub { push @warn, @_ };
+ my %config = %$ibx_config;
+ my $ibx = PublicInbox::Inbox->new(\%config);
+ my $im = PublicInbox::Import->new($ibx->git, undef, undef, $ibx);
+ my $rw = PublicInbox::SearchIdx->new($ibx, 1);
+ # mark2 A delete separated form and add in the same index_sync
+ eval { $rw->index_sync({ref => $mark2}) };
+ is($@, '', 'no error from reindexing without msgmap');
+ is_deeply(\@warn, [], 'no warnings');
+ $im->done;
+ my ($min, $max) = $ibx->mm->minmax;
+ is($min, 1, 'min as expected');
+ is($max, 3, 'max as expected');
+ is($ibx->mm->num_highwater, 4, 'num_highwater as expected');
+ is_deeply($ibx->mm->msg_range(\$min, $max),
+ [
+ [1, '1@example.com' ],
+ [2, '2@example.com' ],
+ [3, '3@example.com' ],
+ ], 'msgmap as expected' );
+}
+{
+ my @warn;
+ local $SIG{__WARN__} = sub { push @warn, @_ };
+ my %config = %$ibx_config;
+ my $ibx = PublicInbox::Inbox->new(\%config);
+ my $im = PublicInbox::Import->new($ibx->git, undef, undef, $ibx);
+ my $rw = PublicInbox::SearchIdx->new($ibx, 1);
+ # mark3 adds following the delete at mark2
+ eval { $rw->index_sync({ref => $mark3}) };
+ is($@, '', 'no error from reindexing without msgmap');
+ is_deeply(\@warn, [], 'no warnings');
+ $im->done;
+ my ($min, $max) = $ibx->mm->minmax;
+ is($min, 1, 'min as expected');
+ is($max, 10, 'max as expected');
+ is($ibx->mm->num_highwater, 10, 'num_highwater as expected');
+ is_deeply($ibx->mm->msg_range(\$min, $max),
+ [
+ [1, '1@example.com' ],
+ [2, '2@example.com' ],
+ [3, '3@example.com' ],
+ [5, '5@example.com' ],
+ [6, '6@example.com' ],
+ [7, '7@example.com' ],
+ [8, '8@example.com' ],
+ [9, '9@example.com' ],
+ [10, '10@example.com' ],
+ ], 'msgmap as expected' );
+}
+{
+ my @warn;
+ local $SIG{__WARN__} = sub { push @warn, @_ };
+ my %config = %$ibx_config;
+ my $ibx = PublicInbox::Inbox->new(\%config);
+ my $im = PublicInbox::Import->new($ibx->git, undef, undef, $ibx);
+ my $rw = PublicInbox::SearchIdx->new($ibx, 1);
+ # mark4 A delete of an older message
+ eval { $rw->index_sync({ref => $mark4}) };
+ is($@, '', 'no error from reindexing without msgmap');
+ is_deeply(\@warn, [], 'no warnings');
+ $im->done;
+ my ($min, $max) = $ibx->mm->minmax;
+ is($min, 1, 'min as expected');
+ is($max, 10, 'max as expected');
+ is($ibx->mm->num_highwater, 10, 'num_highwater as expected');
+ is_deeply($ibx->mm->msg_range(\$min, $max),
+ [
+ [1, '1@example.com' ],
+ [2, '2@example.com' ],
+ [3, '3@example.com' ],
+ [6, '6@example.com' ],
+ [7, '7@example.com' ],
+ [8, '8@example.com' ],
+ [9, '9@example.com' ],
+ [10, '10@example.com' ],
+ ], 'msgmap as expected' );
}
+
+# Another incremental indexing test
+ok(unlink "$mainrepo/public-inbox/msgmap.sqlite3", 'remove msgmap');
+remove_tree($xap);
+ok(!-d $xap, 'Xapian directories removed again');
+{
+ my @warn;
+ local $SIG{__WARN__} = sub { push @warn, @_ };
+ my %config = %$ibx_config;
+ my $ibx = PublicInbox::Inbox->new(\%config);
+ my $im = PublicInbox::Import->new($ibx->git, undef, undef, $ibx);
+ my $rw = PublicInbox::SearchIdx->new($ibx, 1);
+ # mark2 an add and it's delete in the same index_sync
+ eval { $rw->index_sync({ref => $mark2}) };
+ is($@, '', 'no error from reindexing without msgmap');
+ is_deeply(\@warn, [], 'no warnings');
+ $im->done;
+ my ($min, $max) = $ibx->mm->minmax;
+ is($min, 1, 'min as expected');
+ is($max, 3, 'max as expected');
+ is($ibx->mm->num_highwater, 4, 'num_highwater as expected');
+ is_deeply($ibx->mm->msg_range(\$min, $max),
+ [
+ [1, '1@example.com' ],
+ [2, '2@example.com' ],
+ [3, '3@example.com' ],
+ ], 'msgmap as expected' );
+}
+{
+ my @warn;
+ local $SIG{__WARN__} = sub { push @warn, @_ };
+ my %config = %$ibx_config;
+ my $ibx = PublicInbox::Inbox->new(\%config);
+ my $im = PublicInbox::Import->new($ibx->git, undef, undef, $ibx);
+ my $rw = PublicInbox::SearchIdx->new($ibx, 1);
+ # mark3 adds following the delete at mark2
+ eval { $rw->index_sync({ref => $mark3}) };
+ is($@, '', 'no error from reindexing without msgmap');
+ is_deeply(\@warn, [], 'no warnings');
+ $im->done;
+ my ($min, $max) = $ibx->mm->minmax;
+ is($min, 1, 'min as expected');
+ is($max, 10, 'max as expected');
+ is($ibx->mm->num_highwater, 10, 'num_highwater as expected');
+ is_deeply($ibx->mm->msg_range(\$min, $max),
+ [
+ [1, '1@example.com' ],
+ [2, '2@example.com' ],
+ [3, '3@example.com' ],
+ [5, '5@example.com' ],
+ [6, '6@example.com' ],
+ [7, '7@example.com' ],
+ [8, '8@example.com' ],
+ [9, '9@example.com' ],
+ [10, '10@example.com' ],
+ ], 'msgmap as expected' );
+}
+{
+ my @warn;
+ local $SIG{__WARN__} = sub { push @warn, @_ };
+ my %config = %$ibx_config;
+ my $ibx = PublicInbox::Inbox->new(\%config);
+ my $im = PublicInbox::Import->new($ibx->git, undef, undef, $ibx);
+ my $rw = PublicInbox::SearchIdx->new($ibx, 1);
+ # mark4 A delete of an older message
+ eval { $rw->index_sync({ref => $mark4}) };
+ is($@, '', 'no error from reindexing without msgmap');
+ is_deeply(\@warn, [], 'no warnings');
+ $im->done;
+ my ($min, $max) = $ibx->mm->minmax;
+ is($min, 1, 'min as expected');
+ is($max, 10, 'max as expected');
+ is($ibx->mm->num_highwater, 10, 'num_highwater as expected');
+ is_deeply($ibx->mm->msg_range(\$min, $max),
+ [
+ [1, '1@example.com' ],
+ [2, '2@example.com' ],
+ [3, '3@example.com' ],
+ [6, '6@example.com' ],
+ [7, '7@example.com' ],
+ [8, '8@example.com' ],
+ [9, '9@example.com' ],
+ [10, '10@example.com' ],
+ ], 'msgmap as expected' );
+}
+
+
done_testing();