treewide: s/sequential_shard/sequential-shard/g

[public-inbox.git] / script / public-inbox-index

diff --git a/script/public-inbox-index b/script/public-inbox-index
index a17bf615a0e226266ee73f139e1d5e8d22bc99d6..0034d44cbd36b69cbe16d9c3dd344b6bcb245d84 100755 (executable)
--- a/script/public-inbox-index
+++ b/script/public-inbox-index
@@ -1,5 +1,5 @@
 #!perl -w
-# Copyright (C) 2015-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 # Basic tool to create a Xapian search index for a public-inbox.
 # Usage with libeatmydata <https://www.flamingspork.com/projects/libeatmydata/>
@@ -40,7 +40,7 @@ GetOptions($opt, qw(verbose|v+ reindex rethread compact|c+ jobs|j=i prune
                fsync|sync! xapian_only|xapian-only
                indexlevel|index-level|L=s max_size|max-size=s
                batch_size|batch-size=s
-               sequential_shard|seq-shard|sequential-shard
+               sequential-shard|seq-shard
                no-update-extindex update-extindex|E=s@
                fast-noop|F skip-docdata all help|h))
        or die $help;
@@ -84,8 +84,10 @@ for my $ei_name (@$update_extindex) {
        } else {
                die "extindex `$ei_name' not configured or found\n";
        }
+       my $o = { %$opt };
+       delete $o->{indexlevel} if ($o->{indexlevel}//'') eq 'basic';
        $eidx_seen{$topdir} //=
-               push(@eidx, PublicInbox::ExtSearchIdx->new($topdir));
+               push(@eidx, PublicInbox::ExtSearchIdx->new($topdir, $o));
 }
 my $mods = {};
 my @eidx_unconfigured;
@@ -127,12 +129,12 @@ for my $ibx (@ibxs) {
                defined(my $v = $cfg->git_bool($s)) or die <<EOL;
 publicInbox.$ibx->{name}.indexSequentialShard not boolean
 EOL
-               $ibx_opt = { %$opt, sequential_shard => $v };
+               $ibx_opt = { %$opt, 'sequential-shard' => $v };
        }
        my $nidx = PublicInbox::Admin::index_inbox($ibx, undef, $ibx_opt);
        last if $ibx_opt->{quit};
        if (my $copt = $opt->{compact_opt}) {
-               local $copt->{jobs} = 0 if $ibx_opt->{sequential_shard};
+               local $copt->{jobs} = 0 if $ibx_opt->{'sequential-shard'};
                PublicInbox::Xapcmd::run($ibx, 'compact', $copt);
        }
        last if $ibx_opt->{quit};
@@ -141,7 +143,6 @@ EOL
                $eidx->attach_inbox($ibx);
        }
 }
-$opt->{-no_fsync} = 1 if !$opt->{fsync};
 my $pr = $opt->{-progress};
 for my $eidx (@eidx) {
        $pr->("indexing $eidx->{topdir} ...\n") if $pr;