smsg: remove from_mitem

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.

1 files changed, 7 insertions, 4 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