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

parallel: --sqlmaster +DBURL works with different commands.

Browse source
This commit is contained in:
Ole Tange 2017-01-13 15:47:13 +01:00
parent 84f4a855a5
commit 0d9812ddb4
1 changed files with 47 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/parallel
View file

@ -1259,7 +1259,7 @@ sub check_invalid_option_combinations {
sub init_globals { sub init_globals {
# Defaults: # Defaults:
$Global::version = 20170101; $Global::version = 20170111;
$Global::progname = 'parallel'; $Global::progname = 'parallel';
$Global::infinity = 2**31; $Global::infinity = 2**31;
$Global::debug = 0; $Global::debug = 0;
@ -9197,12 +9197,44 @@ sub replaced {
# for each arg: # for each arg:
# replace replacement strings with replacement in the word value # replace replacement strings with replacement in the word value
# push to replace word value # push to replace word value
$perl_expressions_as_re ||=
join("|", map {s/^-?\d+//; "\Q$_\E"} keys %{$self->{'replacecount'}}); if($opt::sqlworker) {
for my $arg (@$argref) { $perl_expressions_as_re =
my $val = $word; join("|", map {s/^-?\d+//; "\Q$_\E"} keys %{$self->{'replacecount'}});
# Replace {= perl expr =} with value for each arg for my $arg (@$argref) {
$val =~ s{\257<(-?\d+)?($perl_expressions_as_re)\257>} my $val = $word;
# Replace {= perl expr =} with value for each arg
$val =~ s{\257<(-?\d+)?($perl_expressions_as_re)\257>}
{
if($1) {
# Positional replace
# Find the relevant arg and replace it
($argref->[$1 > 0 ? $1-1 : $n+$1] ? # If defined: replace
$argref->[$1 > 0 ? $1-1 : $n+$1]->
replace($2,$quote_arg,$self)
: "");
} else {
# Normal replace
$normal_replace ||= 1;
($arg ? $arg->replace($2,$quote_arg,$self) : "");
}
}gxe;
if($quote) {
CORE::push(@{$replace{::shell_quote_scalar($word)}},
::shell_quote_scalar($val));
} else {
CORE::push(@{$replace{$word}}, $val);
}
# No normal replacements => only run once
$normal_replace or last;
}
} else {
$perl_expressions_as_re ||=
join("|", map {s/^-?\d+//; "\Q$_\E"} keys %{$self->{'replacecount'}});
for my $arg (@$argref) {
my $val = $word;
# Replace {= perl expr =} with value for each arg
$val =~ s{\257<(-?\d+)?($perl_expressions_as_re)\257>}
{ {
if($1) { if($1) {
# Positional replace # Positional replace
@ -9217,14 +9249,15 @@ sub replaced {
($arg ? $arg->replace($2,$quote_arg,$self) : ""); ($arg ? $arg->replace($2,$quote_arg,$self) : "");
} }
}goxe; }goxe;
if($quote) { if($quote) {
CORE::push(@{$replace{::shell_quote_scalar($word)}}, CORE::push(@{$replace{::shell_quote_scalar($word)}},
::shell_quote_scalar($val)); ::shell_quote_scalar($val));
} else { } else {
CORE::push(@{$replace{$word}}, $val); CORE::push(@{$replace{$word}}, $val);
}
# No normal replacements => only run once
$normal_replace or last;
} }
# No normal replacements => only run once
$normal_replace or last;
} }
} }
*Arg::arg = []; *Arg::arg = [];