about summary refs log tree commit homepage
path: root/script/public-inbox-compact
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2019-05-23 09:36:43 +0000
committerEric Wong <e@80x24.org>2019-05-23 17:43:50 +0000
commit7e56f47848127b65979c786595244a552b164b3d (patch)
tree6edd36880c7b183dfd381376b290cf163aff1f4e /script/public-inbox-compact
parent792c643ba76e8b06ae17d3653402d381f59857c2 (diff)
downloadpublic-inbox-7e56f47848127b65979c786595244a552b164b3d.tar.gz
Port public-inbox-compact(1) over to using it, and we will need
to wrap copydatabase(1) to ease glass migrations, too.
Diffstat (limited to 'script/public-inbox-compact')
-rwxr-xr-xscript/public-inbox-compact70
1 files changed, 2 insertions, 68 deletions
diff --git a/script/public-inbox-compact b/script/public-inbox-compact
index 395eec37..4aa6273d 100755
--- a/script/public-inbox-compact
+++ b/script/public-inbox-compact
@@ -8,9 +8,7 @@ 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);
+use PublicInbox::Xapcmd;
 my $usage = "Usage: public-inbox-compact REPO_DIR\n";
 my $dir = shift or die $usage;
 my $config = eval { PublicInbox::Config->new };
@@ -31,71 +29,7 @@ unless ($ibx) {
         };
         $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";
-
-        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");
-        }
-        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";
-}
 
 # we rely on --no-renumber to keep docids synched to NNTP
-my @compact = qw(xapian-compact --no-renumber);
-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 %pids;
-                while (defined(my $dn = readdir($dh))) {
-                        if ($dn =~ /\A\d+\z/) {
-                                my $cmd = [ @compact, "$old/$dn", "$new/$dn" ];
-                                $pids{spawn($cmd)} = join(' ', @$cmd);
-                        } 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 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) {
-        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([@compact, $old, $new]);
-                commit_changes($im, $old, $new);
-        });
-} else {
-        die "Unsupported inbox version: $v\n";
-}
+PublicInbox::Xapcmd::run($ibx, [qw(xapian-compact --no-renumber)]);