* Re: [PATCH 05/23] init: support --newsgroup option
2020-08-20 20:24 4% ` [PATCH 05/23] init: support --newsgroup option Eric Wong
@ 2020-08-20 21:10 7% ` Eric Wong
0 siblings, 0 replies; 3+ results
From: Eric Wong @ 2020-08-20 21:10 UTC (permalink / raw)
To: meta
Eric Wong <e@yhbt.net> wrote:
> +Some of the options documented in L<public-inbox-config(5)>
> +require editing the config file. Old versions lack the
> +C<-n>/C<--newsgroup> parameter
While working on this, I realized -n vs -N could be confusing,
so I made the abbreviation --ng instead. So I'll squash
this in before pushing:
diff --git a/Documentation/public-inbox-init.pod b/Documentation/public-inbox-init.pod
index 240959eb..ea2b38dd 100644
--- a/Documentation/public-inbox-init.pod
+++ b/Documentation/public-inbox-init.pod
@@ -111,7 +111,7 @@ Used to override the default C<~/.public-inbox/config> value.
Some of the options documented in L<public-inbox-config(5)>
require editing the config file. Old versions lack the
-C<-n>/C<--newsgroup> parameter
+C<--ng>/C<--newsgroup> parameter
See L<public-inbox-config(5)> for all the options which may be applied
to a given inbox.
^ permalink raw reply related [relevance 7%]
* [PATCH 00/23] indexing: --skip-docdata + speedups
@ 2020-08-20 20:24 6% Eric Wong
2020-08-20 20:24 4% ` [PATCH 05/23] init: support --newsgroup option Eric Wong
0 siblings, 1 reply; 3+ results
From: Eric Wong @ 2020-08-20 20:24 UTC (permalink / raw)
To: meta
Some miscellaneous help and cleanup things, too.
Document data is no longer read from Xapian by read-only
daemons; that data is redundant given over.sqlite3 always
exists. This should should improve page cache hit rates for
over.sqlite3 by a small bit. Being able to mass load a bunch of
rows from SQLite speeds up the default search summary view by
~10%, too.
--skip-docdata option to -init and -index can avoid writing
Xapian document data, saving ~1.5% in Xapian space overhead
(and associated I/O and page cache overheads). It breaks
rollbacks to old versions, though, so it won't be the default.
Eric Wong (23):
doc: note -compact and -xcpdb are rarely used
admin: progress shows the inbox being indexed
compact: support --help/-? and perform lazy loading
init: support --help and -?
init: support --newsgroup option
init: drop -N alias for --skip-artnum
search: v2: ensure shards are numerically sorted
xapcmd: simplify {reindex} parameter passing
www: reduce long-lived PublicInbox::Search references
search: improve comments around constants
search: export mdocid subroutine
searchquery: split off from searchview
search: make qparse_new an internal function
smsg: reduce utf8::decode call sites
searchview: use over.sqlite3 instead of Xapian docdata
searchview: speed up search summary by ~10%
searchview: convert nested and Atom display to over.sqlite3
extmsg: avoid using Xapian docdata
mbox: avoid Xapian docdata in search results
smsg: remove from_mitem
t/nntpd-v2: set PI_TEST_VERSION=2 properly
init+index: support --skip-docdata for Xapian
search: add mset_to_artnums method
Documentation/public-inbox-compact.pod | 5 +
Documentation/public-inbox-config.pod | 2 +-
Documentation/public-inbox-index.pod | 8 ++
Documentation/public-inbox-init.pod | 37 +++++++-
Documentation/public-inbox-xcpdb.pod | 3 +
MANIFEST | 1 +
lib/PublicInbox/Admin.pm | 15 ++-
lib/PublicInbox/ExtMsg.pm | 19 ++--
lib/PublicInbox/IMAP.pm | 5 +-
lib/PublicInbox/Inbox.pm | 11 ++-
lib/PublicInbox/Mbox.pm | 24 +++--
lib/PublicInbox/Over.pm | 28 +++---
lib/PublicInbox/Search.pm | 125 ++++++++++++++-----------
lib/PublicInbox/SearchIdx.pm | 35 +++++--
lib/PublicInbox/SearchIdxShard.pm | 2 +-
lib/PublicInbox/SearchQuery.pm | 53 +++++++++++
lib/PublicInbox/SearchView.pm | 90 ++++--------------
lib/PublicInbox/Smsg.pm | 10 +-
lib/PublicInbox/Xapcmd.pm | 20 ++--
script/public-inbox-compact | 39 ++++++--
script/public-inbox-convert | 3 +-
script/public-inbox-index | 7 +-
script/public-inbox-init | 101 +++++++++++++-------
t/imapd.t | 6 +-
t/inbox_idle.t | 2 +-
t/index-git-times.t | 11 ++-
t/init.t | 17 +++-
t/nntpd-v2.t | 2 +-
t/nntpd.t | 9 +-
t/search.t | 34 ++++---
30 files changed, 437 insertions(+), 287 deletions(-)
create mode 100644 lib/PublicInbox/SearchQuery.pm
^ permalink raw reply [relevance 6%]
* [PATCH 05/23] init: support --newsgroup option
2020-08-20 20:24 6% [PATCH 00/23] indexing: --skip-docdata + speedups Eric Wong
@ 2020-08-20 20:24 4% ` Eric Wong
2020-08-20 21:10 7% ` Eric Wong
0 siblings, 1 reply; 3+ results
From: Eric Wong @ 2020-08-20 20:24 UTC (permalink / raw)
To: meta
We can reduce the need to edit the config file for NNTP group names
this way.
---
Documentation/public-inbox-config.pod | 2 +-
Documentation/public-inbox-init.pod | 25 +++++++++++++++++++++----
script/public-inbox-init | 12 ++++++++++--
t/imapd.t | 6 ++----
t/nntpd.t | 9 +++------
5 files changed, 37 insertions(+), 17 deletions(-)
diff --git a/Documentation/public-inbox-config.pod b/Documentation/public-inbox-config.pod
index 05b84819..1dfb926e 100644
--- a/Documentation/public-inbox-config.pod
+++ b/Documentation/public-inbox-config.pod
@@ -63,7 +63,7 @@ Default: none, optional
=item publicinbox.<name>.newsgroup
The NNTP group name for use with L<public-inbox-nntpd(8)>. This
-may be any newsgroup name with hierarchies delimited by '.'.
+may be any newsgroup name with hierarchies delimited by C<.>.
For example, the newsgroup for L<mailto:meta@public-inbox.org>
is: C<inbox.comp.mail.public-inbox.meta>
diff --git a/Documentation/public-inbox-init.pod b/Documentation/public-inbox-init.pod
index d0c87563..240959eb 100644
--- a/Documentation/public-inbox-init.pod
+++ b/Documentation/public-inbox-init.pod
@@ -39,6 +39,21 @@ See L<public-inbox-config(5)> for more information.
Default: C<full>
+=item --ng, --newsgroup NEWSGROUP
+
+The NNTP group name for use with L<public-inbox-nntpd(8)>. This
+may be any newsgroup name with hierarchies delimited by C<.>.
+For example, the newsgroup for L<mailto:meta@public-inbox.org>
+is: C<inbox.comp.mail.public-inbox.meta>
+
+This may be set after-the-fact via C<publicinbox.$NAME.newsgroup>
+in the configuration file. See L<public-inbox-config(5)> for more
+info.
+
+Available since public-inbox 1.6.0 (PENDING).
+
+Default: none.
+
=item -N, --skip-artnum
This option allows archivists to publish incomplete archives
@@ -94,10 +109,12 @@ Used to override the default C<~/.public-inbox/config> value.
=head1 LIMITATIONS
-This tool predates NNTP support in public-inbox and is missing
-C<newsgroup> and many of the options documented in
-L<public-inbox-config(5)>. See L<public-inbox-config(5)> for all the
-options which may be applied to a given inbox.
+Some of the options documented in L<public-inbox-config(5)>
+require editing the config file. Old versions lack the
+C<-n>/C<--newsgroup> parameter
+
+See L<public-inbox-config(5)> for all the options which may be applied
+to a given inbox.
=head1 CONTACT
diff --git a/script/public-inbox-init b/script/public-inbox-init
index 6852f64a..90b32be8 100755
--- a/script/public-inbox-init
+++ b/script/public-inbox-init
@@ -22,6 +22,7 @@ options:
-V2 use scalable public-inbox-v2-format(5)
-L LEVEL index level `basic', `medium', or `full' (default: full)
+ --ng NEWSGROUP set NNTP newsgroup name
--skip-artnum=NUM NNTP article numbers to skip
--skip-epoch=NUM epochs to skip (-V2 only)
-J JOBS number of indexing jobs (-V2 only), (default: 4)
@@ -33,12 +34,14 @@ require PublicInbox::Admin;
PublicInbox::Admin::require_or_die('-base');
my ($version, $indexlevel, $skip_epoch, $skip_artnum, $jobs, $show_help);
+my $ng = '';
my %opts = (
'V|version=i' => \$version,
'L|index-level|indexlevel=s' => \$indexlevel,
'S|skip|skip-epoch=i' => \$skip_epoch,
'N|skip-artnum=i' => \$skip_artnum,
'j|jobs=i' => \$jobs,
+ 'ng|newsgroup=s' => \$ng,
'help|?' => \$show_help,
);
my $usage_cb = sub {
@@ -53,7 +56,11 @@ my $inboxdir = shift @ARGV or $usage_cb->();
my $http_url = shift @ARGV or $usage_cb->();
my (@address) = @ARGV;
@address or $usage_cb->();
-my %seen;
+
+$ng =~ m![^A-Za-z0-9/_\.\-\~\@\+\=:]! and
+ die "--newsgroup `$ng' is not valid\n";
+($ng =~ m!\A\.! || $ng =~ m!\.\z!) and
+ die "--newsgroup `$ng' must not start or end with `.'\n";
require PublicInbox::Config;
my $pi_config = PublicInbox::Config->default_file;
@@ -84,7 +91,7 @@ sysopen($lockfh, $lockfile, O_RDWR|O_CREAT|O_EXCL) or do {
exit(255);
};
my $auto_unlink = UnlinkMe->new($lockfile);
-my $perm;
+my ($perm, %seen);
if (-e $pi_config) {
open(my $oh, '<', $pi_config) or die "unable to read $pi_config: $!\n";
my @st = stat($oh);
@@ -185,6 +192,7 @@ PublicInbox::Import::run_die([@x, "$pfx.inboxdir", $inboxdir]);
if (defined($indexlevel)) {
PublicInbox::Import::run_die([@x, "$pfx.indexlevel", $indexlevel]);
}
+PublicInbox::Import::run_die([@x, "$pfx.newsgroup", $ng]) if $ng ne '';
# needed for git prior to v2.1.0
if (defined $perm) {
diff --git a/t/imapd.t b/t/imapd.t
index 6cfced41..4d627af7 100644
--- a/t/imapd.t
+++ b/t/imapd.t
@@ -39,11 +39,9 @@ for my $V (@V) {
my $url = "http://example.com/i$V";
my $inboxdir = "$tmpdir/$name";
my $folder = "inbox.i$V";
- my $cmd = ['-init', "-V$V", "-L$level", $name, $inboxdir, $url, $addr];
+ my $cmd = ['-init', "-V$V", "-L$level", "--ng=$folder",
+ $name, $inboxdir, $url, $addr];
run_script($cmd) or BAIL_OUT("init $name");
- xsys(qw(git config), "--file=$ENV{HOME}/.public-inbox/config",
- "publicinbox.$name.newsgroup", $folder) == 0 or
- BAIL_OUT("setting newsgroup $V");
if ($V == 1) {
xsys(qw(git config), "--file=$ENV{HOME}/.public-inbox/config",
'publicinboxmda.spamcheck', 'none') == 0 or
diff --git a/t/nntpd.t b/t/nntpd.t
index b9b9a63d..74e21a41 100644
--- a/t/nntpd.t
+++ b/t/nntpd.t
@@ -46,14 +46,11 @@ my $ibx = {
$ibx = PublicInbox::Inbox->new($ibx);
{
local $ENV{HOME} = $home;
- my @cmd = ('-init', $group, $inboxdir, 'http://example.com/', $addr);
- push @cmd, "-V$version", '-Lbasic';
+ my @cmd = ('-init', $group, $inboxdir, 'http://example.com/', $addr,
+ "-V$version", '-Lbasic', '--newsgroup', $group);
ok(run_script(\@cmd), 'init OK');
- is(xsys(qw(git config), "--file=$home/.public-inbox/config",
- "publicinbox.$group.newsgroup", $group),
- 0, 'enabled newsgroup');
- my $len;
+ my $len;
$ibx = PublicInbox::InboxWritable->new($ibx);
my $im = $ibx->importer(0);
^ permalink raw reply related [relevance 4%]
Results 1-3 of 3 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-08-20 20:24 6% [PATCH 00/23] indexing: --skip-docdata + speedups Eric Wong
2020-08-20 20:24 4% ` [PATCH 05/23] init: support --newsgroup option Eric Wong
2020-08-20 21:10 7% ` 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).