* [PATCH 03/23] compact: support --help/-? and perform lazy loading
2020-08-20 20:24 5% [PATCH 00/23] indexing: --skip-docdata + speedups Eric Wong
@ 2020-08-20 20:24 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-08-20 20:24 UTC (permalink / raw)
To: meta
This probably won't be used much, but --help can still
make sense.
---
script/public-inbox-compact | 39 +++++++++++++++++++++++++++----------
1 file changed, 29 insertions(+), 10 deletions(-)
diff --git a/script/public-inbox-compact b/script/public-inbox-compact
index b5fa0086..a6bb62bd 100755
--- a/script/public-inbox-compact
+++ b/script/public-inbox-compact
@@ -1,18 +1,37 @@
-#!/usr/bin/perl -w
+#!perl -w
# Copyright (C) 2018-2020 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
use strict;
-use warnings;
+use v5.10.1;
use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
-use PublicInbox::InboxWritable;
-use PublicInbox::Xapcmd;
-use PublicInbox::Admin;
-PublicInbox::Admin::require_or_die('-index');
-my $usage = "Usage: public-inbox-compact INBOX_DIR\n";
+my $usage = 'public-inbox-compact INBOX_DIR';
my $opt = { compact => 1, -coarse_lock => 1 };
-GetOptions($opt, qw(all), @PublicInbox::Xapcmd::COMPACT_OPT) or
- die "bad command-line args\n$usage";
-my @ibxs = PublicInbox::Admin::resolve_inboxes(\@ARGV, $opt) or die $usage;
+my $help = <<EOF; # the following should fit w/o scrolling in 80x24 term:
+Usage: $usage
+
+ Compact Xapian DBs in an inbox
+
+options:
+
+ --all index all configured inboxes
+ --jobs=NUM control parallelization
+
+See public-inbox-compact(1) man page for full documentation.
+EOF
+GetOptions($opt, qw(all help|?),
+ # compact options:
+ qw(jobs|j=i quiet|q blocksize|b=s no-full|n fuller|F),
+) or die "bad command-line args\n$usage\n";
+if ($opt->{help}) { print $help; exit 0 };
+
+require PublicInbox::Admin;
+PublicInbox::Admin::require_or_die('-index');
+PublicInbox::Admin::progress_prepare($opt);
+
+require PublicInbox::InboxWritable;
+require PublicInbox::Xapcmd;
+my @ibxs = PublicInbox::Admin::resolve_inboxes(\@ARGV, $opt);
+unless (@ibxs) { print STDERR "Usage: $usage\n"; exit 1 }
foreach (@ibxs) {
my $ibx = PublicInbox::InboxWritable->new($_);
PublicInbox::Xapcmd::run($ibx, 'compact', $opt);
^ permalink raw reply related [relevance 7%]
* [PATCH 00/23] indexing: --skip-docdata + speedups
@ 2020-08-20 20:24 5% Eric Wong
2020-08-20 20:24 7% ` [PATCH 03/23] compact: support --help/-? and perform lazy loading Eric Wong
0 siblings, 1 reply; 2+ 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 5%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-08-20 20:24 5% [PATCH 00/23] indexing: --skip-docdata + speedups Eric Wong
2020-08-20 20:24 7% ` [PATCH 03/23] compact: support --help/-? and perform lazy loading 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).