nntpd: share {groups} hash with {-by_newsgroup} in Config

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.

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index 251008a38e0e7e5b542c9675801e8d6b463a41c9..e7aea99b7ae80f8c8f515583b963d51bbfb59da7 100644 (file)
--- 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 6b762d8923b41ff63d973a6e8db71a37506ec9ce..13b0f678284b284ed4c05b3cefc3beead125cd25 100644 (file)
--- 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 {