X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-index;h=7def9964713a06472753d8df1704445f330f30b8;hb=6ebcec3add4d6aeff6e3b3eb019a404528c079ec;hp=b6e3052824c320b3b05d00900c18d3250ff4271e;hpb=61a2fff5b34a3e32f49ee35c1e32b7931d9bb519;p=public-inbox.git
diff --git a/script/public-inbox-index b/script/public-inbox-index
index b6e30528..7def9964 100755
--- a/script/public-inbox-index
+++ b/script/public-inbox-index
@@ -1,38 +1,48 @@
#!/usr/bin/perl -w
-# Copyright (C) 2015-2019 all contributors
+# Copyright (C) 2015-2020 all contributors
# License: AGPL-3.0+
-# Basic tool to create a Xapian search index for a git repository
-# configured for public-inbox.
+# Basic tool to create a Xapian search index for a public-inbox.
# Usage with libeatmydata
-# highly recommended: eatmydata public-inbox-index REPO_DIR
+# highly recommended: eatmydata public-inbox-index INBOX_DIR
use strict;
use warnings;
use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
-my $usage = "public-inbox-index REPO_DIR";
+my $usage = "public-inbox-index INBOX_DIR";
use PublicInbox::Admin;
PublicInbox::Admin::require_or_die('-index');
+use PublicInbox::Xapcmd;
-my $opt = {};
-GetOptions($opt, qw(reindex jobs|j=i prune indexlevel|L=s))
+my $compact_opt;
+my $opt = { quiet => -1, compact => 0 };
+GetOptions($opt, qw(verbose|v+ reindex compact|c+ 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 }
+if ($opt->{compact}) {
+ require PublicInbox::Xapcmd;
+ PublicInbox::Xapcmd::check_compact();
+ $compact_opt = { -coarse_lock => 1, compact => 1 };
+}
-# do we really care about this message? It's annoying...
-my $warn = 'public-inbox unconfigured for serving, indexing anyways...';
-my @ibxs = PublicInbox::Admin::resolve_inboxes(\@ARGV, $warn);
+my @ibxs = PublicInbox::Admin::resolve_inboxes(\@ARGV);
PublicInbox::Admin::require_or_die('-index');
-usage() unless @ibxs;
+unless (@ibxs) { print STDERR "Usage: $usage\n"; exit 1 }
my $mods = {};
foreach my $ibx (@ibxs) {
- if (defined $opt->{indexlevel} && !defined($ibx->{indexlevel})) {
- # XXX: users can shoot themselves in the foot, with this...
- $ibx->{indexlevel} = $opt->{indexlevel};
- }
+ # XXX: users can shoot themselves in the foot, with opt->{indexlevel}
+ $ibx->{indexlevel} //= $opt->{indexlevel} //
+ PublicInbox::Admin::detect_indexlevel($ibx);
PublicInbox::Admin::scan_ibx_modules($mods, $ibx);
}
PublicInbox::Admin::require_or_die(keys %$mods);
-PublicInbox::Admin::index_inbox($_, $opt) for @ibxs;
+PublicInbox::Admin::progress_prepare($opt);
+for my $ibx (@ibxs) {
+ $ibx = PublicInbox::InboxWritable->new($ibx);
+ if ($opt->{compact} >= 2) {
+ PublicInbox::Xapcmd::run($ibx, 'compact', $compact_opt);
+ }
+ PublicInbox::Admin::index_inbox($ibx, undef, $opt);
+ PublicInbox::Xapcmd::run($ibx, 'compact', $compact_opt) if $compact_opt;
+}