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

Changed SQL datatypes as per bug #46803: Improvements to --sql.

Browse source
This commit is contained in:
Ole Tange 2016-01-05 12:00:43 +01:00
parent a0716ab5fb
commit 582164930a
1 changed files with 36 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/parallel
View file

@ -9736,18 +9736,23 @@ sub new {
"sqlite3" => "SQLite", "sqlite3" => "SQLite",
"pg" => "Pg", "pg" => "Pg",
"postgres" => "Pg", "postgres" => "Pg",
"postgresql" => "Pg"); "postgresql" => "Pg",
my $driver = $driveralias{$options{'databasedriver'}} || $options{'databasedriver'}; "oracle" => "Oracle",
"ora" => "Oracle");
my $driver = $driveralias{$options{'databasedriver'}} ||
$options{'databasedriver'};
my $database = $options{'database'}; my $database = $options{'database'};
my $host = $options{'host'} ? ";host=".$options{'host'} : ""; my $host = $options{'host'} ? ";host=".$options{'host'} : "";
my $port = $options{'port'} ? ";port=".$options{'port'} : ""; my $port = $options{'port'} ? ";port=".$options{'port'} : "";
my $dsn = "DBI:$driver:dbname=$database$host$port"; my $dsn = "DBI:$driver:dbname=$database$host$port";
my $userid = $options{'user'}; my $userid = $options{'user'};
my $password = $options{'password'};; my $password = $options{'password'};;
my $dbh = DBI->connect($dsn, $userid, $password, { RaiseError => 1 }) my $dbh = DBI->connect($dsn, $userid, $password,
{ RaiseError => 1, AutoInactiveDestroy => 1 })
or die $DBI::errstr; or die $DBI::errstr;
return bless { return bless {
'dbh' => $dbh, 'dbh' => $dbh,
'driver' => $driver,
'max_number_of_args' => undef, 'max_number_of_args' => undef,
'table' => $options{'table'}, 'table' => $options{'table'},
}, ref($class) || $class; }, ref($class) || $class;
@ -9772,7 +9777,8 @@ sub get_alias {
"$path/dburl.aliases", "$path/dburl.aliases.dist"); "$path/dburl.aliases", "$path/dburl.aliases.dist");
for (@deprecated) { for (@deprecated) {
if(-r $_) { if(-r $_) {
print STDERR "$_ is deprecated. Use .sql/aliases instead (read man sql)\n"; ::warning("$_ is deprecated. ".
"Use .sql/aliases instead (read man sql).");
} }
} }
my @urlalias=(); my @urlalias=();
@ -9789,7 +9795,7 @@ sub get_alias {
my ($alias_part,$rest) = $alias=~/(:\w*)(.*)/; my ($alias_part,$rest) = $alias=~/(:\w*)(.*)/;
# If we saw this before: we have an alias loop # If we saw this before: we have an alias loop
if(grep {$_ eq $alias_part } @Private::seen_aliases) { if(grep {$_ eq $alias_part } @Private::seen_aliases) {
print STDERR "$alias_part is a cyclic alias\n"; ::error("$alias_part is a cyclic alias.");
exit -1; exit -1;
} else { } else {
push @Private::seen_aliases, $alias_part; push @Private::seen_aliases, $alias_part;
@ -9814,13 +9820,15 @@ sub check_permissions {
if(-e $file) { if(-e $file) {
if(not -o $file) { if(not -o $file) {
my $username = (getpwuid($<))[0]; my $username = (getpwuid($<))[0];
print STDERR "$file should be owned by $username: chown $username $file\n"; ::warning("$file should be owned by $username: ".
"chown $username $file");
} }
my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size, my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
$atime,$mtime,$ctime,$blksize,$blocks) = stat($file); $atime,$mtime,$ctime,$blksize,$blocks) = stat($file);
if($mode & 077) { if($mode & 077) {
my $username = (getpwuid($<))[0]; my $username = (getpwuid($<))[0];
print STDERR "$file should be only be readable by $username: chmod 600 $file\n"; ::warning("$file should be only be readable by $username: ".
"chmod 600 $file");
} }
} }
} }
@ -9980,20 +9988,29 @@ sub create_table {
$self->set_max_number_of_args($max_number_of_args); $self->set_max_number_of_args($max_number_of_args);
my $table = $self->table(); my $table = $self->table();
$self->run(qq(DROP TABLE IF EXISTS $table;)); $self->run(qq(DROP TABLE IF EXISTS $table;));
my $v_def = join "", map { "V$_ TEXT," } (1..$self->max_number_of_args()); # BIGINT and TEXT are not supported in these databases or are too small
my %vartype = (
"Oracle" => { "BIGINT" => "NUMBER(19,0)",
"TEXT" => "CLOB", },
"mysql" => { "TEXT" => "LONGTEXT", },
);
my $BIGINT = $vartype{$self->{'driver'}}{"BIGINT"} || "BIGINT";
my $TEXT = $vartype{$self->{'driver'}}{"TEXT"} || "TEXT";
my $FLOAT = "FLOAT(44)";
my $v_def = join "", map { "V$_ $TEXT," } (1..$self->max_number_of_args());
$self->run(qq{CREATE TABLE $table $self->run(qq{CREATE TABLE $table
(Seq INT, (Seq $BIGINT,
Host TEXT, Host $TEXT,
Starttime REAL, Starttime $FLOAT,
JobRuntime REAL, JobRuntime $FLOAT,
Send INT, Send $BIGINT,
Receive INT, Receive $BIGINT,
Exitval INT, Exitval $BIGINT,
_Signal INT, _Signal $BIGINT,
Command TEXT,}. Command $TEXT,}.
$v_def. $v_def.
qq{Stdout TEXT, qq{Stdout $TEXT,
Stderr TEXT);}); Stderr $TEXT);});
} }
sub insert_records { sub insert_records {