about summary refs log tree commit homepage
path: root/lib
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2022-08-03 20:03:56 +0000
committerEric Wong <e@80x24.org>2022-08-04 07:00:59 +0000
commitf1e6dbd43146aec82aeb49cd249a8a86813506e1 (patch)
tree4824d4d316e33a8dbdd3f2e2b69255e046507bc4 /lib
parent213e03e1f9624faa4a3a9813f1eac5035c1eb62a (diff)
downloadpublic-inbox-f1e6dbd43146aec82aeb49cd249a8a86813506e1.tar.gz
nntp: speed up group listings via ->ALL->misc
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.
Diffstat (limited to 'lib')
-rw-r--r--lib/PublicInbox/NNTP.pm26
1 files 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 ($$$;$$) {