X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fsearch.t;h=3124baebe6036f148507d9a82301c5f76fc3ddee;hb=73e3a6ed6e95adc67cfa10079f11c28fe3f78517;hp=82caf9e41c3dc5170514db48f82ac52e9602b54a;hpb=cd389aac52936c82f3416b3ceefe21e1250b8a3e;p=public-inbox.git

diff --git a/t/search.t b/t/search.t
index 82caf9e4..3124baeb 100644
--- a/t/search.t
+++ b/t/search.t
@@ -21,11 +21,11 @@ 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);
+my $ro = $ibx->search;
 my $rw_commit = sub {
 	$rw->commit_txn_lazy if $rw;
 	$rw = PublicInbox::SearchIdx->new($ibx, 1);
@@ -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");
@@ -233,7 +233,7 @@ EOF
 
 	$rw_commit->();
 	$ro->reopen;
-	my $t = $ro->{over_ro}->get_thread('root@s');
+	my $t = $ibx->over->get_thread('root@s');
 	is(scalar(@$t), 4, "got all 4 messages in thread");
 	my @exp = sort($long_reply_mid, 'root@s', 'last@s', $long_mid);
 	@res = filter_mids($t);
@@ -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,21 +323,12 @@ $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);
+		my $smsg = $ibx->over->get_art($m->get_docid);
 		like($smsg->{to}, qr/\blist\@example\.com\b/, 'to appears');
 		my $doc = $m->get_document;
 		my $col = PublicInbox::Search::BYTES();
@@ -340,9 +344,9 @@ $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 $smsg = $ibx->over->get_art($m->get_docid);
 		my $tocc = join("\n", $smsg->{to}, $smsg->{cc});
 		like($tocc, qr/\blist\@example\.com\b/, 'tocc appears');
 	}
@@ -351,7 +355,7 @@ $ibx->with_umask(sub {
 		my $mset = $ro->query($pfx . 'foo@example.com', { mset => 1 });
 		is($mset->items, 1, "searched $pfx successfully for Cc:");
 		foreach my $m ($mset->items) {
-			my $smsg = $ro->{over_ro}->get_art($m->get_docid);
+			my $smsg = $ibx->over->get_art($m->get_docid);
 			like($smsg->{cc}, qr/\bfoo\@example\.com\b/,
 				'cc appears');
 		}
@@ -397,7 +401,9 @@ $ibx->with_umask(sub {
 
 $ibx->with_umask(sub {
 	my $amsg = eml_load 't/search-amsg.eml';
-	ok($rw->add_message($amsg), 'added attachment');
+	my $oid = ('0'x40);
+	my $smsg = bless { blob => $oid }, 'PublicInbox::Smsg';
+	ok($rw->add_message($amsg, $smsg), 'added attachment');
 	$rw_commit->();
 	$ro->reopen;
 	my $n = $ro->query('n:attached_fart.txt');
@@ -415,14 +421,15 @@ $ibx->with_umask(sub {
 	if (scalar(@$n) >= 1) {
 		my $mid = $n->[0]->{mid};
 		my ($id, $prev);
-		$art = $ro->{over_ro}->next_by_mid($mid, \$id, \$prev);
+		$art = $ibx->over->next_by_mid($mid, \$id, \$prev);
 		ok($art, 'article exists in OVER DB');
 	}
-	$rw->unindex_blob($amsg);
+	$rw->_msgmap_init;
+	$rw->unindex_eml($oid, $amsg);
 	$rw->commit_txn_lazy;
 	SKIP: {
 		skip('$art not defined', 1) unless defined $art;
-		is($ro->{over_ro}->get_art($art->{num}), undef,
+		is($ibx->over->get_art($art->{num}), undef,
 			'gone from OVER DB');
 	};
 });