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 1B0FC1F5AE for ; Thu, 6 May 2021 02:28:20 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] lei_xsearch: fix accounting bugs in for remote mboxrd Date: Thu, 6 May 2021 02:28:19 +0000 Message-Id: <20210506022819.12326-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: 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;