tange/parallel
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/parallel.git synced 2024-11-22 05:57:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

parsort: Fixed -z when sorting files.

Browse source
This commit is contained in:
Ole Tange 2022-07-11 11:18:33 +08:00
parent 51f9bb2329
commit 63bfd1b9dc
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/parsort
View file

@ -126,13 +126,14 @@ $Global::version = 20220622;
if($opt::version) { version(); exit 0; } if($opt::version) { version(); exit 0; }
@Global::sortoptions = grep { ! /^-D$/ } @Global::sortoptions = grep { ! /^-D$/ }
shell_quote(@ARGV_before[0..($#ARGV_before-$#ARGV-1)]); shell_quote(@ARGV_before[0..($#ARGV_before-$#ARGV-1)]);
#if($opt::zero_terminated) { $/ = "\0"; }
$ENV{'TMPDIR'} ||= "/tmp"; $ENV{'TMPDIR'} ||= "/tmp";
sub merge { sub merge {
# Input: # Input:
# @cmd = commands to 'cat' (part of) a file # @cmd = commands to 'cat' (part of) a file
# 'cat a' 'cat b' 'cat c' =>
# sort -m <(sort -m <(cat a) <(cat b)) <(sort -m <(cat c))
my @cmd = @_; my @cmd = @_;
chomp(@cmd); chomp(@cmd);
while($#cmd > 0) { while($#cmd > 0) {
@ -155,8 +156,11 @@ sub sort_files {
# Input is files # Input is files
my @files = @_; my @files = @_;
# Let GNU Parallel generate the commands to read parts of files # Let GNU Parallel generate the commands to read parts of files
# The commands split at \n and there will be at least one for each CPU thread # The commands split at \n (or \0)
open(my $par,"-|",qw(parallel --pipepart --block -1 --dryrun -vv sort), # and there will be at least one for each CPU thread
my @subopt = $opt::zero_terminated ? qw(--recend "\0") : ();
open(my $par,"-|",qw(parallel), @subopt,
qw(--pipepart --block -1 --dryrun -vv sort),
@Global::sortoptions, '::::', @files) || die; @Global::sortoptions, '::::', @files) || die;
my @cmd = merge(<$par>); my @cmd = merge(<$par>);
close $par; close $par;
@ -181,7 +185,8 @@ sub sort_stdin {
@cmd = merge(@cmd); @cmd = merge(@cmd);
if(fork) { if(fork) {
} else { } else {
exec(qw(parallel -j),$numthreads, my @subopt = $opt::zero_terminated ? qw(--recend "\0") : ();
exec(qw(parallel -j), $numthreads, @subopt,
# 286k is the best mean value after testing 250..350 # 286k is the best mean value after testing 250..350
qw(--block 286k --pipe --roundrobin cat > {} :::),@fifos); qw(--block 286k --pipe --roundrobin cat > {} :::),@fifos);
} }

2
testsuite/wanted-results/parallel-local-parsort
View file

@ -51,7 +51,7 @@ par_tmpdir Should fail
par_tmpdir parsort: Error: Tmpdir '/tmp/parsort dir' is not writable. par_tmpdir parsort: Error: Tmpdir '/tmp/parsort dir' is not writable.
par_tmpdir parsort: Error: Try 'chmod +w '/tmp/parsort dir'' par_tmpdir parsort: Error: Try 'chmod +w '/tmp/parsort dir''
par_z ### parsort -z par_z ### parsort -z
par_z 583c59e3574e550f6810d0ad20e7ab88 - par_z 507d17cd3d746cdeeccdb8ad11860181 -
par_z 507d17cd3d746cdeeccdb8ad11860181 - par_z 507d17cd3d746cdeeccdb8ad11860181 -
par_z 507d17cd3d746cdeeccdb8ad11860181 - par_z 507d17cd3d746cdeeccdb8ad11860181 -
par_z 507d17cd3d746cdeeccdb8ad11860181 - par_z 507d17cd3d746cdeeccdb8ad11860181 -