about summary refs log tree commit homepage
path: root/script/public-inbox-index
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2019-05-23 09:36:48 +0000
committerEric Wong <e@80x24.org>2019-05-23 17:43:50 +0000
commit61a2fff5b34a3e32f49ee35c1e32b7931d9bb519 (patch)
treea3483107271119d267de5253e29fe5100f85a20d /script/public-inbox-index
parentadbf11e0f16714922b5eddb77d5227301a6d5adf (diff)
downloadpublic-inbox-61a2fff5b34a3e32f49ee35c1e32b7931d9bb519.tar.gz
We will be reindexing after copydatabase
Diffstat (limited to 'script/public-inbox-index')
-rwxr-xr-xscript/public-inbox-index53
1 files changed, 7 insertions, 46 deletions
diff --git a/script/public-inbox-index b/script/public-inbox-index
index 9399c272..b6e30528 100755
--- a/script/public-inbox-index
+++ b/script/public-inbox-index
@@ -13,18 +13,10 @@ my $usage = "public-inbox-index REPO_DIR";
 use PublicInbox::Admin;
 PublicInbox::Admin::require_or_die('-index');
 
-my $reindex;
-my $prune;
-my $jobs = undef;
-my $indexlevel;
-my %opts = (
-        '--reindex' => \$reindex,
-        '--jobs|j=i' => \$jobs,
-        '--prune' => \$prune,
-        'L|indexlevel=s' => \$indexlevel,
-);
-GetOptions(%opts) or die "bad command-line args\n$usage";
-die "--jobs must be positive\n" if defined $jobs && $jobs < 0;
+my $opt = {};
+GetOptions($opt, qw(reindex jobs|j=i prune indexlevel|L=s))
+        or die "bad command-line args\n$usage";
+die "--jobs must be positive\n" if defined $opt->{jobs} && $opt->{jobs} <= 0;
 
 sub usage { print STDERR "Usage: $usage\n"; exit 1 }
 
@@ -35,43 +27,12 @@ PublicInbox::Admin::require_or_die('-index');
 usage() unless @ibxs;
 my $mods = {};
 foreach my $ibx (@ibxs) {
-        if (defined $indexlevel && !defined($ibx->{indexlevel})) {
+        if (defined $opt->{indexlevel} && !defined($ibx->{indexlevel})) {
                 # XXX: users can shoot themselves in the foot, with this...
-                $ibx->{indexlevel} = $indexlevel;
+                $ibx->{indexlevel} = $opt->{indexlevel};
         }
         PublicInbox::Admin::scan_ibx_modules($mods, $ibx);
 }
 
 PublicInbox::Admin::require_or_die(keys %$mods);
-
-require PublicInbox::SearchIdx;
-index_inbox($_) for @ibxs;
-
-sub index_inbox {
-        my ($repo) = @_;
-        if (ref($repo) && ($repo->{version} || 1) == 2) {
-                eval { require PublicInbox::V2Writable };
-                die "v2 requirements not met: $@\n" if $@;
-                my $v2w = eval {
-                        PublicInbox::V2Writable->new($repo, {nproc=>$jobs});
-                };
-                if (defined $jobs) {
-                        if ($jobs == 0) {
-                                $v2w->{parallel} = 0;
-                        } else {
-                                my $n = $v2w->{partitions};
-                                if ($jobs != ($n + 1)) {
-                                        warn
-"Unable to respect --jobs=$jobs, inbox was created with $n partitions\n";
-                                }
-                        }
-                }
-                local $SIG{__WARN__} = sub {
-                        print STDERR $v2w->{current_info}, ': ', @_;
-                };
-                $v2w->index_sync({ reindex => $reindex, prune => $prune });
-        } else {
-                my $s = PublicInbox::SearchIdx->new($repo, 1);
-                $s->index_sync({ reindex => $reindex });
-        }
-}
+PublicInbox::Admin::index_inbox($_, $opt) for @ibxs;