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

Fixed bug #49785: total_jobs() with --sql*.

Browse source 
Test fails due to bug #49792: --sql* {#} is wrong.
This commit is contained in:
Ole Tange 2016-12-07 13:12:23 +01:00
parent f12701528a
commit 6837861a29
3 changed files with 55 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/release_new_version
View file

@ -230,11 +230,14 @@ Haiku of the month:
-- Ole Tange -- Ole Tange
New in this release: New in this release:
https://www.msi.umn.edu/support/faq/how-can-i-use-gnu-parallel-run-lot-commands-parallel
https://cs.gmu.edu/~ygingold/singleimage/Decomposing%20Images%20into%20Layers%20via%20RGB-space%20Geometry%20(Tan%20et%20al%202016%20TOG)%20small.pdf https://cs.gmu.edu/~ygingold/singleimage/Decomposing%20Images%20into%20Layers%20via%20RGB-space%20Geometry%20(Tan%20et%20al%202016%20TOG)%20small.pdf
https://arxiv.org/pdf/1511.02895v2.pdf https://arxiv.org/pdf/1511.02895v2.pdf
http://www.tecmint.com/linux-image-conversion-tools/ http://www.tecmint.com/linux-image-conversion-tools/
http://cohesity.com/blog/alls-fair-love-distributed-storage/ http://cohesity.com/blog/alls-fair-love-distributed-storage/
http://microbiomejournal.biomedcentral.com/articles/10.1186/s40168-016-0208-8 http://microbiomejournal.biomedcentral.com/articles/10.1186/s40168-016-0208-8
https://giorgos.sealabs.net/taco-bell-parallel-programming.html
http://www.tecmint.com/linux-image-conversion-tools/
* <<Possibly http://link.springer.com/chapter/10.1007%2F978-3-319-22053-6_46>> * <<Possibly http://link.springer.com/chapter/10.1007%2F978-3-319-22053-6_46>>

18
src/parallel
View file

@ -3174,7 +3174,7 @@ sub parse_host_filtering {
} elsif($col[6] eq "127") { } elsif($col[6] eq "127") {
# signal == 127: parallel not installed remote # signal == 127: parallel not installed remote
# Set ncpus and ncores = 1 # Set ncpus and ncores = 1
::warning("Could not figure out ", ::warning("Could not figure out ".
"number of cpus on $host. Using 1."); "number of cpus on $host. Using 1.");
$ncores{$host} = 1; $ncores{$host} = 1;
$ncpus{$host} = 1; $ncpus{$host} = 1;
@ -6244,6 +6244,9 @@ sub total_jobs {
::error("--pipe is incompatible with --eta/--bar/--shuf"); ::error("--pipe is incompatible with --eta/--bar/--shuf");
::wait_and_exit(255); ::wait_and_exit(255);
} }
if($opt::sqlworker) {
$self->{'total_jobs'} = $Global::sql->total_jobs();
} else {
my $record; my $record;
my @arg_records; my @arg_records;
my $record_queue = $self->{'commandlinequeue'}{'arg_queue'}; my $record_queue = $self->{'commandlinequeue'}{'arg_queue'};
@ -6276,6 +6279,7 @@ sub total_jobs {
::debug("init","Total jobs: ".$self->{'total_jobs'}. ::debug("init","Total jobs: ".$self->{'total_jobs'}.
" (".(1+$#arg_records)."+".$self->{'this_job_no'}.")\n"); " (".(1+$#arg_records)."+".$self->{'this_job_no'}.")\n");
} }
}
return $self->{'total_jobs'}; return $self->{'total_jobs'};
} }
@ -10471,6 +10475,18 @@ sub get_record {
} }
} }
sub total_jobs {
my $self = shift;
my @retval;
my $table = $self->table();
my $v = $self->get("SELECT count(*) FROM $table;");
if($v->[0]) {
return $v->[0]->[0];
} else {
::die_bug("SQL::total_jobs");
}
}
sub finished { sub finished {
# Check if there are any jobs left in the SQL table that do not # Check if there are any jobs left in the SQL table that do not
# have a "real" exitval # have a "real" exitval

9
testsuite/tests-to-run/parallel-local-sql.sh
View file

@ -30,8 +30,9 @@ p_wrapper() {
} }
p_template() { p_template() {
(sleep 2; parallel "$@" --sqlworker $DBURL sleep .3\;echo >$T1) & (sleep 2;
parallel "$@" --sqlandworker $DBURL sleep .3\;echo ::: {1..5} ::: {a..e} >$T2; parallel --sqlworker $DBURL "$@" sleep .3\;echo >$T1) &
parallel --sqlandworker $DBURL "$@" sleep .3\;echo ::: {1..5} ::: {a..e} >$T2;
} }
export -f p_template export -f p_template
@ -67,6 +68,10 @@ par_sqlandworker_unbuffer() {
p_template -u p_template -u
} }
par_sqlandworker_total_jobs() {
p_template echo {#} of '{=1 $_=total_jobs(); =};'
}
export -f $(compgen -A function | egrep 'p_|par_') export -f $(compgen -A function | egrep 'p_|par_')
# Tested that -j0 in parallel is fastest (up to 15 jobs) # Tested that -j0 in parallel is fastest (up to 15 jobs)