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

Fixed bug #50018: --dburl without table dies.

Browse source
This commit is contained in:
Ole Tange 2017-01-14 23:36:59 +01:00
parent 61be3ff4a2
commit f3bf41f807
3 changed files with 55 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/parallel
View file

@ -10384,6 +10384,10 @@ sub new {
$dbh->{'ShowErrorStatement'} = 1; $dbh->{'ShowErrorStatement'} = 1;
$dbh->{'HandleError'} = sub {}; $dbh->{'HandleError'} = sub {};
if(not defined $options{'table'}) {
::error("The DBURL ($dburl) must contain a table.");
::wait_and_exit(255);
}
return bless { return bless {
'dbh' => $dbh, 'dbh' => $dbh,

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

@ -130,6 +130,17 @@ par_sql_joblog() {
# TODO --sqlandworker --wait # TODO --sqlandworker --wait
} }
par_no_table() {
echo 'bug #50018: --dburl without table dies'
parallel --sqlworker $SERVERURL
echo $?
parallel --sqlandworker $SERVERURL echo ::: no_output
echo $?
parallel --sqlmaster $SERVERURL echo ::: no_output
echo $?
# For p_wrapper to remove table
parallel --sqlandworker $DBURL true ::: dummy ::: dummy
}
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)

40
testsuite/wanted-results/parallel-local-sql
View file

@ -264,6 +264,46 @@ par_append_different_cmd $SQLITE :|sleep .3;echo D-15|15|D|D-15
par_append_different_cmd $SQLITE | par_append_different_cmd $SQLITE |
par_append_different_cmd $SQLITE :|sleep .3;echo E-15|15|E|E-15 par_append_different_cmd $SQLITE :|sleep .3;echo E-15|15|E|E-15
par_append_different_cmd $SQLITE | par_append_different_cmd $SQLITE |
p_wrapper par_no_table \$MYSQL
par_no_table $MYSQL bug #50018: --dburl without table dies
par_no_table $MYSQL 255
par_no_table $MYSQL 255
par_no_table $MYSQL 255
par_no_table $MYSQL Exit=0
par_no_table $MYSQL Exit=0
par_no_table $MYSQL Host Command V1 V2 Stdout Stderr
par_no_table $MYSQL : true dummy dummy dummy dummy
par_no_table $MYSQL parallel: Error: The DBURL (mysql://tange:tange@lo/tange) must contain a table.
par_no_table $MYSQL parallel: Error: The DBURL (mysql://tange:tange@lo/tange) must contain a table.
par_no_table $MYSQL parallel: Error: The DBURL (mysql://tange:tange@lo/tange) must contain a table.
par_no_table $MYSQL mysql: [Warning] Using a password on the command line interface can be insecure.
p_wrapper par_no_table \$PG
par_no_table $PG bug #50018: --dburl without table dies
par_no_table $PG 255
par_no_table $PG 255
par_no_table $PG 255
par_no_table $PG Exit=0
par_no_table $PG Exit=0
par_no_table $PG host | command | v1 | v2 | stdout | stderr
par_no_table $PG ------+------------------+-------+-------+--------+--------
par_no_table $PG : | true dummy dummy | dummy | dummy | |
par_no_table $PG (1 row)
par_no_table $PG
par_no_table $PG parallel: Error: The DBURL (pg://tange:tange@lo/tange) must contain a table.
par_no_table $PG parallel: Error: The DBURL (pg://tange:tange@lo/tange) must contain a table.
par_no_table $PG parallel: Error: The DBURL (pg://tange:tange@lo/tange) must contain a table.
p_wrapper par_no_table \$SQLITE
par_no_table $SQLITE bug #50018: --dburl without table dies
par_no_table $SQLITE 255
par_no_table $SQLITE 255
par_no_table $SQLITE 255
par_no_table $SQLITE Exit=0
par_no_table $SQLITE Exit=0
par_no_table $SQLITE Host|Command|V1|V2|Stdout|Stderr
par_no_table $SQLITE :|true dummy dummy|dummy|dummy||
par_no_table $SQLITE parallel: Error: The DBURL (sqlite3:///%2Frun%2Fshm%2Fparallel.db) must contain a table.
par_no_table $SQLITE parallel: Error: The DBURL (sqlite3:///%2Frun%2Fshm%2Fparallel.db) must contain a table.
par_no_table $SQLITE parallel: Error: The DBURL (sqlite3:///%2Frun%2Fshm%2Fparallel.db) must contain a table.
p_wrapper par_shuf \$MYSQL p_wrapper par_shuf \$MYSQL
par_shuf $MYSQL 1 a par_shuf $MYSQL 1 a
par_shuf $MYSQL 1 b par_shuf $MYSQL 1 b