mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
9e6784924a
Fixed compile-pentium64 scripts Fixed wrong estimate of update_with_key_prefix in sql-bench Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/home/my/mysql-5.1 Fixed unsafe define of uint4korr() Fixed that --extern works with mysql-test-run.pl Small trivial cleanups This also fixes a bug in counting number of rows that are updated when we have many simultanous queries Move all connection handling and command exectuion main loop from sql_parse.cc to sql_connection.cc Split handle_one_connection() into reusable sub functions. Split create_new_thread() into reusable sub functions. Added thread_scheduler; Preliminary interface code for future thread_handling code. Use 'my_thread_id' for internal thread id's Make thr_alarm_kill() to depend on thread_id instead of thread Make thr_abort_locks_for_thread() depend on thread_id instead of thread In store_globals(), set my_thread_var->id to be thd->thread_id. Use my_thread_var->id as basis for my_thread_name() The above changes makes the connection we have between THD and threads more soft. Added a lot of DBUG_PRINT() and DBUG_ASSERT() functions Fixed compiler warnings Fixed core dumps when running with --debug Removed setting of signal masks (was never used) Made event code call pthread_exit() (portability fix) Fixed that event code doesn't call DBUG_xxx functions before my_thread_init() is called. Made handling of thread_id and thd->variables.pseudo_thread_id uniform. Removed one common 'not freed memory' warning from mysqltest Fixed a couple of usage of not initialized warnings (unlikely cases) Suppress compiler warnings from bdb and (for the moment) warnings from ndb BitKeeper/deleted/.del-SETUP.sh.rej: Rename: BUILD/SETUP.sh.rej -> BitKeeper/deleted/.del-SETUP.sh.rej BitKeeper/deleted/.del-configure.in.rej: Rename: configure.in.rej -> BitKeeper/deleted/.del-configure.in.rej BitKeeper/deleted/.del-my_global.h.rej: Rename: include/my_global.h.rej -> BitKeeper/deleted/.del-my_global.h.rej BitKeeper/deleted/.del-my_pthread.h.rej: Rename: include/my_pthread.h.rej -> BitKeeper/deleted/.del-my_pthread.h.rej BitKeeper/deleted/.del-mysql_client_test.c.rej: Rename: tests/mysql_client_test.c.rej -> BitKeeper/deleted/.del-mysql_client_test.c.rej BitKeeper/deleted/.del-mysqld.cc.rej~35c1c438e11ebd89: Rename: sql/mysqld.cc.rej -> BitKeeper/deleted/.del-mysqld.cc.rej~35c1c438e11ebd89 BitKeeper/deleted/.del-sql_parse.cc.rej: Rename: sql/sql_parse.cc.rej -> BitKeeper/deleted/.del-sql_parse.cc.rej BitKeeper/deleted/.del-table.cc.rej: Rename: sql/table.cc.rej -> BitKeeper/deleted/.del-table.cc.rej BitKeeper/deleted/.del-thr_alarm.c.rej: Rename: mysys/thr_alarm.c.rej -> BitKeeper/deleted/.del-thr_alarm.c.rej BUILD/compile-pentium64: Update this to be in line with compile-pentium BUILD/compile-pentium: Send command line options to SETUP.sh BUILD/compile-solaris-sparc-debug: Update scripts BUILD/compile-solaris-sparc-forte: Update scripts BUILD/compile-solaris-sparc-purify: Update scripts BUILD/compile-solaris-sparc: Update scripts BitKeeper/deleted/.del-DbtupSystemRestart.cpp~15b54d7e4e75d2d: Removed compiler warning BitKeeper/deleted/.del-ha_berkeley.cc: Moved get_auto_primary_key() here as int5store() gives (wrong) compiler warnings in win64 configure.in: Added detection of port_create and port.h (for future)as --- manual merge BitKeeper/deleted/.del-ha_berkeley.h: Moved get_auto_primary_key() to ha_berkeley.cc BitKeeper/deleted/.del-mysqlmanager.c~e97636d71145a0b: Fixed compiler warnings BitKeeper/etc/ignore: added storage/ndb/src/ndbapi/ndberror_check client/mysqlbinlog.cc: Removed not needed 'static' (caused compiler warning) client/mysqldump.c: Fixed compiler warnings from 'max' build client/mysqltest.c: Free warning and query memory no abort. (Removes strange warnings on screen if mysql-test-run fails) Removed compiler warnings Portability fix for windows (windows doesn't have mode_t) client/sql_string.h: Removed compiler warning cmd-line-utils/readline/xmalloc.c: Fixed compiler warnings from 'max' build extra/charset2html.c: Fixed compiler warnings extra/comp_err.c: Fixed compiler warnings from 'max' build extra/yassl/include/lock.hpp: Fix for windows64 extra/yassl/include/openssl/ssl.h: Changed prototype for SSL_set_fd() to fix compiler warnings (and possible errors) on windows 64 bit extra/yassl/include/socket_wrapper.hpp: Moved socket_t to ssl.h, to be able to removed compiler warnings on windows 64 bit extra/yassl/include/yassl.hpp: Fix for windows64 extra/yassl/src/ssl.cpp: Removed compiler warning Detect wrong parameter (Happens when running test suite on solaris) Changed prototype for SSL_set_fd() to fix compiler warnings (and possible errors) on windows 64 bit extra/yassl/taocrypt/src/integer.cpp: Fixed compiler warnings extra/yassl/testsuite/testsuite.cpp: Removed compiler warning include/config-win.h: Added HAVE_WINSOCK2 (for future) include/my_dbug.h: Fixed DBUG_PROCESS() so that we don't get compiler warnings for it include/my_global.h: Fixed unsafe define of uint4korr() manual merge (ignore changes from 5.0) Fixed warnings on win64 when using int5store and int6store include/my_pthread.h: Added my_thread_id typedef Renamed 'my_thread_id() function to my_thead_dbug_id() include/thr_alarm.h: Make thr_alarm_kill() to depend on thread_id instead of thread include/thr_lock.h: Make thr_abort_locks_for_thread() depend on thread_id instead of thread libmysql/libmysql.def: Fixed compiler warnings on win64 libmysqld/CMakeLists.txt: Added missing files libmysqld/Makefile.am: Added new files libmysqld/lib_sql.cc: Remove not needed code (store_globals() now takes care of things) mysql-test/lib/mtr_report.pl: Removed wrong messages when using --extern mysql-test/mysql-test-run.pl: Fixed that --extern works Print help on stdout instead of stderr (make it easier to pipe it to less) Fixed typo that caused mysql-test-run.pl to fail on Solaris mysql-test/r/keywords.result: manual merge mysql-test/r/ndb_lock.result: After merge fixes mysql-test/r/ps.result: Portability fix mysql-test/t/disabled.def: Disabled ndb_alter_table as this very often fails for me (and have done it for a long time) mysql-test/t/keywords.test: manual merge mysql-test/t/ndb_lock.test: Added other possible error code mysql-test/t/ps.test: Portability fix (when compiling without DLOPEN) mysql-test/t/wait_timeout.test: Don't run this if we are not using a thread per connection (as other thread_handling code may not support timeouts) mysys/base64.c: Fixed compiler warnings on win64 mysys/mf_keycache.c: Fixed compiler warnings mysys/my_getopt.c: Fixed compiler warning mysys/my_init.c: Fixed compiler warning Re-indented long comment mysys/my_thr_init.c: Always use mysys_var->id to generate thread name (makes things uniform accross thread implementations and thread usage) Always generate my_thread_name() when using DBUG Ensure mysys_var->pthread_self is set Fixed compiler warnings mysys/ptr_cmp.c: Fixed compiler warnings from 'max' build mysys/thr_alarm.c: Change thr_alarm_kill() to use mysys_var->id instead of thread id Fixed compiler warning on windows mysys/thr_lock.c: Change thr_abort_locks_for_thread() to use mysys_var->id instead of thread id Add purecov statements around not tested code Fixed compiler warnings mysys/thr_mutex.c: my_thread_id() -> my_thread_dbug_id() server-tools/instance-manager/guardian.cc: Fixed compiler warning server-tools/instance-manager/instance.cc: Fixed compiler warning server-tools/instance-manager/mysql_connection.cc: Fixed compiler warnings server-tools/instance-manager/mysqlmanager.cc: Fixed compiler warnings sql/CMakeLists.txt: Added missing files sql/Makefile.am: Added new files sql/event_scheduler.cc: Added pthread_exit() calls Ensure DBUG_xxx calls are not made before my_thread_init() Use common functions to set up thread handling sql/field.h: manual merge sql/ha_ndbcluster.cc: Removed some trivial 'current_thd' calls sql/handler.cc: Avoid warnings on KILL_CONNECTION Don't print out null pointer with printf() (Causes crashes on Solaris) sql/item.cc: Fixed compiler warnings from 'max' build sql/item_cmpfunc.cc: After merge fixes sql/item_func.cc: Merge embedded and normal code usage (GET_LOCK, RELEASE_LOCK now works on my_thread_id instead of pthread_t) Fixed compiler warning sql/item_strfunc.cc: Fixed compiler warning sql/item_timefunc.cc: Fixed compiler warnings sql/lock.cc: Use (new) parameter to thr_abort_locks_for_thread() sql/log.cc: Fixed compiler warning sql/log_event.cc: Fixed compiler warnings about not used variable sql/mysql_priv.h: Remove TEST_NO_THREADS (not needed with new scheduler interface) Added functions from sql_connect.cc and new functions from sql_parse.cc sql/mysqld.cc: Use thread_scheduler structure to dispatch calls (make code more dynamic) Change --one-thread option to use thread_scheduler interface Made ONE_THREAD option independent of DBUG_BUILD --one-thread is now depricated. One should instead use '--thread-handling=no-threads' Remove not used uname() function. Split create_new_thread() into reusable sub functions. Preliminary interface code for future thread_handling code. Fixed compiler warnings sql/parse_file.cc: Don't send zero pointer to fn_format() (Causes crashes when using --debug) sql/repl_failsafe.cc: Setup pseudo_thread_id same way as other code sql/set_var.cc: Added variables 'thread_handling' Prepare for future variable 'thread_pool_size' Fixed compiler warnings sql/set_var.h: Fixed compiler warning sql/slave.cc: Setup pseudo_thread_id same way as other code Removed not used signal mask sql/sql_acl.cc: Fixed compiler warnings from 'max' build sql/sql_base.cc: Fixed long comments Normalized variable setup Don't destroy value of thd->variables.pseduo_thread_id More DBUG_PRINT()'s More DBUG_ASSERT()'s Fixed compiler warnings from 'max' build sql/sql_class.cc: Remove thd->real_id and thd->dbug_thread_id Added DBUG_ASSERT() Use thread_scheduler to signal threads to be killed. In THD::store_globals(), set my_thread_var->id to be thd->thread_id. Fixed compiler warnings sql/sql_class.h: Use 'my_thread_id' for internal thread id's Remove not needed THD elements: block_signals and dbug_thread_id Added 'thread_scheduler' scheduling extension element to THD sql/sql_insert.cc: After merge fixes (This actually fixes a bug in old code when many connections are in use) Setup pseudo_thread_id same way as other code Removed not used signal mask Initialize variable that may be used unitialized on error conditions (not fatal) sql/sql_parse.cc: Move connection related code to sql_connect.cc Remove setting of signal mask (not needed) Ensure TABLE_LIST->alias is set for generated TABLE_LIST elements (fixed core dumps when running with --debug) Added previous 'optional' element to reset_mgh() Removed not needed DBUG_PRINT call sql/sql_partition.cc: Fixed compiler warnings sql/sql_prepare.cc: Removed not needed casts Fixed compiler warnings from 'max' build sql/sql_select.cc: Fixed compiler warnings sql-bench/bench-init.pl.sh: Added --one-missing-tests sql-bench/example: Better example sql-bench/run-all-tests.sh: Added --only-missing-tests sql-bench/test-insert.sh: Fixed wrong estimate of update_with_key_prefix sql/sql_show.cc: Don't send pthread_kill() to threads to detect if they exists. (Not that useful and causes problems with future thread_handling code) Fixed compiler warnings sql/sql_table.cc: Simplify code Fixed compiler warnings sql/sql_test.cc: Remove dbug_thread_id from test output sql/sql_view.cc: Don't send zero pointer to fn_format() sql/tztime.cc: Fixed compiler warning sql/udf_example.def: Fixed compiler warnings on win64 sql/unireg.cc: Initialize variable that may be used unitialized on error conditions storage/archive/archive_test.c: Fixed compiler warnings storage/archive/azio.c: Fixed compiler warnings storage/innobase/dict/dict0crea.c: Fixed compiler warnings detected on windows64 storage/innobase/dict/dict0dict.c: Fixed compiler warnings detected on windows64 storage/innobase/dict/dict0load.c: Fixed compiler warnings detected on windows64 storage/innobase/dict/dict0mem.c: Fixed compiler warnings detected on windows64 storage/innobase/eval/eval0proc.c: Fixed compiler warnings detected on windows64 storage/innobase/handler/ha_innodb.cc: Fixed compiler warnings detected on windows64 storage/innobase/include/ut0byte.ic: Fixed compiler warnings on win64 storage/innobase/include/ut0ut.ic: Fixed compiler warnings on win64 storage/innobase/mtr/mtr0log.c: Fixed compiler warnings detected on windows64 storage/innobase/pars/pars0lex.l: Fixed warnings on win64 storage/innobase/rem/rem0cmp.c: Fixed compiler warnings detected on windows64 storage/innobase/row/row0mysql.c: Fixed compiler warnings detected on windows64 storage/innobase/row/row0sel.c: Fixed compiler warnings detected on windows64 storage/innobase/sync/sync0rw.c: Fixed compiler warnings detected on windows64 storage/innobase/trx/trx0trx.c: Fixed compiler warnings detected on windows64 storage/myisam/mi_log.c: my_thread_id() -> my_thread_debug_id() storage/myisam/mi_packrec.c: Fixed compiler warnings detected on windows64 storage/myisam/myisamchk.c: Fixed compiler warnings from 'max' build storage/ndb/src/common/debugger/EventLogger.cpp: Fixed compiler warnings storage/ndb/src/common/util/ConfigValues.cpp: Removed compiler warnings storage/ndb/src/common/util/NdbSqlUtil.cpp: Removed compiler warnings storage/ndb/src/cw/cpcd/CPCD.hpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/backup/Backup.cpp: Fixed compiler warnings detected on windows64 storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp: Fixed compiler warnings detected on windows64 storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: Fixed compiler warnings detected on windows64 storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/diskpage.hpp: Fixed compiler warnings storage/ndb/src/kernel/vm/ndbd_malloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp: Fixed compiler warnings storage/ndb/src/mgmclient/main.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/NdbOperationExec.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/SignalSender.cpp: Fixed compiler warnings storage/ndb/tools/restore/consumer_restore.cpp: Fixed compiler warnings strings/ctype-ucs2.c: Fixed compiler warnings strings/ctype-utf8.c: Fixed compiler warnings strings/decimal.c: Fixed compiler warnings strings/my_strchr.c: Fixed conflict between function and prototype support-files/compiler_warnings.supp: Ignore warnings from sql_yacc.cc that are hard to remove Ignore some not important warnings from windows 64 bit build Suppress warnings from bdb and (for the moment) warnings from ndb Suppress all warnings for all pushbuild platforms (should make all trees green) vio/viosslfactories.c: Added DBUG_PRINT BUILD/compile-pentium64-max: New BitKeeper file ``BUILD/compile-pentium64-max'' libmysqld/scheduler.cc: New BitKeeper file ``libmysqld/scheduler.cc'' libmysqld/sql_connect.cc: New BitKeeper file ``libmysqld/sql_connect.cc'' mysql-test/include/one_thread_per_connection.inc: New BitKeeper file ``mysql-test/include/one_thread_per_connection.inc'' mysql-test/r/no-threads.result: New BitKeeper file ``mysql-test/r/no-threads.result'' mysql-test/r/one_thread_per_connection.require: New BitKeeper file ``mysql-test/r/one_thread_per_connection.require'' mysql-test/t/no-threads-master.opt: New BitKeeper file ``mysql-test/t/no-threads-master.opt'' mysql-test/t/no-threads.test: New BitKeeper file ``mysql-test/t/no-threads.test'' sql/scheduler.cc: New BitKeeper file ``sql/scheduler.cc'' sql/scheduler.h: New BitKeeper file ``sql/scheduler.h'' sql/sql_connect.cc: New BitKeeper file ``sql/sql_connect.cc''
602 lines
15 KiB
Bash
602 lines
15 KiB
Bash
#!@PERL@
|
|
# Copyright (C) 2000-2003, 2005 MySQL AB
|
|
#
|
|
# This library is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU Library General Public
|
|
# License as published by the Free Software Foundation; version 2
|
|
# of the License.
|
|
#
|
|
# This library is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
# Library General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU Library General Public
|
|
# License along with this library; if not, write to the Free
|
|
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
|
# MA 02111-1307, USA
|
|
#
|
|
##########################################################
|
|
# this is the base file every test is using ....
|
|
# this is made for not changing every file if we want to
|
|
# add an option or just want to change something in
|
|
# code what is the same in every file ...
|
|
##########################################################
|
|
|
|
#
|
|
# The exported values are:
|
|
|
|
# $opt_... Various options
|
|
# $date Current date in ISO format
|
|
# $server Object for current server
|
|
# $limits Hash reference to limits for benchmark
|
|
|
|
$benchmark_version="2.15";
|
|
use Getopt::Long;
|
|
use POSIX;
|
|
|
|
require "$pwd/server-cfg" || die "Can't read Configuration file: $!\n";
|
|
|
|
$|=1; # Output data immediately
|
|
|
|
$opt_skip_test=$opt_skip_create=$opt_skip_delete=$opt_verbose=$opt_fast_insert=$opt_lock_tables=$opt_debug=$opt_skip_delete=$opt_fast=$opt_force=$opt_log=$opt_use_old_results=$opt_help=$opt_odbc=$opt_small_test=$opt_small_tables=$opt_samll_key_tables=$opt_stage=$opt_old_headers=$opt_die_on_errors=$opt_tcpip=$opt_random=$opt_only_missing_tests=0;
|
|
$opt_cmp=$opt_user=$opt_password=$opt_connect_options="";
|
|
$opt_server="mysql"; $opt_dir="output";
|
|
$opt_host="localhost";$opt_database="test";
|
|
$opt_machine=""; $opt_suffix="";
|
|
$opt_create_options=undef;
|
|
$opt_optimization="None";
|
|
$opt_hw="";
|
|
$opt_threads=5;
|
|
|
|
if (!defined($opt_time_limit))
|
|
{
|
|
$opt_time_limit=10*60; # Don't wait more than 10 min for some tests
|
|
}
|
|
|
|
$log_prog_args=join(" ", skip_arguments(\@ARGV,"comments","cmp","server",
|
|
"user", "host", "database", "password",
|
|
"use-old-results","skip-test",
|
|
"optimization","hw",
|
|
"machine", "dir", "suffix", "log"));
|
|
GetOptions("skip-test=s","comments=s","cmp=s","server=s","user=s","host=s","database=s","password=s","loop-count=i","row-count=i","skip-create","skip-delete","verbose","fast-insert","lock-tables","debug","fast","force","field-count=i","regions=i","groups=i","time-limit=i","log","use-old-results","machine=s","dir=s","suffix=s","help","odbc","small-test","small-tables","small-key-tables","stage=i","threads=i","random","old-headers","die-on-errors","create-options=s","hires","tcpip","silent","optimization=s","hw=s","socket=s","connect-options=s","only-missing-tests") || usage();
|
|
|
|
usage() if ($opt_help);
|
|
$server=get_server($opt_server,$opt_host,$opt_database,$opt_odbc,
|
|
machine_part(), $opt_socket, $opt_connect_options);
|
|
$limits=merge_limits($server,$opt_cmp);
|
|
$date=date();
|
|
@estimated=(0.0,0.0,0.0); # For estimated time support
|
|
|
|
if ($opt_hires)
|
|
{
|
|
eval "use Time::HiRes;";
|
|
}
|
|
|
|
{
|
|
my $tmp= $opt_server;
|
|
$tmp =~ s/_odbc$//;
|
|
if (length($opt_cmp) && index($opt_cmp,$tmp) < 0)
|
|
{
|
|
$opt_cmp.=",$tmp";
|
|
}
|
|
}
|
|
$opt_cmp=lc(join(",",sort(split(',',$opt_cmp))));
|
|
|
|
#
|
|
# set opt_lock_tables if one uses --fast and drivers supports it
|
|
#
|
|
|
|
if (($opt_lock_tables || $opt_fast) && $server->{'limits'}->{'lock_tables'})
|
|
{
|
|
$opt_lock_tables=1;
|
|
}
|
|
else
|
|
{
|
|
$opt_lock_tables=0;
|
|
}
|
|
if ($opt_fast)
|
|
{
|
|
$opt_fast_insert=1;
|
|
$opt_suffix="_fast" if (!length($opt_suffix));
|
|
}
|
|
|
|
if ($opt_odbc)
|
|
{
|
|
$opt_suffix="_odbc" if (!length($opt_suffix));
|
|
}
|
|
|
|
if (!$opt_silent)
|
|
{
|
|
print "Testing server '" . $server->version() . "' at $date\n\n";
|
|
}
|
|
|
|
if ($opt_debug)
|
|
{
|
|
print "\nCurrent limits: \n";
|
|
foreach $key (sort keys %$limits)
|
|
{
|
|
print $key . " " x (30-length($key)) . $limits->{$key} . "\n";
|
|
}
|
|
print "\n";
|
|
}
|
|
|
|
#
|
|
# Some help functions
|
|
#
|
|
|
|
sub skip_arguments
|
|
{
|
|
my($argv,@skip_args)=@_;
|
|
my($skip,$arg,$name,@res);
|
|
|
|
foreach $arg (@$argv)
|
|
{
|
|
if ($arg =~ /^\-+([^=]*)/)
|
|
{
|
|
$name=$1;
|
|
foreach $skip (@skip_args)
|
|
{
|
|
if (index($skip,$name) == 0)
|
|
{
|
|
$name=""; # Don't use this parameters
|
|
last;
|
|
}
|
|
}
|
|
push (@res,$arg) if (length($name));
|
|
}
|
|
}
|
|
return @res;
|
|
}
|
|
|
|
|
|
sub merge_limits
|
|
{
|
|
my ($server,$cmp)= @_;
|
|
my ($name,$tmp_server,$limits,$res_limits,$limit,$tmp_limits);
|
|
|
|
$res_limits=$server->{'limits'};
|
|
if ($cmp)
|
|
{
|
|
foreach $name (split(",",$cmp))
|
|
{
|
|
$tmp_server= (get_server($name,$opt_host, $opt_database,
|
|
$opt_odbc,machine_part())
|
|
|| die "Unknown SQL server: $name\n");
|
|
$limits=$tmp_server->{'limits'};
|
|
%new_limits=();
|
|
foreach $limit (keys(%$limits))
|
|
{
|
|
if (defined($res_limits->{$limit}) && defined($limits->{$limit}))
|
|
{
|
|
$new_limits{$limit}=min($res_limits->{$limit},$limits->{$limit});
|
|
}
|
|
}
|
|
%tmp_limits=%new_limits;
|
|
$res_limits=\%tmp_limits;
|
|
}
|
|
}
|
|
return $res_limits;
|
|
}
|
|
|
|
sub date
|
|
{
|
|
my ($sec, $min, $hour, $mday, $mon, $year) = localtime(time());
|
|
sprintf("%04d-%02d-%02d %2d:%02d:%02d",
|
|
1900+$year,$mon+1,$mday,$hour,$min,$sec);
|
|
}
|
|
|
|
sub min
|
|
{
|
|
my($min)=$_[0];
|
|
my($i);
|
|
for ($i=1 ; $i <= $#_; $i++)
|
|
{
|
|
$min=$_[$i] if ($min > $_[$i]);
|
|
}
|
|
return $min;
|
|
}
|
|
|
|
sub max
|
|
{
|
|
my($max)=$_[0];
|
|
my($i);
|
|
for ($i=1 ; $i <= $#_; $i++)
|
|
{
|
|
$max=$_[$i] if ($max < $_[$i]);
|
|
}
|
|
return $max;
|
|
}
|
|
|
|
|
|
#
|
|
# Execute many statements in a row
|
|
#
|
|
|
|
sub do_many
|
|
{
|
|
my ($dbh,@statements)=@_;
|
|
my ($statement,$sth);
|
|
|
|
foreach $statement (@statements)
|
|
{
|
|
if (!($sth=$dbh->do($statement)))
|
|
{
|
|
die "Can't execute command '$statement'\nError: $DBI::errstr\n";
|
|
}
|
|
}
|
|
}
|
|
|
|
sub safe_do_many
|
|
{
|
|
my ($dbh,@statements)=@_;
|
|
my ($statement,$sth);
|
|
|
|
foreach $statement (@statements)
|
|
{
|
|
if (!($sth=$dbh->do($statement)))
|
|
{
|
|
print STDERR "Can't execute command '$statement'\nError: $DBI::errstr\n";
|
|
return 1;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
|
|
#
|
|
# Do a query and fetch all rows from a statement and return the number of rows
|
|
#
|
|
|
|
sub fetch_all_rows
|
|
{
|
|
my ($dbh,$query,$must_get_result)=@_;
|
|
my ($count,$sth);
|
|
$count=0;
|
|
|
|
print "$query: " if ($opt_debug);
|
|
if (!($sth= $dbh->prepare($query)))
|
|
{
|
|
print "\n" if ($opt_debug);
|
|
die "Error occured with prepare($query)\n -> $DBI::errstr\n";
|
|
return undef;
|
|
}
|
|
if (!$sth->execute)
|
|
{
|
|
print "\n" if ($opt_debug);
|
|
if (defined($server->{'error_on_execute_means_zero_rows'}) &&
|
|
!$server->abort_if_fatal_error())
|
|
{
|
|
if (defined($must_get_result) && $must_get_result)
|
|
{
|
|
die "Error: Query $query didn't return any rows\n";
|
|
}
|
|
$sth->finish;
|
|
print "0\n" if ($opt_debug);
|
|
return 0;
|
|
}
|
|
die "Error occured with execute($query)\n -> $DBI::errstr\n";
|
|
$sth->finish;
|
|
return undef;
|
|
}
|
|
while ($sth->fetchrow_arrayref)
|
|
{
|
|
$count++;
|
|
}
|
|
print "$count\n" if ($opt_debug);
|
|
if (defined($must_get_result) && $must_get_result && !$count)
|
|
{
|
|
die "Error: Query $query didn't return any rows\n";
|
|
}
|
|
$sth->finish;
|
|
undef($sth);
|
|
return $count;
|
|
}
|
|
|
|
sub do_query
|
|
{
|
|
my($dbh,$query)=@_;
|
|
print "$query\n" if ($opt_debug);
|
|
$dbh->do($query) or
|
|
die "\nError executing '$query':\n$DBI::errstr\n";
|
|
}
|
|
|
|
#
|
|
# Run a query X times
|
|
#
|
|
|
|
sub time_fetch_all_rows
|
|
{
|
|
my($test_text,$result_text,$query,$dbh,$test_count)=@_;
|
|
my($i,$loop_time,$end_time,$count,$rows,$estimated);
|
|
|
|
print $test_text . "\n" if (defined($test_text));
|
|
$count=$rows=0;
|
|
$loop_time=new Benchmark;
|
|
for ($i=1 ; $i <= $test_count ; $i++)
|
|
{
|
|
$count++;
|
|
$rows+=fetch_all_rows($dbh,$query) or die $DBI::errstr;
|
|
$end_time=new Benchmark;
|
|
last if ($estimated=predict_query_time($loop_time,$end_time,\$count,$i,
|
|
$test_count));
|
|
}
|
|
$end_time=new Benchmark;
|
|
if ($estimated)
|
|
{ print "Estimated time"; }
|
|
else
|
|
{ print "Time"; }
|
|
print " for $result_text ($count:$rows) " .
|
|
timestr(timediff($end_time, $loop_time),"all") . "\n\n";
|
|
}
|
|
|
|
|
|
#
|
|
# Handle estimated time of the server is too slow
|
|
# Returns 0 if one should continue as normal
|
|
#
|
|
|
|
sub predict_query_time
|
|
{
|
|
my ($loop_time,$end_time,$count_ref,$loop,$loop_count)= @_;
|
|
my ($k,$tmp);
|
|
|
|
if (($end_time->[0] - $loop_time->[0]) > $opt_time_limit)
|
|
{
|
|
# We can't wait until the SUN dies. Try to predict the end time
|
|
if ($loop != $loop_count)
|
|
{
|
|
$tmp=($end_time->[0] - $loop_time->[0]);
|
|
print "Note: Query took longer then time-limit: $opt_time_limit\nEstimating end time based on:\n";
|
|
print "$$count_ref queries in $loop loops of $loop_count loops took $tmp seconds\n";
|
|
for ($k=0; $k < 3; $k++)
|
|
{
|
|
$tmp=$loop_time->[$k]+($end_time->[$k]-$loop_time->[$k])/$loop*
|
|
$loop_count;
|
|
$estimated[$k]+=($tmp-$end_time->[$k]);
|
|
$end_time->[$k]=$tmp;
|
|
}
|
|
$$count_ref= int($$count_ref/$loop*$loop_count);
|
|
return 1;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
#
|
|
# standard end of benchmark
|
|
#
|
|
|
|
sub end_benchmark
|
|
{
|
|
my ($start_time)=@_;
|
|
|
|
$end_time=new Benchmark;
|
|
if ($estimated[0])
|
|
{
|
|
print "Estimated total time: ";
|
|
$end_time->[0]+=$estimated[0];
|
|
$end_time->[1]+=$estimated[1];
|
|
$end_time->[2]+=$estimated[2];
|
|
}
|
|
else
|
|
{
|
|
print "Total time: "
|
|
}
|
|
print timestr(timediff($end_time, $start_time),"all") . "\n";
|
|
exit 0;
|
|
}
|
|
|
|
sub print_time
|
|
{
|
|
my ($estimated)=@_;
|
|
if ($estimated)
|
|
{ print "Estimated time"; }
|
|
else
|
|
{ print "Time"; }
|
|
}
|
|
|
|
#
|
|
# Create a filename part for the machine that can be used for log file.
|
|
#
|
|
|
|
sub machine_part
|
|
{
|
|
my ($name,$orig);
|
|
return $opt_machine if (length($opt_machine)); # Specified by user
|
|
# Specified by user
|
|
$orig=$name=machine();
|
|
$name="win9$1" if ($orig =~ /win.*9(\d)/i);
|
|
$name="NT_$1" if ($orig =~ /Windows NT.*(\d+\.\d+)/i);
|
|
$name="win2k" if ($orig =~ /Windows 2000/i);
|
|
$name =~ s/\s+/_/g; # Make the filenames easier to parse
|
|
$name =~ s/-/_/g;
|
|
$name =~ s/\//_/g;
|
|
return $name;
|
|
}
|
|
|
|
sub machine
|
|
{
|
|
my @name = POSIX::uname();
|
|
my $name= $name[0] . " " . $name[2] . " " . $name[4];
|
|
return $name;
|
|
}
|
|
|
|
#
|
|
# Usage
|
|
#
|
|
|
|
sub usage
|
|
{
|
|
print <<EOF;
|
|
The MySQL benchmarks Ver $benchmark_version
|
|
|
|
All benchmarks takes the following options:
|
|
|
|
--comments
|
|
Add a comment to the benchmark output. Comments should contain
|
|
extra information that 'uname -a' doesn\'t give and if the database was
|
|
stared with some specific, non default, options.
|
|
|
|
--cmp=server[,server...]
|
|
Run the test with limits from the given servers. If you run all servers
|
|
with the same --cmp, you will get a test that is comparable between
|
|
the different sql servers.
|
|
|
|
--create-options=#
|
|
Extra argument to all create statements. If you for example want to
|
|
create all MySQL tables as InnoDB tables use:
|
|
--create-options=ENGINE=InnoDB
|
|
|
|
--database (Default $opt_database)
|
|
In which database the test tables are created.
|
|
|
|
--debug
|
|
This is a test specific option that is only used when debugging a test.
|
|
Print out debugging information.
|
|
|
|
--dir (Default $opt_dir)
|
|
Option to 'run-all-tests' to where the test results should be stored.
|
|
|
|
--fast
|
|
Allow the database to use non standard ANSI SQL commands to make the
|
|
test go faster.
|
|
|
|
--fast-insert
|
|
Use "insert into table_name values(...)" instead of
|
|
"insert into table_name (....) values(...)"
|
|
If the database supports it, some tests uses multiple value lists.
|
|
|
|
--field-count
|
|
This is a test specific option that is only used when debugging a test.
|
|
This usually means how many fields there should be in the test table.
|
|
|
|
--force
|
|
This is a test specific option that is only used when debugging a test.
|
|
Continue the test even if there is some error.
|
|
Delete tables before creating new ones.
|
|
|
|
--groups (Default $opt_groups)
|
|
This is a test specific option that is only used when debugging a test.
|
|
This usually means how many different groups there should be in the test.
|
|
|
|
--lock-tables
|
|
Allow the database to use table locking to get more speed.
|
|
|
|
--log
|
|
Option to 'run-all-tests' to save the result to the '--dir' directory.
|
|
|
|
--loop-count (Default $opt_loop_count)
|
|
This is a test specific option that is only used when debugging a test.
|
|
This usually means how many times times each test loop is executed.
|
|
|
|
--help
|
|
Shows this help
|
|
|
|
--host='host name' (Default $opt_host)
|
|
Host name where the database server is located.
|
|
|
|
--machine="machine or os_name"
|
|
The machine/os name that is added to the benchmark output filename.
|
|
The default is the OS name + version.
|
|
|
|
--odbc
|
|
Use the ODBC DBI driver to connect to the database.
|
|
|
|
--only-missing-tests
|
|
Only run test that don\'t have an old test result.
|
|
This is useful when you want to do a re-run of tests that failed in last run.
|
|
|
|
--optimization='some comments'
|
|
Add coments about optimization of DBMS, which was done before the test.
|
|
|
|
--password='password'
|
|
Password for the current user.
|
|
|
|
--socket='socket'
|
|
If the database supports connecting through a Unix socket,
|
|
then use this socket to connect
|
|
|
|
--regions
|
|
This is a test specific option that is only used when debugging a test.
|
|
This usually means how AND levels should be tested.
|
|
|
|
--old-headers
|
|
Get the old benchmark headers from the old RUN- file.
|
|
|
|
--server='server name' (Default $opt_server)
|
|
Run the test on the given SQL server.
|
|
Known servers names are: Access, Adabas, AdabasD, Empress, Oracle,
|
|
Informix, DB2, mSQL, MS-SQL, MySQL, Pg, Solid and Sybase
|
|
|
|
--silent
|
|
Don't print info about the server when starting test.
|
|
|
|
--skip-delete
|
|
This is a test specific option that is only used when debugging a test.
|
|
This will keep the test tables after the test is run.
|
|
|
|
--skip-test=test1[,test2,...]
|
|
For run-all-programs; Don\'t execute the named tests.
|
|
|
|
--small-test
|
|
This runs some tests with smaller limits to get a faster test.
|
|
Can be used if you just want to verify that the database works, but
|
|
don't have time to run a full test.
|
|
|
|
--small-tables
|
|
This runs some tests that generate big tables with fewer rows.
|
|
This can be used with databases that can\'t handle that many rows
|
|
because of pre-sized partitions.
|
|
|
|
--suffix (Default $opt_suffix)
|
|
The suffix that is added to the database name in the benchmark output
|
|
filename. This can be used to run the benchmark multiple times with
|
|
different server options without overwritten old files.
|
|
When using --fast the suffix is automaticly set to '_fast'.
|
|
|
|
--random
|
|
Inform test suite that we are generate random inital values for sequence of
|
|
test executions. It should be used for imitation of real conditions.
|
|
|
|
--threads=# (Default 5)
|
|
Number of threads for multi-user benchmarks.
|
|
|
|
--tcpip
|
|
Inform test suite that we are using TCP/IP to connect to the server. In
|
|
this case we can\t do many new connections in a row as we in this case may
|
|
fill the TCP/IP stack
|
|
|
|
--time-limit (Default $opt_time_limit)
|
|
How long a test loop is allowed to take, in seconds, before the end result
|
|
is 'estimated'.
|
|
|
|
--use-old-results
|
|
Option to 'run-all-tests' to use the old results from the '--dir' directory
|
|
instead of running the tests.
|
|
|
|
--user='user_name'
|
|
User name to log into the SQL server.
|
|
|
|
--verbose
|
|
This is a test specific option that is only used when debugging a test.
|
|
Print more information about what is going on.
|
|
|
|
--hw='some comments'
|
|
Add coments about hardware used for this test.
|
|
|
|
--connect-options='some connect options'
|
|
Add options, which uses at DBI connect.
|
|
For example --connect-options=mysql_read_default_file=/etc/my.cnf.
|
|
|
|
EOF
|
|
exit(0);
|
|
}
|
|
|
|
|
|
|
|
####
|
|
#### The end of the base file ...
|
|
####
|
|
1;
|