From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 837D31F44D for ; Mon, 22 Apr 2024 09:58:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1713779881; bh=SXI3gOa3TGQvRqv0RbgWSOydJ4hEVkRSCMsx8nAtYA4=; h=From:To:Subject:Date:From; b=s46rLZOKNfHJEIodH8lmuCjraZNntzkGpvJg/qIgDl5huZ67fzfJT69MNMjva5Jb0 8Y1vtGoIvzq14zxd6LTKP58KbxMwZY5Zla3pf7IptH73GIjjw4SZUh43ynMNbdEBhZ HphZzpdc4QwLiX26/PkhjnEVI4dreEbxtIaCYYyc= From: Eric Wong To: spew@80x24.org Subject: [PATCH] mbox: hoist out refill_result_ids Date: Mon, 22 Apr 2024 09:58:01 +0000 Message-ID: <20240422095801.234442-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: --- lib/PublicInbox/Mbox.pm | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm index 4a0f4681..e58fb4b6 100644 --- a/lib/PublicInbox/Mbox.pm +++ b/lib/PublicInbox/Mbox.pm @@ -175,6 +175,17 @@ sub mbox_all_ids { PublicInbox::MboxGz::mbox_gz($ctx, \&all_ids_cb, 'all'); } +sub refill_result_ids ($) { + my ($ctx) = @_; + # refill result set, deprioritize since there's many results + my $srch = $ctx->{ibx}->isrch or return $ctx->gone('search'); + my $mset = $srch->mset($ctx->{query}, $ctx->{qopts}); + my $size = $mset->size or return; + $ctx->{qopts}->{offset} += $size; + $ctx->{ids} = $srch->mset_to_artnums($mset, $ctx->{qopts}); + $ctx->{-low_prio} = 1; # true +} + sub results_cb { my ($ctx) = @_; my $over = $ctx->{ibx}->over or return $ctx->gone('over'); @@ -183,13 +194,7 @@ sub results_cb { my $smsg = $over->get_art($num) or next; return $smsg; } - # refill result set, deprioritize since there's many results - my $srch = $ctx->{ibx}->isrch or return $ctx->gone('search'); - my $mset = $srch->mset($ctx->{query}, $ctx->{qopts}); - my $size = $mset->size or return; - $ctx->{qopts}->{offset} += $size; - $ctx->{ids} = $srch->mset_to_artnums($mset, $ctx->{qopts}); - $ctx->{-low_prio} = 1; + refill_result_ids($ctx) or return; # refill ctx->{ids} } } @@ -202,19 +207,10 @@ sub results_thread_cb { my $smsg = $over->get_art($num) or next; return $smsg; } + next if $over->expand_thread($ctx); # refills ctx->{xids} - # refills ctx->{xids} - next if $over->expand_thread($ctx); - - # refill result set, deprioritize since there's many results - my $srch = $ctx->{ibx}->isrch or return $ctx->gone('search'); - my $mset = $srch->mset($ctx->{query}, $ctx->{qopts}); - my $size = $mset->size or return; - $ctx->{qopts}->{offset} += $size; - $ctx->{ids} = $srch->mset_to_artnums($mset, $ctx->{qopts}); - $ctx->{-low_prio} = 1; + refill_result_ids($ctx) or return; # refill ctx->{ids} } - } sub mbox_qry_cb { # async_mset cb