disambiguate OverIdx and Over by field name

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

diff --git a/t/search.t b/t/search.t
index aa6f94bf348c39c874a2b90bca4a81a459d3072a..f026e5093c9176d00f7bd39487d919caff6baa27 100644 (file)
--- a/t/search.t
+++ b/t/search.t
@@ -21,8 +21,8 @@ ok($@, "exception raised on non-existent DB");
 
 my $rw = PublicInbox::SearchIdx->new($ibx, 1);
 $ibx->with_umask(sub {
-       $rw->_xdb_acquire;
-       $rw->_xdb_release;
+       $rw->idx_acquire;
+       $rw->idx_release;
 });
 $rw = undef;
 my $ro = PublicInbox::Search->new($ibx);
@@ -161,7 +161,7 @@ are real
 EOF
        my $ghost_id = $rw->add_message($was_ghost);
        is($ghost_id, int($ghost_id), "ghost_id is an integer: $ghost_id");
-       my $msgs = $rw->{over}->get_thread('ghost-message@s');
+       my $msgs = $rw->{oidx}->get_thread('ghost-message@s');
        is(scalar(@$msgs), 2, 'got both messages in ghost thread');
        foreach (qw(sid tid)) {
                is($msgs->[0]->{$_}, $msgs->[1]->{$_}, "{$_} match");
@@ -263,13 +263,14 @@ To: list@example.com
 theatre
 fade
 EOF
-       my $res = $rw->query("theatre");
+       $rw_commit->();
+       my $res = $ro->reopen->query("theatre");
        is(scalar(@$res), 2, "got both matches");
        if (@$res == 2) {
                is($res->[0]->{mid}, 'nquote@a', 'non-quoted scores higher');
                is($res->[1]->{mid}, 'quote@a', 'quoted result still returned');
        }
-       $res = $rw->query("illusions");
+       $res = $ro->query("illusions");
        is(scalar(@$res), 1, "got a match for quoted text");
        is($res->[0]->{mid}, 'quote@a',
                "quoted result returned if nothing else") if scalar(@$res);
@@ -290,7 +291,8 @@ To: list\@example.com
 LOOP!
 EOF
        ok($doc_id > 0, "doc_id defined with circular reference");
-       my $smsg = $rw->query('m:circle@a', {limit=>1})->[0];
+       $rw_commit->();
+       my $smsg = $ro->reopen->query('m:circle@a', {limit=>1})->[0];
        is(defined($smsg), 1, 'found m:circl@a');
        if (defined $smsg) {
                is($smsg->{references}, '', "no references created");
@@ -298,11 +300,22 @@ EOF
        }
 });
 
+{
+       my $msgs = $ro->query('d:19931002..20101002');
+       ok(scalar(@$msgs) > 0, 'got results within range');
+       $msgs = $ro->query('d:20101003..');
+       is(scalar(@$msgs), 0, 'nothing after 20101003');
+       $msgs = $ro->query('d:..19931001');
+       is(scalar(@$msgs), 0, 'nothing before 19931001');
+}
+
 $ibx->with_umask(sub {
        my $mime = eml_load 't/utf8.eml';
        my $doc_id = $rw->add_message($mime);
        ok($doc_id > 0, 'message indexed doc_id with UTF-8');
-       my $msg = $rw->query('m:testmessage@example.com', {limit => 1})->[0];
+       $rw_commit->();
+       my $msg = $ro->reopen->
+               query('m:testmessage@example.com', {limit => 1})->[0];
        is(defined($msg), 1, 'found testmessage@example.com');
        if (defined $msg) {
                is($mime->header('Subject'), $msg->{subject},
@@ -310,19 +323,10 @@ $ibx->with_umask(sub {
        }
 });
 
-{
-       my $msgs = $ro->query('d:19931002..20101002');
-       ok(scalar(@$msgs) > 0, 'got results within range');
-       $msgs = $ro->query('d:20101003..');
-       is(scalar(@$msgs), 0, 'nothing after 20101003');
-       $msgs = $ro->query('d:..19931001');
-       is(scalar(@$msgs), 0, 'nothing before 19931001');
-}
-
 # names and addresses
 {
        my $mset = $ro->query('t:list@example.com', {mset => 1});
-       is($mset->size, 6, 'searched To: successfully');
+       is($mset->size, 9, 'searched To: successfully');
        foreach my $m ($mset->items) {
                my $smsg = $ro->{over_ro}->get_art($m->get_docid);
                like($smsg->{to}, qr/\blist\@example\.com\b/, 'to appears');
@@ -340,7 +344,7 @@ $ibx->with_umask(sub {
        }
 
        $mset = $ro->query('tc:list@example.com', {mset => 1});
-       is($mset->size, 6, 'searched To+Cc: successfully');
+       is($mset->size, 9, 'searched To+Cc: successfully');
        foreach my $m ($mset->items) {
                my $smsg = $ro->{over_ro}->get_art($m->get_docid);
                my $tocc = join("\n", $smsg->{to}, $smsg->{cc});
@@ -420,6 +424,7 @@ $ibx->with_umask(sub {
                $art = $ro->{over_ro}->next_by_mid($mid, \$id, \$prev);
                ok($art, 'article exists in OVER DB');
        }
+       $rw->_msgmap_init;
        $rw->unindex_eml($oid, $amsg);
        $rw->commit_txn_lazy;
        SKIP: {