X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-compact;h=dfebac1ceead671c98c9a27505ccbf1812b8e0fe;hb=16870b42ac68a8704467989cb20c2c571e4749ab;hp=016873d31e23fd93afc90e929bb6378f42543392;hpb=e5c2e2588d7ad2243afeabad67b3c951c5b66643;p=public-inbox.git

diff --git a/script/public-inbox-compact b/script/public-inbox-compact
index 016873d3..dfebac1c 100755
--- a/script/public-inbox-compact
+++ b/script/public-inbox-compact
@@ -1,94 +1,37 @@
-#!/usr/bin/perl -w
-# Copyright (C) 2018 all contributors <meta@public-inbox.org>
+#!perl -w
+# Copyright (C) 2018-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
-use warnings;
+use v5.10.1;
 use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
-use PublicInbox::V2Writable;
-use PublicInbox::Search;
-use PublicInbox::Config;
-use Cwd 'abs_path';
-use File::Temp qw(tempdir);
-use File::Path qw(remove_tree);
-use PublicInbox::Spawn qw(spawn);
-my $usage = "Usage: public-inbox-compact REPO_DIR\n";
-my $dir = shift or die $usage;
-my $config = PublicInbox::Config->new;
-my $ibx;
-$config->each_inbox(sub {
-	$ibx = $_[0] if abs_path($_[0]->{mainrepo}) eq $dir
-});
-unless ($ibx) {
-	warn "W: $dir not configured in ".
-		PublicInbox::Config::default_file() . "\n";
-	$ibx = {
-		mainrepo => $dir,
-		name => 'ignored',
-		address => [ 'old@example.com' ],
-	};
-	$ibx = PublicInbox::Inbox->new($ibx);
-}
-my $v = ($ibx->{version} || 1);
-if ($v == 2) {
-	require PublicInbox::V2Writable;
-	my $v2w = PublicInbox::V2Writable->new($ibx);
-	my $xap_v = 'xap'.PublicInbox::Search::SCHEMA_VERSION;
-	my $xroot = "$ibx->{mainrepo}/$xap_v";
-	opendir my $dh, $xroot or die "Failed to opendir $xroot: $!\n";
-	$v2w->lock_acquire;
-	my $new = tempdir(CLEANUP => 1, DIR => $ibx->{mainrepo});
-	my @parts;
-	my $skel;
-	while (defined(my $dn = readdir($dh))) {
-		if ($dn =~ /\A\d+\z/) {
-			push @parts, "$xroot/$dn";
-		} elsif ($dn eq 'skel') {
-			$skel = "$xroot/$dn";
-		} elsif ($dn eq '.' || $dn eq '..') {
-		} else {
-			warn "W: skipping unknown Xapian DB: $xroot/$dn\n";
-		}
-	}
-	close $dh;
-	my %pids;
-	if (@parts) {
-		my $pid = spawn([ qw(xapian-compact), @parts, "$new/0" ]);
-		defined $pid or die "compact failed: $?\n";
-		$pids{$pid} = 'xapian-compact (parts)';
-	} else {
-		warn "No parts found in $xroot\n";
-	}
-	if (defined $skel) {
-		my $pid = spawn([ qw(xapian-compact), $skel, "$new/skel" ]);
-		defined $pid or die "compact failed: $?\n";
-		$pids{$pid} = 'xapian-compact (skel)';
-	} else {
-		warn "$xroot/skel missing\n";
-	}
-	die "No xapian-compact processes running\n" unless scalar keys %pids;
-	while (scalar keys %pids) {
-		my $pid = waitpid(-1, 0);
-		my $desc = delete $pids{$pid};
-		die "$desc failed: $?\n" if $?;
-	}
-	rename($xroot, "$new/old") or die "rename $xroot => $new/old: $!\n";
-	rename($new, $xroot) or die "rename $new => $xroot: $!\n";
-	$v2w->lock_release;
-	remove_tree("$xroot/old") or die "failed to remove $xroot/old: $!\n";
-} elsif ($v == 1) {
-	require PublicInbox::Import;
-	my $im = PublicInbox::Import->new($ibx->git, undef, undef, $ibx);
-	my $xap_v = 'xapian'.PublicInbox::Search::SCHEMA_VERSION;
-	my $v1_root = "$ibx->{mainrepo}/public-inbox";
-	my $old = "$v1_root/$xap_v";
-	-d $old or die "$old does not exist\n";
-	my $new = tempdir(CLEANUP => 1, DIR => $v1_root);
-	$im->lock_acquire;
-	PublicInbox::Import::run_die([ qw(xapian-compact), $old, $new ]);
-	rename($old, "$new/old") or die "rename $old => $new: $!\n";
-	rename($new, $old) or die "rename $new => $old: $!\n";
-	$im->lock_release;
-	remove_tree("$old/old") or die "failed to remove $old/old: $!\n";
-} else {
-	die "Unsupported inbox version: $v\n";
+my $opt = { compact => 1, -coarse_lock => 1 };
+my $help = <<EOF; # the following should fit w/o scrolling in 80x24 term:
+usage: public-inbox-compact INBOX_DIR
+
+  Compact Xapian DBs in an inbox
+
+options:
+
+  --all               index all configured inboxes
+  --jobs=NUM          control parallelization
+
+See public-inbox-compact(1) man page for full documentation.
+EOF
+GetOptions($opt, qw(all help|h),
+	# compact options:
+	qw(jobs|j=i quiet|q blocksize|b=s no-full|n fuller|F),
+) or die $help;
+if ($opt->{help}) { print $help; exit 0 };
+
+require PublicInbox::Admin;
+PublicInbox::Admin::require_or_die('-index');
+PublicInbox::Admin::progress_prepare($opt);
+
+require PublicInbox::InboxWritable;
+require PublicInbox::Xapcmd;
+my @ibxs = PublicInbox::Admin::resolve_inboxes(\@ARGV, $opt);
+unless (@ibxs) { print STDERR $help; exit 1 }
+foreach (@ibxs) {
+	my $ibx = PublicInbox::InboxWritable->new($_);
+	PublicInbox::Xapcmd::run($ibx, 'compact', $opt);
 }