about summary refs log tree commit homepage
diff options
context:
space:
mode:
-rw-r--r--scripts/dupe-finder3
-rw-r--r--t/search.t14
-rw-r--r--t/v2mirror.t2
-rw-r--r--t/v2writable.t4
-rw-r--r--xt/perf-threading.t2
5 files changed, 12 insertions, 13 deletions
diff --git a/scripts/dupe-finder b/scripts/dupe-finder
index 04714cbd..7b490cbb 100644
--- a/scripts/dupe-finder
+++ b/scripts/dupe-finder
@@ -21,8 +21,7 @@ if (index($repo, '@') > 0) {
 }
 $ibx or die "No inbox";
 $ibx->search or die "search not available for inbox";
-my $dbh = $ibx->search->{over_ro}->dbh;
-my $over = PublicInbox::Over->new($dbh->sqlite_db_filename);
+my $over = $ibx->over;
 
 sub emit ($) {
         my ($nums) = @_;
diff --git a/t/search.t b/t/search.t
index f026e509..3124baeb 100644
--- a/t/search.t
+++ b/t/search.t
@@ -25,7 +25,7 @@ $ibx->with_umask(sub {
         $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);
@@ -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);
@@ -328,7 +328,7 @@ $ibx->with_umask(sub {
         my $mset = $ro->query('t:list@example.com', {mset => 1});
         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();
@@ -346,7 +346,7 @@ $ibx->with_umask(sub {
         $mset = $ro->query('tc:list@example.com', {mset => 1});
         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');
         }
@@ -355,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');
                 }
@@ -421,7 +421,7 @@ $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->_msgmap_init;
@@ -429,7 +429,7 @@ $ibx->with_umask(sub {
         $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');
         };
 });
diff --git a/t/v2mirror.t b/t/v2mirror.t
index a4ac682d..bca43fd5 100644
--- a/t/v2mirror.t
+++ b/t/v2mirror.t
@@ -134,7 +134,7 @@ $mime->header_set('Subject', 'subject = 10');
 
 $v2w->done;
 
-my $msgs = $mibx->search->{over_ro}->get_thread('10@example.com');
+my $msgs = $mibx->over->get_thread('10@example.com');
 my $to_purge = $msgs->[0]->{blob};
 like($to_purge, qr/\A[a-f0-9]{40,}\z/, 'read blob to be purged');
 $mset = $ibx->search->reopen->query('m:10@example.com', {mset => 1});
diff --git a/t/v2writable.t b/t/v2writable.t
index 9e4547ba..217eaf97 100644
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -235,7 +235,7 @@ EOF
         my $mset = $srch->query('m:'.$mid, { mset => 1});
         is($mset->size, 0, 'no longer found in Xapian');
         my @log1 = (@log, qw(-1 --pretty=raw --raw -r --no-renames));
-        is($srch->{over_ro}->get_art($num), undef,
+        is($ibx->over->get_art($num), undef,
                 'removal propagated to Over DB');
 
         my $after = $git0->qx(@log1);
@@ -278,7 +278,7 @@ EOF
         ok($im->add($mime), 'add excessively long References');
         $im->barrier;
 
-        my $msgs = $ibx->search->{over_ro}->get_thread('x'x244);
+        my $msgs = $ibx->over->get_thread('x'x244);
         is(2, scalar(@$msgs), 'got both messages');
         is($msgs->[0]->{mid}, 'x'x244, 'stored truncated mid');
         is($msgs->[1]->{references}, '<'.('x'x244).'>', 'stored truncated ref');
diff --git a/xt/perf-threading.t b/xt/perf-threading.t
index ae98a5ba..b27c9cbd 100644
--- a/xt/perf-threading.t
+++ b/xt/perf-threading.t
@@ -18,7 +18,7 @@ require PublicInbox::View;
 
 my $msgs;
 my $elapsed = timeit(1, sub {
-        $msgs = $srch->{over_ro}->recent({limit => 200000});
+        $msgs = $ibx->over->recent({limit => 200000});
 });
 my $n = scalar(@$msgs);
 ok($n, 'got some messages');