nntp: small speed up for multi-line responses

[public-inbox.git] / lib / PublicInbox / NNTP.pm

diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index d314a3d1ebcf0bc74001593319b93448c203cb3d..05d2d13bbbea83880b036565b2a356802ff2322e 100644 (file)
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -17,6 +17,8 @@ use PublicInbox::DS qw(now);
 use Digest::SHA qw(sha1_hex);
 use Time::Local qw(timegm timelocal);
 use PublicInbox::GitAsyncCat;
+use PublicInbox::Address;
+
 use constant {
        LINE_MAX => 512, # RFC 977 section 2.3
        r501 => '501 command syntax error',
@@ -202,7 +204,7 @@ sub listgroup_range_i {
        my ($self, $beg, $end) = @_;
        my $r = $self->{ng}->mm->msg_range($beg, $end, 'num');
        scalar(@$r) or return;
-       more($self, join("\r\n", map { $_->[0] } @$r));
+       $self->msg_more(join('', map { "$_->[0]\r\n" } @$r));
        1;
 }
 
@@ -321,14 +323,13 @@ sub ngpat2re (;$) {
 sub newnews_i {
        my ($self, $names, $ts, $prev) = @_;
        my $ngname = $names->[0];
-       if (my $ibx = $self->{nntpd}->{groups}->{$ngname}) {
+       if (my $ibx = $self->{nntpd}->{pi_config}->{-by_newsgroup}->{$ngname}) {
                if (my $over = $ibx->over) {
                        my $msgs = $over->query_ts($ts, $$prev);
                        if (scalar @$msgs) {
-                               more($self, '<' .
-                                       join(">\r\n<",
-                                               map { $_->{mid} } @$msgs ) .
-                                       '>');
+                               $self->msg_more(join('', map {
+                                                       "<$_->{mid}>\r\n";
+                                               } @$msgs));
                                $$prev = $msgs->[-1]->{num};
                                return 1; # continue on current group
                        }
@@ -360,13 +361,13 @@ sub cmd_newnews ($$$$;$$) {
 
 sub cmd_group ($$) {
        my ($self, $group) = @_;
-       my $no_such = '411 no such news group';
        my $nntpd = $self->{nntpd};
-       my $ng = $nntpd->{groups}->{$group} or return $no_such;
+       my $ibx = $nntpd->{pi_config}->{-by_newsgroup}->{$group} or
+               return '411 no such news group';
        $nntpd->idler_start;
 
-       $self->{ng} = $ng;
-       my ($min, $max) = $ng->mm->minmax;
+       $self->{ng} = $ibx;
+       my ($min, $max) = $ibx->mm->minmax;
        $self->{article} = $min;
        my $est_size = $max - $min;
        "211 $est_size $min $max $group";
@@ -417,27 +418,41 @@ sub header_append ($$$) {
        $hdr->header_set($k, @v, $v);
 }
 
+sub xref_by_tc ($$$) {
+       my ($xref, $pi_cfg, $smsg) = @_;
+       my $by_addr = $pi_cfg->{-by_addr};
+       my $mid = $smsg->{mid};
+       for my $f (qw(to cc)) {
+               my @ibxs = map {
+                       $by_addr->{lc($_)} // ()
+               } (PublicInbox::Address::emails($smsg->{$f} // ''));
+               for my $ibx (@ibxs) {
+                       my $ngname = $ibx->{newsgroup} // next;
+                       next if defined $xref->{$ngname};
+                       $xref->{$ngname} = eval { $ibx->mm->num_for($mid) };
+               }
+       }
+}
+
 sub xref ($$$) {
        my ($self, $cur_ibx, $smsg) = @_;
        my $nntpd = $self->{nntpd};
-       my $cur_ngname = $cur_ibx->{newsgroup};
-       my $ret = "$nntpd->{servername} $cur_ngname:$smsg->{num}";
+       my $cur_ng = $cur_ibx->{newsgroup};
+       my $xref;
        if (my $ALL = $nntpd->{pi_config}->ALL) {
-               if (my $ary = $ALL->nntp_xref_for($cur_ibx, $smsg)) {
-                       $ret .= join(' ', '', @$ary) if scalar(@$ary);
-               }
-               # better off wrong than slow if there's thousands of groups,
-               # so no fallback to the slow path below:
+               $xref = $ALL->nntp_xref_for($cur_ibx, $smsg);
+               xref_by_tc($xref, $nntpd->{pi_config}, $smsg);
        } else { # slow path
+               $xref = { $cur_ng => $smsg->{num} };
                my $mid = $smsg->{mid};
-               my $groups = $nntpd->{pi_config}->{-by_newsgroup};
-               for my $xngname (@{$nntpd->{groupnames}}) {
-                       next if $cur_ngname eq $xngname;
-                       my $xibx = $groups->{$xngname} or next;
-                       my $num = eval { $xibx->mm->num_for($mid) } or next;
-                       $ret .= " $xngname:$num";
+               for my $ibx (values %{$nntpd->{pi_config}->{-by_newsgroup}}) {
+                       next if defined($xref->{$ibx->{newsgroup}});
+                       my $num = eval { $ibx->mm->num_for($mid) } // next;
+                       $xref->{$ibx->{newsgroup}} = $num;
                }
        }
+       my $ret = "$nntpd->{servername} $cur_ng:".delete($xref->{$cur_ng});
+       $ret .= " $_:$xref->{$_}" for (sort keys %$xref);
        $ret;
 }
 
@@ -691,7 +706,7 @@ sub hdr_msgid_range_i {
        my ($self, $beg, $end) = @_;
        my $r = $self->{ng}->mm->msg_range($beg, $end);
        @$r or return;
-       more($self, join("\r\n", map { "$_->[0] <$_->[1]>" } @$r));
+       $self->msg_more(join('', map { "$_->[0] <$_->[1]>\r\n" } @$r));
        1;
 }
 
@@ -743,7 +758,7 @@ EOF
                }
                # no warning here, $mid is just invalid
        } else { # slow path for non-ALL users
-               foreach my $ibx (values %{$self->{nntpd}->{groups}}) {
+               for my $ibx (values %{$pi_cfg->{-by_newsgroup}}) {
                        next if defined $self_ng && $ibx eq $self_ng;
                        my $n = $ibx->mm->num_for($mid);
                        return ($ibx, $n) if defined $n;
@@ -758,8 +773,8 @@ sub xref_range_i {
        my $msgs = $ng->over->query_xover($$beg, $end);
        scalar(@$msgs) or return;
        $$beg = $msgs->[-1]->{num} + 1;
-       more($self, join("\r\n", map {
-               "$_->{num} ".xref($self, $ng, $_);
+       $self->msg_more(join('', map {
+               "$_->{num} ".xref($self, $ng, $_) . "\r\n";
        } @$msgs));
        1;
 }
@@ -918,7 +933,7 @@ sub over_line ($$$) {
                $smsg->{lines},
                "Xref: " . xref($self, $ng, $smsg));
        utf8::encode($s);
-       $s
+       $s .= "\r\n";
 }
 
 sub cmd_over ($;$) {
@@ -930,9 +945,14 @@ sub cmd_over ($;$) {
                more($self, '224 Overview information follows (multi-line)');
 
                # Only set article number column if it's the current group
+               # (RFC 3977 8.3.2)
                my $self_ng = $self->{ng};
-               $smsg->{num} = 0 if (!$self_ng || $self_ng ne $ng);
-               more($self, over_line($self, $ng, $smsg));
+               if (!$self_ng || $self_ng ne $ng) {
+                       # set {-orig_num} for nntp_xref_for
+                       $smsg->{-orig_num} = $smsg->{num};
+                       $smsg->{num} = 0;
+               }
+               $self->msg_more(over_line($self, $ng, $smsg));
                '.';
        } else {
                cmd_xover($self, $range);
@@ -946,7 +966,7 @@ sub xover_i {
        my $nr = scalar @$msgs or return;
 
        # OVERVIEW.FMT
-       more($self, join("\r\n", map {
+       $self->msg_more(join('', map {
                over_line($self, $ng, $_);
                } @$msgs));
        $$beg = $msgs->[-1]->{num} + 1;