* [PATCH] lei_xsearch: fix accounting bugs in for remote mboxrd
@ 2021-05-06 2:28 Eric Wong
0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2021-05-06 2:28 UTC (permalink / raw)
To: meta
We must not accumulate mset totals for messages which
have already been counted. Furthermore, the combined
search was being passed an extra arg and causing the
total to go missing.
---
lib/PublicInbox/LeiXSearch.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm
index 21b15025..e69a4edd 100644
--- a/lib/PublicInbox/LeiXSearch.pm
+++ b/lib/PublicInbox/LeiXSearch.pm
@@ -139,7 +139,7 @@ sub mset_progress {
pkt_do($lei->{pkt_op_p}, 'mset_progress', @_);
} else { # single lei-daemon consumer
my ($desc, $mset_size, $mset_total_est) = @_;
- $lei->{-mset_total} += $mset_size;
+ $lei->{-mset_total} += $mset_size if $mset_total_est ne '?';
$lei->qerr("# $desc $mset_size/$mset_total_est");
}
}
@@ -238,7 +238,7 @@ sub query_combined_mset { # non-parallel for non-"--threads" users
do {
$mset = $self->mset($mo->{qstr}, $mo);
mset_progress($lei, 'xsearch', $mset->size,
- $mset->size, $mset->get_matches_estimated);
+ $mset->get_matches_estimated);
wait_startq($lei); # wait for keyword updates
for my $mitem ($mset->items) {
my $smsg = smsg_for($self, $mitem) or next;
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-05-06 2:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-06 2:28 [PATCH] lei_xsearch: fix accounting bugs in for remote mboxrd Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).