X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-compact;h=e8bf31e973781c816ce6756cfbc476f566be45bf;hb=7c5ac90b309bbe76468055e8a9289664ef2dfe37;hp=b8aaa4bd812f7a54ffe7c8ef0af8d3878205b0c4;hpb=5038857ec7663674c782affa11d5f33620107555;p=public-inbox.git
diff --git a/script/public-inbox-compact b/script/public-inbox-compact
index b8aaa4bd..e8bf31e9 100755
--- a/script/public-inbox-compact
+++ b/script/public-inbox-compact
@@ -1,95 +1,19 @@
#!/usr/bin/perl -w
-# Copyright (C) 2018 all contributors
+# Copyright (C) 2018-2019 all contributors
# License: AGPL-3.0+
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 Cwd 'abs_path';
-use File::Temp qw(tempdir);
-use File::Path qw(remove_tree);
-my $usage = "Usage: public-inbox-compact REPO_DIR\n";
-my $dir = shift or die $usage;
-my $config = PublicInbox::Config->new;
-my $ibx;
-$dir = abs_path($dir);
-$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);
-$ibx = PublicInbox::InboxWritable->new($ibx);
-$ibx->umask_prepare;
-
-sub commit_changes ($$$) {
- 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";
- }
- 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";
-}
-
-if ($v == 2) {
- require PublicInbox::V2Writable;
- my $v2w = PublicInbox::V2Writable->new($ibx);
- my $xap_v = 'xap'.PublicInbox::Search::SCHEMA_VERSION;
- my $old = "$dir/$xap_v";
- opendir my $dh, $old or die "Failed to opendir $old: $!\n";
- my $new = tempdir('compact-XXXXXXXX', CLEANUP => 1, DIR => $dir);
- $ibx->with_umask(sub {
- $v2w->lock_acquire;
- my @parts;
- while (defined(my $dn = readdir($dh))) {
- if ($dn =~ /\A\d+\z/) {
- push @parts, "$old/$dn";
- } elsif ($dn eq '.' || $dn eq '..') {
- } elsif ($dn =~ /\Aover\.sqlite3/) {
- } else {
- warn "W: skipping unknown Xapian DB: $old/$dn\n"
- }
- }
- close $dh;
- die "No Xapian parts found in $old\n" unless @parts;
- my $cmd = ['xapian-compact', @parts, "$new/0" ];
- PublicInbox::Import::run_die($cmd);
- commit_changes($v2w, $old, $new);
- });
-} 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 = "$dir/public-inbox";
- my $old = "$v1_root/$xap_v";
- -d $old or die "$old does not exist\n";
- 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]);
- commit_changes($im, $old, $new);
- });
-} else {
- die "Unsupported inbox version: $v\n";
+use PublicInbox::InboxWritable;
+use PublicInbox::Xapcmd;
+use PublicInbox::Admin;
+PublicInbox::Admin::require_or_die('-index');
+my $usage = "Usage: public-inbox-compact INBOX_DIR\n";
+my $opt = { compact => 1, -coarse_lock => 1 };
+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($_);
+ PublicInbox::Xapcmd::run($ibx, 'compact', $opt);
}