* [PATCH 02/12] nntpd: share {groups} hash with {-by_newsgroup} in Config
2020-11-27 9:52 5% [PATCH 00/12] some NNTP-related fixes + speedups Eric Wong
@ 2020-11-27 9:52 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-11-27 9:52 UTC (permalink / raw)
To: meta
There's no need to duplicate a potentially large hash,
but we can keep the inexpensive shortcut to it. We may
eventually drop the {groups} shortcut if it's no longer
useful.
---
lib/PublicInbox/Config.pm | 4 +++-
lib/PublicInbox/NNTPD.pm | 23 +++++++++++------------
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index 251008a3..e7aea99b 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -438,7 +438,9 @@ EOF
}
}
if (my $ng = $ibx->{newsgroup}) {
- $self->{-by_newsgroup}->{$ng} = $ibx;
+ # PublicInbox::NNTPD does stricter (and more expensive checks),
+ # keep this lean for startup speed
+ $self->{-by_newsgroup}->{$ng} = $ibx unless ref($ng);
}
$self->{-by_name}->{$name} = $ibx;
if ($ibx->{obfuscate}) {
diff --git a/lib/PublicInbox/NNTPD.pm b/lib/PublicInbox/NNTPD.pm
index 6b762d89..13b0f678 100644
--- a/lib/PublicInbox/NNTPD.pm
+++ b/lib/PublicInbox/NNTPD.pm
@@ -36,11 +36,10 @@ sub new {
sub refresh_groups {
my ($self, $sig) = @_;
my $pi_config = $sig ? PublicInbox::Config->new : $self->{pi_config};
- my $new = {};
- my @list;
+ my $groups = $pi_config->{-by_newsgroup}; # filled during each_inbox
$pi_config->each_inbox(sub {
- my ($ng) = @_;
- my $ngname = $ng->{newsgroup} or return;
+ my ($ibx) = @_;
+ my $ngname = $ibx->{newsgroup} or return;
if (ref $ngname) {
warn 'multiple newsgroups not supported: '.
join(', ', @$ngname). "\n";
@@ -50,21 +49,21 @@ sub refresh_groups {
# '|', '<', '>', ';', '#', '$', '&',
} elsif ($ngname =~ m![^A-Za-z0-9/_\.\-\~\@\+\=:]!) {
warn "newsgroup name invalid: `$ngname'\n";
- } elsif ($ng->nntp_usable) {
+ delete $groups->{$ngname};
+ } elsif ($ibx->nntp_usable) {
# Only valid if msgmap and search works
- $new->{$ngname} = $ng;
- push @list, $ng;
# preload to avoid fragmentation:
- $ng->description;
- $ng->base_url;
+ $ibx->description;
+ $ibx->base_url;
+ } else {
+ delete $groups->{$ngname};
}
});
- @list = sort { $a->{newsgroup} cmp $b->{newsgroup} } @list;
- $self->{grouplist} = \@list;
+ $self->{grouplist} = [ map { $groups->{$_} } sort(keys %$groups) ];
$self->{pi_config} = $pi_config;
# this will destroy old groups that got deleted
- %{$self->{groups}} = %$new;
+ $self->{groups} = $groups;
}
sub idler_start {
^ permalink raw reply related [relevance 7%]
* [PATCH 00/12] some NNTP-related fixes + speedups
@ 2020-11-27 9:52 5% Eric Wong
2020-11-27 9:52 7% ` [PATCH 02/12] nntpd: share {groups} hash with {-by_newsgroup} in Config Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2020-11-27 9:52 UTC (permalink / raw)
To: meta
A few minor bugfixes and some major speedups for targeting
thousands/millions of inboxes based on stuff learned during
IMAP server development.
[PATCH 6/12] "miscsearch: implement ->newsgroup_matches"
may not be necessary, after all, but maybe it could also
be used for WWW.
Still a lot more to do...
Eric Wong (12):
nntp: use Inbox->uidvalidity instead of ->mm->created_at
nntpd: share {groups} hash with {-by_newsgroup} in Config
mm: min/max: return 0 instead of undef
nntp: use grep operation for wildmat matching
nntp: NEWNEWS: speed up filtering
miscsearch: implement ->newsgroup_matches
nntp: LIST ACTIVE.TIMES use angle brackets around address
nntp: move LIST iterators to long_response
t/extsearch: show a more realistic case
nntp: some minor golfing
nntp: xref: simplify sub signature
nntp: xref: use ->ALL extindex if available
lib/PublicInbox/Config.pm | 4 +-
lib/PublicInbox/ExtSearch.pm | 56 ++++++++++
lib/PublicInbox/IMAPD.pm | 2 +-
lib/PublicInbox/MiscSearch.pm | 40 +++++++
lib/PublicInbox/Msgmap.pm | 7 +-
lib/PublicInbox/NNTP.pm | 200 +++++++++++++++++++---------------
lib/PublicInbox/NNTPD.pm | 25 +++--
lib/PublicInbox/OverIdx.pm | 5 +
lib/PublicInbox/V2Writable.pm | 4 +-
t/extsearch.t | 54 ++++++++-
t/msgmap.t | 2 +-
t/nntp.t | 7 +-
12 files changed, 291 insertions(+), 115 deletions(-)
^ permalink raw reply [relevance 5%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-11-27 9:52 5% [PATCH 00/12] some NNTP-related fixes + speedups Eric Wong
2020-11-27 9:52 7% ` [PATCH 02/12] nntpd: share {groups} hash with {-by_newsgroup} in Config 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).