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-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 4632E1F9FD for ; Fri, 26 Mar 2021 04:29:37 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/3] lei_xsearch: wait for kw updates for non-threaded case, too Date: Fri, 26 Mar 2021 06:29:35 +0200 Message-Id: <20210326042937.15913-2-e@80x24.org> In-Reply-To: <20210326042937.15913-1-e@80x24.org> References: <20210326042937.15913-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: We'll also hoist wait_startq out of the per-message loops since it's not worth having to check every single message when filling in smsg info is reasonably fast, anyways. --- 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 58b6cfc0..386c4eba 100644 --- a/lib/PublicInbox/LeiXSearch.pm +++ b/lib/PublicInbox/LeiXSearch.pm @@ -156,6 +156,7 @@ sub query_thread_mset { # for --threads $mset = $srch->mset($mo->{qstr}, $mo); mset_progress($lei, $desc, $mset->size, $mset->get_matches_estimated); + wait_startq($lei); # wait for keyword updates my $ids = $srch->mset_to_artnums($mset, $mo); my $ctx = { ids => $ids }; my $i = 0; @@ -165,7 +166,6 @@ sub query_thread_mset { # for --threads my $smsg = $over->get_art($n) or next; my $mitem = delete $n2item{$smsg->{num}}; next if $smsg->{bytes} == 0; - wait_startq($lei); # wait for keyword updates if ($mitem) { if ($can_kw) { mitem_kw($smsg, $mitem, $fl); @@ -196,9 +196,9 @@ sub query_mset { # non-parallel for non-"--threads" users $mset = $self->mset($mo->{qstr}, $mo); mset_progress($lei, 'xsearch', $mset->size, $mset->size, $mset->get_matches_estimated); + wait_startq($lei); # wait for keyword updates for my $mitem ($mset->items) { my $smsg = smsg_for($self, $mitem) or next; - wait_startq($lei); $each_smsg->($smsg, $mitem); } } while (_mset_more($mset, $mo));