X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;ds=sidebyside;f=script%2Fpublic-inbox-xcpdb;h=24fc5a252b4e7e6415b0521c29472319e8218376;hb=d0bc58517c97c8982fdf42533297d96be9efb484;hp=84620175eafc863f30d53ef01cc11654813b2bdc;hpb=16870b42ac68a8704467989cb20c2c571e4749ab;p=public-inbox.git
diff --git a/script/public-inbox-xcpdb b/script/public-inbox-xcpdb
index 84620175..24fc5a25 100755
--- a/script/public-inbox-xcpdb
+++ b/script/public-inbox-xcpdb
@@ -1,11 +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 $help = <
upgrade or reshard Xapian DB(s) used by public-inbox
@@ -26,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|h)) or die $help;
+ 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 $help;
+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);
+}