xapcmd: use popen_rd for running xapian-compact

public-inbox-compact wrapper displays progress by default,
anyways, and there's not a lot of output, so simplify our
code by using popen_rd instead of spawn + optional pipe.

While we're at it use "while (<HANDLE>)" to display
progress as it happens, since "foreach (<$HANDLE>)"
slurps the contents into an array, first.

diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm
index 4871378e6314ed6612c1ad91414200df8b40e234..de2ef5c6ad814dae358611f97ef6fe9ba955c9fb 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
@@ -277,7 +277,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 +285,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 +297,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 ($$$;$$) {