We no longer read docdata.glass from anywhere in our code base.
Some adjustments were needed to t/search.t to deal with the
Xapian::WritableDatabase committing at different times, since
our ->query is avoided from PublicInbox::SearchIdx to avoid
needing a {over_ro} field.
---
lib/PublicInbox/Search.pm | 11 +++++++----
lib/PublicInbox/Smsg.pm | 8 --------
t/search.t | 34 +++++++++++++++++++---------------
3 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index e6200bfb..1c648299 100644
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -324,10 +324,13 @@ sub _enquire_once { # retry_reopen callback
my $limit = $opts->{limit} || 50;
my $mset = $enquire->get_mset($offset, $limit);
return $mset if $opts->{mset};
- my @msgs = map { PublicInbox::Smsg::from_mitem($_) } $mset->items;
- return \@msgs unless wantarray;
-
- ($mset->get_matches_estimated, \@msgs)
+ my $nshard = $self->{nshard} // 1;
+ my $i = 0;
+ my %order = map { mdocid($nshard, $_) => ++$i } $mset->items;
+ my @msgs = sort {
+ $order{$a->{num}} <=> $order{$b->{num}}
+ } @{$self->{over_ro}->get_all(keys %order)};
+ wantarray ? ($mset->get_matches_estimated, \@msgs) : \@msgs;
}
# read-write
diff --git a/lib/PublicInbox/Smsg.pm b/lib/PublicInbox/Smsg.pm
index f22cd43e..51226b8e 100644
--- a/lib/PublicInbox/Smsg.pm
+++ b/lib/PublicInbox/Smsg.pm
@@ -86,14 +86,6 @@ sub psgi_cull ($) {
$self;
}
-# Only called by PSGI interface, not NNTP
-sub from_mitem {
- my ($mitem, $srch) = @_;
- return $srch->retry_reopen(\&from_mitem, $mitem) if $srch;
- my $self = bless {}, __PACKAGE__;
- psgi_cull(load_expand($self, $mitem->get_document));
-}
-
# for Import and v1 non-SQLite WWW code paths
sub populate {
my ($self, $hdr, $sync) = @_;
diff --git a/t/search.t b/t/search.t
index 299f57c8..e2290ecd 100644
--- a/t/search.t
+++ b/t/search.t
@@ -263,13 +263,14 @@ To: l...@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:testmess...@example.com', {limit => 1})->[0];
+ $rw_commit->();
+ my $msg = $ro->reopen->
+ query('m:testmess...@example.com', {limit => 1})->[0];
is(defined($msg), 1, 'found testmess...@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:l...@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:l...@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});
--
unsubscribe: one-click, see List-Unsubscribe header
archive: https://public-inbox.org/meta/
