* [PATCH 6/9] xapcmd: use popen_rd for running xapian-compact
2020-01-11 22:34 6% [PATCH 0/9] more small fixes and cleanups Eric Wong
@ 2020-01-11 22:35 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-01-11 22:35 UTC (permalink / raw)
To: meta
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.
---
lib/PublicInbox/Xapcmd.pm | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm
index 4871378e..de2ef5c6 100644
--- 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 ($$$;$$) {
^ permalink raw reply related [relevance 7%]
* [PATCH 0/9] more small fixes and cleanups
@ 2020-01-11 22:34 6% Eric Wong
2020-01-11 22:35 7% ` [PATCH 6/9] xapcmd: use popen_rd for running xapian-compact Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2020-01-11 22:34 UTC (permalink / raw)
To: meta
One bugfix for solver, a couple of optimizations which will
make sense when dealing with many and larger code repos.
And some cleanups to reduce redundant code.
Eric Wong (9):
config: do not slurp entire cgitrc at once
git: modified: don't slurp `rev-parse --branches'
git: packed_bytes: use GLOB_NOSORT
solver: path_a may be undef from /dev/null
cgit: drop cgit_parse_hdr wrapper
xapcmd: use popen_rd for running xapian-compact
xt/git_async_cmp: do not slurp large OID list into memory
t/solver_git: avoid uninitialized warnings in hostname generation
use popen_rd for bidirectional pipes
lib/PublicInbox/Cgit.pm | 9 ++-------
lib/PublicInbox/Config.pm | 4 ++--
lib/PublicInbox/Git.pm | 24 +++++++++++-------------
lib/PublicInbox/Import.pm | 8 +++-----
lib/PublicInbox/SolverGit.pm | 4 ++--
lib/PublicInbox/V2Writable.pm | 11 +++--------
lib/PublicInbox/Xapcmd.pm | 16 +++++-----------
t/solver_git.t | 12 ++++++------
xt/git_async_cmp.t | 4 ++--
9 files changed, 36 insertions(+), 56 deletions(-)
DELETE! DELETE! DELETE!
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-01-11 22:34 6% [PATCH 0/9] more small fixes and cleanups Eric Wong
2020-01-11 22:35 7% ` [PATCH 6/9] xapcmd: use popen_rd for running xapian-compact Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).