From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id DBDEA1F670 for ; Thu, 14 Oct 2021 03:12:25 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] lei inspect: account for non-extindex inboxes Date: Thu, 14 Oct 2021 03:12:25 +0000 Message-Id: <20211014031225.24967-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: 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. --- lib/PublicInbox/LeiInspect.pm | 6 ++++-- lib/PublicInbox/LeiSearch.pm | 14 +++----------- lib/PublicInbox/Search.pm | 8 ++++++++ t/lei-mirror.t | 6 ++++++ 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/lib/PublicInbox/LeiInspect.pm b/lib/PublicInbox/LeiInspect.pm index 590dfdab..5ba96056 100644 --- 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 4e048e9a..3e046b21 100644 --- 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 f0e7ed0c..d89bf545 100644 --- 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 294eb654..646ff2b1 100644 --- 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');