compact: do not merge v2 repos by default

--no-renumber does not allow merging, and merging is not ideal
for reindexing, either.

diff --git a/script/public-inbox-compact b/script/public-inbox-compact
index 9f332657e3d3946989940e9d250d61f416ffaade..5f18497e6b57558963e30562565d3c2798836202 100755 (executable)
--- a/script/public-inbox-compact
+++ b/script/public-inbox-compact
@@ -10,6 +10,7 @@ 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;
@@ -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 = [@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) {

diff --git a/t/convert-compact.t b/t/convert-compact.t
index 5caa0acc36c171d80da0e15dedec8893b19f6854..ced45415e70c580227a5f58ec0b1b4e18669ec81 100644 (file)
--- a/t/convert-compact.t
+++ b/t/convert-compact.t
@@ -80,8 +80,6 @@ my $env = { NPROC => 2 };
 ok(PublicInbox::Import::run_die($cmd, $env, $rdr), 'v2 compact works');
 $ibx->{mainrepo} = "$tmpdir/v2";
 $ibx->{version} = 2;
-my $v2w = PublicInbox::V2Writable->new($ibx);
-is($v2w->{partitions}, 1, "only one partition in compacted repo");
 
 @xdir = glob("$tmpdir/v2/xap*/*");
 foreach (@xdir) {