X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;ds=sidebyside;f=script%2Fpublic-inbox-xcpdb;h=24fc5a252b4e7e6415b0521c29472319e8218376;hb=4eee5af6011cc8cdefb66c9729952c7eff5c0b0b;hp=2bfadc092a0ecb4b8941389107b7f45c0d6201cb;hpb=ed04e9e16999b4624f884d0ab0b66ba16ae57691;p=public-inbox.git
diff --git a/script/public-inbox-xcpdb b/script/public-inbox-xcpdb
index 2bfadc09..24fc5a25 100755
--- a/script/public-inbox-xcpdb
+++ b/script/public-inbox-xcpdb
@@ -1,12 +1,11 @@
#!perl -w
-# Copyright (C) 2019-2020 all contributors
+# Copyright (C) 2019-2021 all contributors
# License: AGPL-3.0+
use strict;
use v5.10.1;
use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
-my $usage = 'Usage: public-inbox-xcpdb [options] INBOX_DIR';
my $help = <
upgrade or reshard Xapian DB(s) used by public-inbox
@@ -18,7 +17,6 @@ options:
--jobs=NUM limit parallelism to JOBS count
--verbose | -v increase verbosity (may be repeated)
--sequential-shard copy+index Xapian shards sequentially (for slow HDD)
- --help | -? show this help
index options (see public-inbox-index(1) man page for full description):
@@ -28,38 +26,43 @@ index options (see public-inbox-index(1) man page for full description):
See public-inbox-xcpdb(1) man page for full documentation.
EOF
-my $opt = { quiet => -1, compact => 0, fsync => 1 };
+my $opt = { quiet => -1, compact => 0, fsync => 1, -eidx_ok => 1 };
GetOptions($opt, qw(
fsync|sync! compact|c reshard|R=i
max_size|max-size=s batch_size|batch-size=s
- sequential_shard|seq-shard|sequential-shard
+ sequential-shard|seq-shard
jobs|j=i quiet|q verbose|v
blocksize|b=s no-full|n fuller|F
- all help|?)) or die "bad command-line args\n$usage";
+ all C=s@ help|h)) or die $help;
if ($opt->{help}) { print $help; exit 0 };
use PublicInbox::Admin;
PublicInbox::Admin::require_or_die('-search');
+PublicInbox::Admin::do_chdir(delete $opt->{C});
require PublicInbox::Config;
my $cfg = PublicInbox::Config->new;
-my @ibxs = PublicInbox::Admin::resolve_inboxes(\@ARGV, $opt, $cfg) or
- die $usage;
+my ($ibxs, $eidxs) = PublicInbox::Admin::resolve_inboxes(\@ARGV, $opt, $cfg);
+unless ($ibxs) { print STDERR $help; exit 1 }
my $idx_env = PublicInbox::Admin::index_prepare($opt, $cfg);
# we only set XAPIAN_FLUSH_THRESHOLD for index, since cpdb doesn't
# know sizes, only doccounts
$opt->{-idx_env} = $idx_env;
-if ($opt->{sequential_shard} && ($opt->{jobs} // 1) > 1) {
+if ($opt->{'sequential-shard'} && ($opt->{jobs} // 1) > 1) {
warn "W: --jobs=$opt->{jobs} ignored with --sequential-shard\n";
$opt->{jobs} = 0;
}
require PublicInbox::InboxWritable;
require PublicInbox::Xapcmd;
-foreach (@ibxs) {
- my $ibx = PublicInbox::InboxWritable->new($_);
- # we rely on --no-renumber to keep docids synched for NNTP
+# we rely on --no-renumber to keep docids synched for NNTP(artnum) + IMAP(UID)
+for my $ibx (@$ibxs) {
+ $ibx = PublicInbox::InboxWritable->new($ibx);
PublicInbox::Xapcmd::run($ibx, 'cpdb', $opt);
}
+
+for my $eidx (@$eidxs) {
+ PublicInbox::Xapcmd::run($eidx, 'cpdb', $opt);
+}