1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Improved portability of the sql-bench Perl scripts by replacing

Browse Source 
the calls of external programs "uname" and "pwd" with Perl builtin
   functions "cwd()" and "POSIX::uname()"


sql-bench/as3ap.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/bench-count-distinct.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/bench-init.pl.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
   - portability fix: don't call external "uname" in various combinations,
     use POSIX::uname() instead.
sql-bench/copy-db.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/crash-me.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
   - portability fix: don't call external "uname" in various combinations,
     use POSIX::uname() instead.
sql-bench/innotest1.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/innotest1a.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/innotest1b.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/innotest2.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/innotest2a.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/innotest2b.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/run-all-tests.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/test-ATIS.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/test-alter-table.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/test-big-tables.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/test-connect.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/test-create.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/test-insert.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/test-select.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/test-transactions.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/test-wisconsin.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
This commit is contained in:
unknown 2003-09-25 23:12:24 +02:00
parent 8090030700
commit dd3af2257a
21 changed files with 46 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql-bench/as3ap.sh
View File

@ -21,10 +21,11 @@
##################### Standard benchmark inits ##############################
use Cwd;
use DBI;
use Benchmark;
chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
$pwd = cwd(); $pwd = "." if ($pwd eq '');
require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
$opt_loop_count=1;

3
sql-bench/bench-count-distinct.sh
View File

@ -20,6 +20,7 @@
#
##################### Standard benchmark inits ##############################
use Cwd;
use DBI;
use Getopt::Long;
use Benchmark;
@ -30,7 +31,7 @@ $opt_small_loop_count=10;
$opt_regions=6;
$opt_groups=100;
chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
$pwd = cwd(); $pwd = "." if ($pwd eq '');
require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
$columns=min($limits->{'max_columns'},500,($limits->{'query_size'}-50)/24,

21
sql-bench/bench-init.pl.sh
View File

@ -33,6 +33,7 @@
$benchmark_version="2.15";
use Getopt::Long;
use POSIX;
require "$pwd/server-cfg" || die "Can't read Configuration file: $!\n";
@ -417,24 +418,8 @@ sub machine_part
sub machine
{
$name= `uname -s -r -m`;
if ($?)
{
$name= `uname -s -m`;
}
if ($?)
{
$name= `uname -s`;
}
if ($?)
{
$name= `uname`;
}
if ($?)
{
$name="unknown";
}
chomp($name); $name =~ s/[\n\r]//g;
my @name = POSIX::uname();
my $name= $name[0] . " " . $name[2] . " " . $name[4];
return $name;
}

3
sql-bench/copy-db.sh
View File

@ -22,12 +22,13 @@
$VER = "1.0";
use Getopt::Long;
use Cwd;
use DBI;
$max_row_length=500000; # Don't create bigger SQL rows that this
$opt_lock=1; # lock tables
chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
$pwd = cwd(); $pwd = "." if ($pwd eq '');
require "$pwd/server-cfg" || die "Can't read Configuration file: $!\n";

24
sql-bench/crash-me.sh
View File

@ -41,9 +41,11 @@
$version="1.61";
use Cwd;
use DBI;
use Getopt::Long;
chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
use POSIX;
$pwd = cwd(); $pwd = "." if ($pwd eq '');
require "$pwd/server-cfg" || die "Can't read Configuration file: $!\n";
$opt_server="mysql"; $opt_host="localhost"; $opt_database="test";
@ -3247,24 +3249,8 @@ EOF
sub machine
{
$name= `uname -s -r -m`;
if ($?)
{
$name= `uname -s -m`;
}
if ($?)
{
$name= `uname -s`;
}
if ($?)
{
$name= `uname`;
}
if ($?)
{
$name="unknown";
}
chomp($name); $name =~ s/[\n\r]//g;
my @name = POSIX::uname();
my $name= $name[0] . " " . $name[2] . " " . $name[4];
return $name;
}

3
sql-bench/innotest1.sh
View File

@ -5,12 +5,13 @@
#
############################################################################
use Cwd;
use DBI;
use Benchmark;
$opt_loop_count = 100000;
chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
$pwd = cwd(); $pwd = "." if ($pwd eq '');
require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
print "Innotest1: MySQL/InnoDB stress test in Perl\n";

3
sql-bench/innotest1a.sh
View File

@ -5,12 +5,13 @@
#
############################################################################
use Cwd;
use DBI;
use Benchmark;
$opt_loop_count = 200000;
chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
$pwd = cwd(); $pwd = "." if ($pwd eq '');
require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
print "Innotest1a: MySQL/InnoDB stress test in Perl\n";

3
sql-bench/innotest1b.sh
View File

@ -5,12 +5,13 @@
#
############################################################################
use Cwd;
use DBI;
use Benchmark;
$opt_loop_count = 200000;
chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
$pwd = cwd(); $pwd = "." if ($pwd eq '');
require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
print "Innotest1b: MySQL/InnoDB stress test in Perl\n";

3
sql-bench/innotest2.sh
View File

@ -5,12 +5,13 @@
#
############################################################################
use Cwd;
use DBI;
use Benchmark;
$opt_loop_count = 100000;
chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
$pwd = cwd(); $pwd = "." if ($pwd eq '');
require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
print "Innotest2: MySQL/InnoDB stress test in Perl for FOREIGN keys\n";

3
sql-bench/innotest2a.sh
View File

@ -5,12 +5,13 @@
#
############################################################################
use Cwd;
use DBI;
use Benchmark;
$opt_loop_count = 100000;
chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
$pwd = cwd(); $pwd = "." if ($pwd eq '');
require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
print "Innotest2a: MySQL/InnoDB stress test in Perl for FOREIGN keys\n";

3
sql-bench/innotest2b.sh
View File

@ -5,12 +5,13 @@
#
############################################################################
use Cwd;
use DBI;
use Benchmark;
$opt_loop_count = 100000;
chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
$pwd = cwd(); $pwd = "." if ($pwd eq '');
require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
print "Innotest2b: MySQL/InnoDB stress test in Perl for FOREIGN keys\n";

3
sql-bench/run-all-tests.sh
View File

@ -34,11 +34,12 @@
# --log ==> puts output in output/RUN-server-machine-cmp-$opt_cmp
use DBI;
use Cwd;
$opt_silent=1; # Don't write header
@ORG_ARGV=@ARGV;
chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
$pwd = cwd(); $pwd = "." if ($pwd eq '');
require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
$opt_silent=0;
$perl=$^X;

3
sql-bench/test-ATIS.sh
View File

@ -24,12 +24,13 @@
# - skip a couple of the tests in Q4 that Oracle doesn't understand
################### Standard benchmark inits ##############################
use Cwd;
use DBI;
use Benchmark;
$opt_loop_count=100; # Run selects this many times
chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
$pwd = cwd(); $pwd = "." if ($pwd eq '');
require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
if ($opt_small_test)

3
sql-bench/test-alter-table.sh
View File

@ -20,6 +20,7 @@
#
##################### Standard benchmark inits ##############################
use Cwd;
use DBI;
use Benchmark;
@ -29,7 +30,7 @@ $opt_row_count=1000; # Rows in the table
$opt_field_count=1000; # Add until this many fields.
$opt_time_limit=10*60; # Don't wait more than 10 min for some tests
chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
$pwd = cwd(); $pwd = "." if ($pwd eq '');
require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
$opt_field_count=min($opt_field_count,$limits->{'max_columns'},

3
sql-bench/test-big-tables.sh
View File

@ -21,13 +21,14 @@
##################### Standard benchmark inits ##############################
use Cwd;
use DBI;
use Benchmark;
$opt_loop_count=1000; # Change this to make test harder/easier
$opt_field_count=1000;
chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
$pwd = cwd(); $pwd = "." if ($pwd eq '');
require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
$opt_field_count=min($opt_field_count,$limits->{'max_columns'},

3
sql-bench/test-connect.sh
View File

@ -24,6 +24,7 @@
# by using option --loop_value='what_ever_you_like'.
##################### Standard benchmark inits ##############################
use Cwd;
use DBI;
use Benchmark;
@ -31,7 +32,7 @@ $opt_loop_count=100000; # Change this to make test harder/easier
$str_length=65000; # This is the length of blob strings in PART:5
$max_test=20; # How many times to test if the server is busy
chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
$pwd = cwd(); $pwd = "." if ($pwd eq '');
require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
# This is the length of blob strings in PART:5

3
sql-bench/test-create.sh
View File

@ -30,13 +30,14 @@
##################### Standard benchmark inits ##############################
use Cwd;
use DBI;
use Benchmark;
$opt_loop_count=10000; # Change this to make test harder/easier
# This is the default value for the amount of tables used in this test.
chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
$pwd = cwd(); $pwd = "." if ($pwd eq '');
require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
$create_loop_count=$opt_loop_count;

3
sql-bench/test-insert.sh
View File

@ -28,6 +28,7 @@
#
##################### Standard benchmark inits ##############################
use Cwd;
use DBI;
use Benchmark;
use Data::Dumper;
@ -38,7 +39,7 @@ $range_loop_count=$small_loop_count*50;
$many_keys_loop_count=$opt_loop_count;
$opt_read_key_loop_count=$opt_loop_count;
chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
$pwd = cwd(); $pwd = "." if ($pwd eq '');
require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
if ($opt_small_test)

3
sql-bench/test-select.sh
View File

@ -20,6 +20,7 @@
#
##################### Standard benchmark inits ##############################
use Cwd;
use DBI;
use Getopt::Long;
use Benchmark;
@ -30,7 +31,7 @@ $opt_small_loop_count=10;
$opt_regions=6;
$opt_groups=100;
chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
$pwd = cwd(); $pwd = "." if ($pwd eq '');
require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
$columns=min($limits->{'max_columns'},500,($limits->{'query_size'}-50)/24,

3
sql-bench/test-transactions.sh
View File

@ -21,6 +21,7 @@
##################### Standard benchmark inits ##############################
use Cwd;
use DBI;
use Benchmark;
#use warnings;
@ -30,7 +31,7 @@ $opt_groups=27; # Characters are 'A' -> Z
$opt_loop_count=10000; # Change this to make test harder/easier
$opt_medium_loop_count=100; # Change this to make test harder/easier
chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
$pwd = cwd(); $pwd = "." if ($pwd eq '');
require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
# Avoid warnings for variables in bench-init.pl

3
sql-bench/test-wisconsin.sh
View File

@ -17,12 +17,13 @@
# MA 02111-1307, USA
#
use Cwd;
use DBI;
use Benchmark;
$opt_loop_count=10;
chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
$pwd = cwd(); $pwd = "." if ($pwd eq '');
require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
$into_table = "";