search: add mset_to_artnums method

[public-inbox.git] / lib / PublicInbox / IMAP.pm

diff --git a/lib/PublicInbox/IMAP.pm b/lib/PublicInbox/IMAP.pm
index e0602143835baed35dcc164b63da0d514acb3f55..abdb8fec0d951f30fb56e2419f138c9bf8623c66 100644 (file)
--- a/lib/PublicInbox/IMAP.pm
+++ b/lib/PublicInbox/IMAP.pm
@@ -40,9 +40,7 @@ use PublicInbox::Syscall qw(EPOLLIN EPOLLONESHOT);
 use PublicInbox::GitAsyncCat;
 use Text::ParseWords qw(parse_line);
 use Errno qw(EAGAIN);
-use PublicInbox::Search;
 use PublicInbox::IMAPsearchqp;
-*mdocid = \&PublicInbox::Search::mdocid;
 
 my $Address;
 for my $mod (qw(Email::Address::XS Mail::Address)) {
@@ -246,6 +244,7 @@ sub uo2m_extend ($$;$) {
        my $base = $self->{uid_base};
        ++$beg;
        my $uids = $self->{ibx}->over->uid_range($beg, $base + UID_SLICE);
+       return $uo2m if !scalar(@$uids);
        my @tmp; # [$UID_OFFSET] => $MSN
        my $write_method = $_[2] // 'msg_more';
        if (ref($uo2m)) {
@@ -620,12 +619,18 @@ sub fetch_blob_cb { # called by git->cat_async via git_async_cat
        if (!defined($oid)) {
                # it's possible to have TOCTOU if an admin runs
                # public-inbox-(edit|purge), just move onto the next message
+               warn "E: $smsg->{blob} missing in $self->{ibx}->{inboxdir}\n";
                return requeue_once($self);
        } else {
                $smsg->{blob} eq $oid or die "BUG: $smsg->{blob} != $oid";
        }
+       my $pre;
+       if (!$self->{wbuf} && (my $nxt = $msgs->[0])) {
+               $pre = $self->{ibx}->git->async_prefetch($nxt->{blob},
+                                               \&fetch_blob_cb, $fetch_arg);
+       }
        fetch_run_ops($self, $smsg, $bref, $ops, $partial);
-       requeue_once($self);
+       $pre ? $self->zflush : requeue_once($self);
 }
 
 sub emit_rfc822 {
@@ -1182,9 +1187,8 @@ sub refill_xap ($$$$) {
        my ($beg, $end) = @$range_info;
        my $srch = $self->{ibx}->search;
        my $opt = { mset => 2, limit => 1000 };
-       my $nshard = $srch->{nshard} // 1;
        my $mset = $srch->query("$q uid:$beg..$end", $opt);
-       @$uids = map { mdocid($nshard, $_) } $mset->items;
+       @$uids = @{$srch->mset_to_artnums($mset)};
        if (@$uids) {
                $range_info->[0] = $uids->[-1] + 1; # update $beg
                return; # possibly more