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;
my ($im, $old, $new) = @_;
my @st = stat($old) or die "failed to stat($old): $!\n";
- for my $suf (qw(.pipe.lock -journal)) {
- my $orig = "$old/over.sqlite3$suf";
- link($orig, "$new/over.sqlite3$suf") and next;
- next if $!{ENOENT};
- die "failed to link $orig => $new/over.sqlite3$suf: $!\n";
+ my $over = "$old/over.sqlite3";
+ if (-f $over) {
+ require PublicInbox::Over;
+ $over = PublicInbox::Over->new($over);
+ $over->connect->sqlite_backup_to_file("$new/over.sqlite3");
}
- link("$old/over.sqlite3", "$new/over.sqlite3") or die
- "failed to link {$old => $new}/over.sqlite3: $!\n";
-
rename($old, "$new/old") or die "rename $old => $new/old: $!\n";
chmod($st[2] & 07777, $new) or die "chmod $old: $!\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";
}
-
+my @compact = qw(xapian-compact --no-renumber);
if ($v == 2) {
require PublicInbox::V2Writable;
my $v2w = PublicInbox::V2Writable->new($ibx);
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 {
}
}
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) {
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 {