lei inspect: account for non-extindex inboxes

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

diff --git a/lib/PublicInbox/LeiSearch.pm b/lib/PublicInbox/LeiSearch.pm
index 568277a6f40443217494e383b609f83f9c5d571f..3e046b2146c6ca9f4f9b4341811a0b91d7215513 100644 (file)
--- a/lib/PublicInbox/LeiSearch.pm
+++ b/lib/PublicInbox/LeiSearch.pm
@@ -11,18 +11,10 @@ use PublicInbox::ContentHash qw(content_digest content_hash);
 use PublicInbox::MID qw(mids mids_for_index);
 use Carp qw(croak);
 
-# get combined docid from over.num:
-# (not generic Xapian, only works with our sharding scheme)
-sub num2docid ($$) {
-       my ($self, $num) = @_;
-       my $nshard = $self->{nshard};
-       ($num - 1) * $nshard + $num % $nshard + 1;
-}
-
 sub _msg_kw { # retry_reopen callback
        my ($self, $num) = @_;
        my $xdb = $self->xdb; # set {nshard} for num2docid;
-       xap_terms('K', $xdb, num2docid($self, $num));
+       xap_terms('K', $xdb, $self->num2docid($num));
 }
 
 sub msg_keywords { # array or hashref
@@ -35,7 +27,7 @@ sub _oid_kw { # retry_reopen callback
        my $xdb = $self->xdb; # set {nshard};
        my %kw;
        for my $num (@$nums) { # there should only be one...
-               my $doc = $xdb->get_document(num2docid($self, $num));
+               my $doc = $xdb->get_document($self->num2docid($num));
                my $x = xap_terms('K', $doc);
                %kw = (%kw, %$x);
        }
@@ -56,7 +48,7 @@ sub _xsmsg_vmd { # retry_reopen
        $kw{flagged} = 1 if delete($smsg->{lei_q_tt_flagged});
        my @num = $self->over->blob_exists($smsg->{blob});
        for my $num (@num) { # there should only be one...
-               $doc = $xdb->get_document(num2docid($self, $num));
+               $doc = $xdb->get_document($self->num2docid($num));
                $x = xap_terms('K', $doc);
                %kw = (%kw, %$x);
                if ($want_label) { # JSON/JMAP only
@@ -119,13 +111,13 @@ sub xoids_for {
                                $git->cat_async($cur->{blob}, \&_cmp_1st,
                                                [$chash, $xoids, $cur, $lms]);
                                if ($min && scalar(keys %$xoids) >= $min) {
-                                       $git->cat_async_wait;
+                                       $git->async_wait_all;
                                        return $xoids;
                                }
                        }
                }
        }
-       $git->cat_async_wait;
+       $git->async_wait_all;
        scalar(keys %$xoids) ? $xoids : undef;
 }