* [PATCH 3/3] nntp: share more code between art_lookup callers
2020-09-11 7:32 6% [PATCH 0/3] mostly NNTP stuff Eric Wong
@ 2020-09-11 7:32 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-09-11 7:32 UTC (permalink / raw)
To: meta
This prepares us for future changes to improve scalability to
many inboxes.
---
lib/PublicInbox/NNTP.pm | 44 +++++++++++++++++------------------------
1 file changed, 18 insertions(+), 26 deletions(-)
diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index 46398cd4..88fe2bb0 100644
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -446,8 +446,8 @@ sub set_nntp_headers ($$) {
}
}
-sub art_lookup ($$) {
- my ($self, $art) = @_;
+sub art_lookup ($$$) {
+ my ($self, $art, $code) = @_;
my $ng = $self->{ng};
my ($n, $mid);
my $err;
@@ -484,7 +484,17 @@ find_mid:
found:
my $smsg = $ng->over->get_art($n) or return $err;
$smsg->{-ibx} = $ng;
- $smsg;
+ if ($code == 223) { # STAT
+ set_art($self, $n);
+ "223 $n <$smsg->{mid}> article retrieved - " .
+ "request text separately";
+ } else { # HEAD | BODY | ARTICLE
+ $smsg->{nntp} = $self;
+ $smsg->{nntp_code} = $code;
+ set_art($self, $art);
+ # this dereferences to `undef'
+ ${git_async_cat($ng->git, $smsg->{blob}, \&blob_cb, $smsg)};
+ }
}
sub msg_body_write ($$) {
@@ -520,7 +530,7 @@ sub msg_hdr_write ($$) {
sub blob_cb { # called by git->cat_async via git_async_cat
my ($bref, $oid, $type, $size, $smsg) = @_;
my $self = $smsg->{nntp};
- my $code = $smsg->{nntp_code} // 220;
+ my $code = $smsg->{nntp_code};
if (!defined($oid)) {
# it's possible to have TOCTOU if an admin runs
# public-inbox-(edit|purge), just move onto the next message
@@ -553,40 +563,22 @@ sub blob_cb { # called by git->cat_async via git_async_cat
sub cmd_article ($;$) {
my ($self, $art) = @_;
- my $smsg = art_lookup($self, $art);
- return $smsg unless ref $smsg;
- set_art($self, $art);
- $smsg->{nntp} = $self;
- ${git_async_cat($smsg->{-ibx}->git, $smsg->{blob}, \&blob_cb, $smsg)};
+ art_lookup($self, $art, 220);
}
sub cmd_head ($;$) {
my ($self, $art) = @_;
- my $smsg = art_lookup($self, $art);
- return $smsg unless ref $smsg;
- set_art($self, $art);
- $smsg->{nntp} = $self;
- $smsg->{nntp_code} = 221;
- ${git_async_cat($smsg->{-ibx}->git, $smsg->{blob}, \&blob_cb, $smsg)};
+ art_lookup($self, $art, 221);
}
sub cmd_body ($;$) {
my ($self, $art) = @_;
- my $smsg = art_lookup($self, $art);
- return $smsg unless ref $smsg;
- set_art($self, $art);
- $smsg->{nntp} = $self;
- $smsg->{nntp_code} = 222;
- ${git_async_cat($smsg->{-ibx}->git, $smsg->{blob}, \&blob_cb, $smsg)};
+ art_lookup($self, $art, 222);
}
sub cmd_stat ($;$) {
my ($self, $art) = @_;
- my $smsg = art_lookup($self, $art); # art may be msgid
- return $smsg unless ref $smsg;
- $art = $smsg->{num};
- set_art($self, $art);
- "223 $art <$smsg->{mid}> article retrieved - request text separately";
+ art_lookup($self, $art, 223); # art may be msgid
}
sub cmd_ihave ($) { '435 article not wanted - do not send it' }
^ permalink raw reply related [relevance 7%]
* [PATCH 0/3] mostly NNTP stuff
@ 2020-09-11 7:32 6% Eric Wong
2020-09-11 7:32 7% ` [PATCH 3/3] nntp: share more code between art_lookup callers Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2020-09-11 7:32 UTC (permalink / raw)
To: meta
Just a couple of cleanups and small tweaks while I figure out
how to get the NNTP code to support tens of thousands of
inboxes; since it's hampered by the most existing code for
dealing with mere dozens of inboxes... I think configuring
detached index support will be a requirement.
Eric Wong (3):
treewide: avoid `goto &NAME' for tail recursion
t/nntpd: add test for the XPATH command
nntp: share more code between art_lookup callers
lib/PublicInbox/DS.pm | 4 ++--
lib/PublicInbox/Eml.pm | 2 +-
lib/PublicInbox/ExtMsg.pm | 6 ++---
lib/PublicInbox/NNTP.pm | 44 ++++++++++++++---------------------
lib/PublicInbox/SolverGit.pm | 32 ++++++++++++-------------
lib/PublicInbox/V2Writable.pm | 4 ++--
lib/PublicInbox/View.pm | 2 +-
lib/PublicInbox/Watch.pm | 4 ++--
t/nntpd.t | 2 ++
9 files changed, 47 insertions(+), 53 deletions(-)
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-09-11 7:32 6% [PATCH 0/3] mostly NNTP stuff Eric Wong
2020-09-11 7:32 7% ` [PATCH 3/3] nntp: share more code between art_lookup callers Eric Wong
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).