diff options
| author | Eric Wong <e@80x24.org> | 2021-10-14 03:12:25 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2021-10-14 09:07:14 +0000 |
| commit | c8b441f4ddcb9f6cbbe54cd380fe89586d023124 (patch) | |
| tree | 2d63566131a6a465841ca330d24f4c05507304cf /lib/PublicInbox/LeiSearch.pm | |
| parent | c485036d0b1ce7ed94ea02f84a8a5cd86144ad02 (diff) | |
| download | public-inbox-c8b441f4ddcb9f6cbbe54cd380fe89586d023124.tar.gz | |
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.
Diffstat (limited to 'lib/PublicInbox/LeiSearch.pm')
| -rw-r--r-- | lib/PublicInbox/LeiSearch.pm | 14 |
1 files changed, 3 insertions, 11 deletions
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 |