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.2 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF 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 CCC611F619 for ; Wed, 3 Aug 2022 20:03:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1659557037; bh=I4eVdTVWmSY2C09HpLv/oDvYQSxpd+n3fgYOW3o0OWA=; h=From:To:Subject:Date:In-Reply-To:References:From; b=IseTQmyXBsRoFvDBUoEkcG8fQ/Af8UkwMkJG2fQNOAMpDqRqjIJXipT2gYGmumPs5 Z210CraZaFqM0x7zMJHDyKZ5hjp1IE+7SJq6krQDK3MMsqu2i3DoaxrQCVnIeDfXFC zbqfB1SuVMlAaqexaPzXguG1L/Z9nB6+soqdb62Y= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 3/4] nntp: speed up group listings via ->ALL->misc Date: Wed, 3 Aug 2022 20:03:56 +0000 Message-Id: <20220803200357.1322670-4-e@80x24.org> In-Reply-To: <20220803200357.1322670-1-e@80x24.org> References: <20220803200357.1322670-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: By taking advantage of the new ART_MIN/ART_MAX value in MiscIdx, we can avoid the overhead of opening per-inbox msgmap DB files. The result gives us a ~40 speedup with 50K newgroups. --- lib/PublicInbox/NNTP.pm | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm index 9ae1353a..524784cb 100644 --- a/lib/PublicInbox/NNTP.pm +++ b/lib/PublicInbox/NNTP.pm @@ -123,7 +123,7 @@ sub names2ibx ($;$) { sub list_active_i { # "LIST ACTIVE" and also just "LIST" (no args) my ($self, $ibxs) = @_; my @window = splice(@$ibxs, 0, 1000); - $self->msg_more(join('', map { group_line($_) } @window)); + emit_group_lines($self, \@window); scalar @$ibxs; # continue if there's more } @@ -244,19 +244,27 @@ sub parse_time ($$;$) { } } -sub group_line ($) { - my ($ibx) = @_; - my ($min, $max) = $ibx->mm(1)->minmax; - "$ibx->{newsgroup} $max $min n\r\n"; +sub emit_group_lines { + my ($self, $ibxs) = @_; + my ($min, $max); + my $ALL = $self->{nntpd}->{pi_cfg}->ALL; + my $misc = $ALL->misc if $ALL; + my $buf = ''; + for my $ibx (@$ibxs) { + $misc ? $misc->inbox_data($ibx) : + delete(@$ibx{qw(-art_min -art_max)}); + ($min, $max) = ($ibx->art_min, $ibx->art_max); + $buf .= "$ibx->{newsgroup} $max $min n\r\n"; + } + $self->msg_more($buf); } sub newgroups_i { my ($self, $ts, $ibxs) = @_; my @window = splice(@$ibxs, 0, 1000); - $self->msg_more(join('', map { group_line($_) } grep { - (eval { $_->uidvalidity } // 0) > $ts - } @window)); - scalar @$ibxs; + @window = grep { (eval { $_->uidvalidity } // 0) > $ts } @window; + emit_group_lines($self, \@window); + scalar @$ibxs; # any more? } sub cmd_newgroups ($$$;$$) {