compact: do not merge v2 repos by default

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

diff --git a/script/public-inbox-compact b/script/public-inbox-compact
index 43e94609a01ee79891cf11c25363e263492d06c5..5f18497e6b57558963e30562565d3c2798836202 100755 (executable)
--- a/script/public-inbox-compact
+++ b/script/public-inbox-compact
@@ -4,12 +4,13 @@
 use strict;
 use warnings;
 use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
-use PublicInbox::V2Writable;
 use PublicInbox::Search;
 use PublicInbox::Config;
+use PublicInbox::InboxWritable;
 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;
@@ -48,7 +49,7 @@ sub commit_changes ($$$) {
        $im->lock_release;
        remove_tree("$old/old") or die "failed to remove $old/old: $!\n";
 }
-
+my @compact = qw(xapian-compact --no-renumber);
 if ($v == 2) {
        require PublicInbox::V2Writable;
        my $v2w = PublicInbox::V2Writable->new($ibx);
@@ -58,10 +59,11 @@ if ($v == 2) {
        my $new = tempdir('compact-XXXXXXXX', CLEANUP => 1, DIR => $dir);
        $ibx->with_umask(sub {
                $v2w->lock_acquire;
-               my @parts;
+               my %pids;
                while (defined(my $dn = readdir($dh))) {
                        if ($dn =~ /\A\d+\z/) {
-                               push @parts, "$old/$dn";
+                               my $cmd = [ @compact, "$old/$dn", "$new/$dn" ];
+                               $pids{spawn($cmd)} = join(' ', @$cmd);
                        } elsif ($dn eq '.' || $dn eq '..') {
                        } elsif ($dn =~ /\Aover\.sqlite3/) {
                        } else {
@@ -69,9 +71,12 @@ if ($v == 2) {
                        }
                }
                close $dh;
-               die "No Xapian parts found in $old\n" unless @parts;
-               my $cmd = ['xapian-compact', @parts, "$new/0" ];
-               PublicInbox::Import::run_die($cmd);
+               die "No Xapian parts found in $old\n" unless keys %pids;
+               while (scalar keys %pids) {
+                       my $pid = waitpid(-1, 0);
+                       my $desc = delete $pids{$pid};
+                       die "$desc failed: $?\n" if $?;
+               }
                commit_changes($v2w, $old, $new);
        });
 } elsif ($v == 1) {
@@ -84,7 +89,7 @@ if ($v == 2) {
        my $new = tempdir('compact-XXXXXXXX', CLEANUP => 1, DIR => $v1_root);
        $ibx->with_umask(sub {
                $im->lock_acquire;
-               PublicInbox::Import::run_die(['xapian-compact', $old, $new]);
+               PublicInbox::Import::run_die([@compact, $old, $new]);
                commit_changes($im, $old, $new);
        });
 } else {