X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-index;h=2d0f0eca5be54505adc83663f3608874f5dfbe7d;hb=fb8e7dbd1b711d25d1033c3f5f540ce47f6c0849;hp=c6910420a095190ffbab09a6658e72ba37f44af4;hpb=d87053bf6cae0258125e84e1531d5f1206c53288;p=public-inbox.git

diff --git a/script/public-inbox-index b/script/public-inbox-index
index c6910420..2d0f0eca 100755
--- a/script/public-inbox-index
+++ b/script/public-inbox-index
@@ -11,24 +11,47 @@ use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
 my $usage = "public-inbox-index INBOX_DIR";
 use PublicInbox::Admin;
 PublicInbox::Admin::require_or_die('-index');
+use PublicInbox::Xapcmd;
 
-my $opt = { quiet => -1 };
-GetOptions($opt, qw(verbose|v+ reindex jobs|j=i prune indexlevel|L=s))
+my $compact_opt;
+my $opt = { quiet => -1, compact => 0, maxsize => undef };
+GetOptions($opt, qw(verbose|v+ reindex compact|c+ jobs|j=i prune
+		indexlevel|L=s maxsize|max-size=s))
 	or die "bad command-line args\n$usage";
 die "--jobs must be positive\n" if defined $opt->{jobs} && $opt->{jobs} <= 0;
 
+if ($opt->{compact}) {
+	require PublicInbox::Xapcmd;
+	PublicInbox::Xapcmd::check_compact();
+	$compact_opt = { -coarse_lock => 1, compact => 1 };
+}
 
-my @ibxs = PublicInbox::Admin::resolve_inboxes(\@ARGV);
+my $cfg = PublicInbox::Config->new;
+my @ibxs = PublicInbox::Admin::resolve_inboxes(\@ARGV, undef, $cfg);
 PublicInbox::Admin::require_or_die('-index');
 unless (@ibxs) { print STDERR "Usage: $usage\n"; exit 1 }
 my $mods = {};
+my $max_size = $opt->{maxsize} // $cfg->{lc('publicInbox.indexMaxSize')};
+if (defined $max_size) {
+	PublicInbox::Admin::parse_unsigned(\$max_size) or
+		die "`publicInbox.indexMaxSize=$max_size' not parsed\n";
+}
+
 foreach my $ibx (@ibxs) {
 	# XXX: users can shoot themselves in the foot, with opt->{indexlevel}
 	$ibx->{indexlevel} //= $opt->{indexlevel} //
 			PublicInbox::Admin::detect_indexlevel($ibx);
+	$ibx->{index_max_size} = $max_size;
 	PublicInbox::Admin::scan_ibx_modules($mods, $ibx);
 }
 
 PublicInbox::Admin::require_or_die(keys %$mods);
 PublicInbox::Admin::progress_prepare($opt);
-PublicInbox::Admin::index_inbox($_, undef, $opt) for @ibxs;
+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;
+}