diff options
| -rw-r--r-- | lib/PublicInbox/Xapcmd.pm | 17 | ||||
| -rwxr-xr-x | script/public-inbox-compact | 3 | ||||
| -rwxr-xr-x | script/public-inbox-xcpdb | 3 |
3 files changed, 16 insertions, 7 deletions
diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm index 488c6165..74abf999 100644 --- a/lib/PublicInbox/Xapcmd.pm +++ b/lib/PublicInbox/Xapcmd.pm @@ -13,6 +13,7 @@ use File::Basename qw(dirname); # support testing with dev versions of Xapian which installs # commands with a version number suffix (e.g. "xapian-compact-1.5") our $XAPIAN_COMPACT = $ENV{XAPIAN_COMPACT} || 'xapian-compact'; +our @COMPACT_OPT = qw(quiet|q blocksize|b=s no-full|n fuller|F); sub commit_changes ($$$) { my ($ibx, $tmp, $opt) = @_; @@ -213,13 +214,19 @@ sub compact ($$) { defined(my $dfd = $opt->{$fd}) or next; $rdr->{$fd} = $dfd; } - if ($pr) { - $pr->("$pfx compacting...\n"); - $rdr->{1} = fileno($w) if pipe($r, $w); - } + $rdr->{1} = fileno($w) if $pr && pipe($r, $w); # we rely on --no-renumber to keep docids synched to NNTP - my $cmd = [ $XAPIAN_COMPACT, '--no-renumber', $src, $dst ]; + my $cmd = [ $XAPIAN_COMPACT, '--no-renumber' ]; + for my $sw (qw(no-full fuller)) { + push @$cmd, "--$sw" if $opt->{$sw}; + } + for my $sw (qw(blocksize)) { + defined(my $v = $opt->{$sw}) or next; + push @$cmd, "--$sw", $v; + } + $pr->("$pfx `".join(' ', @$cmd)."'\n") if $pr; + push @$cmd, $src, $dst; my $pid = spawn($cmd, undef, $rdr); if ($pr) { close $w or die "close: \$w: $!"; diff --git a/script/public-inbox-compact b/script/public-inbox-compact index 4f58d5af..4bdadfc3 100755 --- a/script/public-inbox-compact +++ b/script/public-inbox-compact @@ -10,7 +10,8 @@ use PublicInbox::Admin; PublicInbox::Admin::require_or_die('-index'); my $usage = "Usage: public-inbox-compact REPO_DIR\n"; my $opt = { compact => 1, -coarse_lock => 1 }; -GetOptions($opt, qw(quiet|q)) or die "bad command-line args\n$usage"; +GetOptions($opt, @PublicInbox::Xapcmd::COMPACT_OPT) or + die "bad command-line args\n$usage"; my @ibxs = PublicInbox::Admin::resolve_inboxes(\@ARGV) or die $usage; foreach (@ibxs) { my $ibx = PublicInbox::InboxWritable->new($_); diff --git a/script/public-inbox-xcpdb b/script/public-inbox-xcpdb index bda7be0c..badb95e2 100755 --- a/script/public-inbox-xcpdb +++ b/script/public-inbox-xcpdb @@ -9,7 +9,8 @@ use PublicInbox::Admin; PublicInbox::Admin::require_or_die('-search'); my $usage = "Usage: public-inbox-xcpdb INBOX_DIR\n"; my $opt = {}; -GetOptions($opt, qw(compact quiet|q)) or die "bad command-line args\n$usage"; +GetOptions($opt, qw(compact), @PublicInbox::Xapcmd::COMPACT_OPT) or + die "bad command-line args\n$usage"; my @ibxs = PublicInbox::Admin::resolve_inboxes(\@ARGV) or die $usage; foreach (@ibxs) { my $ibx = PublicInbox::InboxWritable->new($_); |