From: Eric Wong <e@80x24.org>
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 [thread overview]
Message-ID: <20220803200357.1322670-4-e@80x24.org> (raw)
In-Reply-To: <20220803200357.1322670-1-e@80x24.org>
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 ($$$;$$) {
next prev parent reply other threads:[~2022-08-03 20:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-03 20:03 [PATCH 0/4] use ALL to speedup -nntpd and -imapd Eric Wong
2022-08-03 20:03 ` [PATCH 1/4] nntpd: do not delete newsgroup name from inbox object Eric Wong
2022-08-03 20:03 ` [PATCH 2/4] miscidx: index inbox min/max article numbers Eric Wong
2022-08-03 20:03 ` Eric Wong [this message]
2022-08-03 20:03 ` [PATCH 4/4] imapd: use nntpd_cache to speed up startup/reload time Eric Wong
2022-08-03 23:50 ` [PATCH 0/4] use ALL to speedup -nntpd and -imapd Kyle Meyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220803200357.1322670-4-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).