inbox: add ->version method

[public-inbox.git] / lib / PublicInbox / Xapcmd.pm

diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm
index 4871378e6314ed6612c1ad91414200df8b40e234..19c6ff077d21911f003888edd2cc74a0b99f16e5 100644 (file)
--- a/lib/PublicInbox/Xapcmd.pm
+++ b/lib/PublicInbox/Xapcmd.pm
@@ -3,7 +3,7 @@
 package PublicInbox::Xapcmd;
 use strict;
 use warnings;
-use PublicInbox::Spawn qw(which spawn);
+use PublicInbox::Spawn qw(which popen_rd);
 use PublicInbox::Over;
 use PublicInbox::SearchIdx;
 use File::Temp 0.19 (); # ->newdir
@@ -97,7 +97,7 @@ sub runnable_or_die ($) {
 
 sub prepare_reindex ($$$) {
        my ($ibx, $im, $reindex) = @_;
-       if ($ibx->{version} == 1) {
+       if ($ibx->version == 1) {
                my $dir = $ibx->search->xdir(1);
                my $xdb = $PublicInbox::Search::X{Database}->new($dir);
                if (my $lc = $xdb->get_metadata('last_commit')) {
@@ -173,7 +173,6 @@ sub run {
        -d $old or die "$old does not exist\n";
 
        my $tmp = {};
-       my $v = $ibx->{version} ||= 1;
        my @q;
        my $reshard = $opt->{reshard};
        if (defined $reshard && $reshard <= 0) {
@@ -185,7 +184,7 @@ sub run {
 
        # we want temporary directories to be as deep as possible,
        # so v2 shards can keep "xap$SCHEMA_VERSION" on a separate FS.
-       if ($v == 1) {
+       if ($ibx->version == 1) {
                if (defined $reshard) {
                        warn
 "--reshard=$reshard ignored for v1 $ibx->{inboxdir}\n";
@@ -277,7 +276,6 @@ sub compact ($$) {
        my ($args, $opt) = @_;
        my ($src, $newdir) = @$args;
        my $dst = ref($newdir) ? $newdir->dirname : $newdir;
-       my ($r, $w);
        my $pfx = $opt->{-progress_pfx} ||= progress_pfx($src);
        my $pr = $opt->{-progress};
        my $rdr = {};
@@ -286,7 +284,6 @@ sub compact ($$) {
                defined(my $dfd = $opt->{$fd}) or next;
                $rdr->{$fd} = $dfd;
        }
-       $rdr->{1} = $w if $pr && pipe($r, $w);
 
        # we rely on --no-renumber to keep docids synched to NNTP
        my $cmd = [ $XAPIAN_COMPACT, '--no-renumber' ];
@@ -299,18 +296,14 @@ sub compact ($$) {
        }
        $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: $!";
-               foreach (<$r>) {
+       my $rd = popen_rd($cmd, undef, $rdr);
+       while (<$rd>) {
+               if ($pr) {
                        s/\r/\r$pfx /g;
                        $pr->("$pfx $_");
                }
        }
-       my $rp = waitpid($pid, 0);
-       if ($? || $rp != $pid) {
-               die join(' ', @$cmd)." failed: $? (pid=$pid, reaped=$rp)\n";
-       }
+       close $rd or die join(' ', @$cmd)." failed: $?n";
 }
 
 sub cpdb_loop ($$$;$$) {