X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLeiSearch.pm;h=3e046b2146c6ca9f4f9b4341811a0b91d7215513;hb=c8b441f4ddcb9f6cbbe54cd380fe89586d023124;hp=47160ed98b7a81a4988cd9187fb8afd55a177217;hpb=0a3bcc909a9b023755079ee57f347f33aac75d3e;p=public-inbox.git

diff --git a/lib/PublicInbox/LeiSearch.pm b/lib/PublicInbox/LeiSearch.pm
index 47160ed9..3e046b21 100644
--- a/lib/PublicInbox/LeiSearch.pm
+++ b/lib/PublicInbox/LeiSearch.pm
@@ -9,19 +9,12 @@ use parent qw(PublicInbox::ExtSearch); # PublicInbox::Search->reopen
 use PublicInbox::Search qw(xap_terms);
 use PublicInbox::ContentHash qw(content_digest content_hash);
 use PublicInbox::MID qw(mids mids_for_index);
-
-# 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;
-}
+use Carp qw(croak);
 
 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
@@ -34,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);
 	}
@@ -55,17 +48,13 @@ 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...
-		eval {
-			$doc = $xdb->get_document(num2docid($self, $num));
-			$x = xap_terms('K', $doc);
-			%kw = (%kw, %$x);
-			if ($want_label) { # JSON/JMAP only
-				$x = xap_terms('L', $doc);
-				%L = (%L, %$x);
-			}
-		};
-		warn "$$ $0 #$num (nshard=$self->{nshard}) $smsg->{blob}: $@"
-			if $@;
+		$doc = $xdb->get_document($self->num2docid($num));
+		$x = xap_terms('K', $doc);
+		%kw = (%kw, %$x);
+		if ($want_label) { # JSON/JMAP only
+			$x = xap_terms('L', $doc);
+			%L = (%L, %$x);
+		}
 	}
 	$smsg->{kw} = [ sort keys %kw ] if scalar(keys(%kw));
 	$smsg->{L} = [ sort keys %L ] if scalar(keys(%L));
@@ -75,7 +64,8 @@ sub _xsmsg_vmd { # retry_reopen
 sub xsmsg_vmd {
 	my ($self, $smsg, $want_label) = @_;
 	return if $smsg->{kw}; # already set by LeiXSearch->mitem_kw
-	$self->retry_reopen(\&_xsmsg_vmd, $smsg, $want_label);
+	eval { $self->retry_reopen(\&_xsmsg_vmd, $smsg, $want_label) };
+	warn "$$ $0 (nshard=$self->{nshard}) $smsg->{blob}: $@" if $@;
 }
 
 # when a message has no Message-IDs at all, this is needed for
@@ -121,27 +111,32 @@ 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;
 }
 
 # returns true if $eml is indexed by lei/store and keywords don't match
 sub kw_changed {
 	my ($self, $eml, $new_kw_sorted, $docids) = @_;
+	my $cur_kw;
 	if ($eml) {
 		my $xoids = xoids_for($self, $eml) // return;
 		$docids //= [];
 		@$docids = sort { $a <=> $b } values %$xoids;
 	}
-	my $cur_kw = eval { msg_keywords($self, $docids->[0]) };
-	die "E: #$docids->[0] keyword lookup failure: $@\n" if $@;
-
+	for my $id (@$docids) {
+		$cur_kw = eval { msg_keywords($self, $id) } and last;
+	}
+	if (!defined($cur_kw) && $@) {
+		$docids = join(', num:', @$docids);
+		croak "E: num:$docids keyword lookup failure: $@";
+	}
 	# RFC 5550 sec 5.9 on the $Forwarded keyword states:
 	# "Once set, the flag SHOULD NOT be cleared"
 	if (exists($cur_kw->{forwarded}) &&