lei inspect: account for non-extindex inboxes

Inbox->xdb does not exist, but this code path was apparently
never tested :x  I noticed this on basic v2 inbox, but it could
happen with any v1/v2 inbox.  Move ->num2docid into Search
so it's less awkward to use.

diff --git a/lib/PublicInbox/LeiInspect.pm b/lib/PublicInbox/LeiInspect.pm
index 590dfdabca566ef1e37e29a472ba09c9a6bc76d6..5ba96056bc65b14589cb49910af5fd54faab1f83 100644 (file)
--- a/lib/PublicInbox/LeiInspect.pm
+++ b/lib/PublicInbox/LeiInspect.pm
@@ -143,8 +143,10 @@ sub inspect_num ($$) {
        my $ent = { num => $num };
        if (defined(my $dir = $lei->{opt}->{dir})) {
                $ibx = dir2ibx($lei, $dir) or return;
-               $ent->{xdb} = $ibx->xdb and # for inspect_docid
-                       $docid = PublicInbox::LeiSearch::num2docid($ibx, $num);
+               if (my $srch = $ibx->search) {
+                       $ent->{xdb} = $srch->xdb and
+                               $docid = $srch->num2docid($num);
+               }
        } elsif ($lei->{lse}) {
                $ibx = $lei->{lse};
                $lei->{lse}->xdb; # set {nshard} for num2docid

diff --git a/lib/PublicInbox/LeiSearch.pm b/lib/PublicInbox/LeiSearch.pm
index 4e048e9a40b7a9f2794d067eeef15f750b0d1d61..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

diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index f0e7ed0c2665d43308682986d6612ae1d1696000..d89bf545739b17b7097ea37a85cb0be1e58e858d 100644 (file)
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -570,4 +570,12 @@ sub xap_terms ($$;@) {
        wantarray ? sort(keys(%ret)) : \%ret;
 }
 
+# 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;
+}
+
 1;

diff --git a/t/lei-mirror.t b/t/lei-mirror.t
index 294eb6542b2e6e50ed941553fa1e3650b72a9b02..646ff2b19f98e08a96f145de823fb13f0df212a0 100644 (file)
--- a/t/lei-mirror.t
+++ b/t/lei-mirror.t
@@ -176,6 +176,12 @@ SKIP: {
        $f = "$d/t2/msgmap.sqlite3";
        $ca = PublicInbox::Msgmap->new_file($f)->created_at;
        is($ca, $created{v2}, 'clone + index v1 synced ->created_at');
+       test_lei(sub {
+               lei_ok qw(inspect num:1 --dir), "$d/t1";
+               ok(ref(json_utf8->decode($lei_out)), 'inspect num: on v1');
+               lei_ok qw(inspect num:1 --dir), "$d/t2";
+               ok(ref(json_utf8->decode($lei_out)), 'inspect num: on v2');
+       });
 }
 
 ok($td->kill, 'killed -httpd');