mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 14:54:20 +01:00
ee1c5226b9
Fixed memory leak in _db_set() (Bug#24497 Valgrind warning: get_one_option) Don't call net_clear() on COM_QUIT. This avoids a warning from net_clear() after shutdown: "skipped ## bytes from file" BUG#21428: skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown" sql-bench/test-wisconsin.sh: Rename: BitKeeper/deleted/.del-test-wisconsin.sh~c0b86821b5f95f26 -> sql-bench/test-wisconsin.sh sql-bench/test-transactions.sh: Rename: BitKeeper/deleted/.del-test-transactions.sh~c1c892f10c40caf -> sql-bench/test-transactions.sh sql-bench/test-insert.sh: Rename: BitKeeper/deleted/.del-test-insert.sh~893bfac9dedb79a7 -> sql-bench/test-insert.sh sql-bench/test-select.sh: Rename: BitKeeper/deleted/.del-test-select.sh~6d5cc770acf11be6 -> sql-bench/test-select.sh sql-bench/test-create.sh: Rename: BitKeeper/deleted/.del-test-create.sh~f9a1ea38c191b17a -> sql-bench/test-create.sh sql-bench/test-big-tables.sh: Rename: BitKeeper/deleted/.del-test-big-tables.sh~5b1b0c5fb623565a -> sql-bench/test-big-tables.sh sql-bench/test-connect.sh: Rename: BitKeeper/deleted/.del-test-connect.sh~382a728c949ee075 -> sql-bench/test-connect.sh sql-bench/test-ATIS.sh: Rename: BitKeeper/deleted/.del-test-ATIS.sh~e8ebff7086c95773 -> sql-bench/test-ATIS.sh sql-bench/test-alter-table.sh: Rename: BitKeeper/deleted/.del-test-alter-table.sh~eba6cfa9972fcced -> sql-bench/test-alter-table.sh sql-bench/innotest2b.sh: Rename: BitKeeper/deleted/.del-innotest2b.sh~7b99ece835e8dff3 -> sql-bench/innotest2b.sh sql-bench/run-all-tests.sh: Rename: BitKeeper/deleted/.del-run-all-tests.sh~41d6da1cf211ee95 -> sql-bench/run-all-tests.sh sql-bench/innotest2.sh: Rename: BitKeeper/deleted/.del-innotest2.sh~9c14df528285603 -> sql-bench/innotest2.sh sql-bench/innotest2a.sh: Rename: BitKeeper/deleted/.del-innotest2a.sh~e01d016a7cafdc0b -> sql-bench/innotest2a.sh sql-bench/innotest1a.sh: Rename: BitKeeper/deleted/.del-innotest1a.sh~c64f4610ae1e26fe -> sql-bench/innotest1a.sh sql-bench/innotest1b.sh: Rename: BitKeeper/deleted/.del-innotest1b.sh~aafd0819ae84da7b -> sql-bench/innotest1b.sh sql-bench/innotest1.sh: Rename: BitKeeper/deleted/.del-innotest1.sh~aa36bce09ca783c7 -> sql-bench/innotest1.sh sql-bench/crash-me.sh: Rename: BitKeeper/deleted/.del-crash-me.sh~2fa881d0b40339c8 -> sql-bench/crash-me.sh sql-bench/graph-compare-results.sh: Rename: BitKeeper/deleted/.del-graph-compare-results.sh~7e4e28b3591b4542 -> sql-bench/graph-compare-results.sh sql-bench/copy-db.sh: Rename: BitKeeper/deleted/.del-copy-db.sh~e8116afb93144ccd -> sql-bench/copy-db.sh sql-bench/compare-results.sh: Rename: BitKeeper/deleted/.del-compare-results.sh~a9e26e2644c694b3 -> sql-bench/compare-results.sh sql-bench/bench-count-distinct.sh: Rename: BitKeeper/deleted/.del-bench-count-distinct.sh~a92f174271a831d7 -> sql-bench/bench-count-distinct.sh sql-bench/as3ap.sh: Rename: BitKeeper/deleted/.del-as3ap.sh~f54eebbd8d34c9b6 -> sql-bench/as3ap.sh sql-bench/Comments/Informix.crash-me: Rename: BitKeeper/deleted/.del-Informix.crash-me~51ab5b717cefe74 -> sql-bench/Comments/Informix.crash-me sql-bench/Comments/postgres.crash-me: Rename: BitKeeper/deleted/.del-postgres.crash-me~eacac145c3e30f17 -> sql-bench/Comments/postgres.crash-me sql-bench/Comments/Empress.crash-me: Rename: BitKeeper/deleted/.del-Empress.crash-me~bdaff0c68ce10f02 -> sql-bench/Comments/Empress.crash-me sql-bench/Comments/Adabas.crash-me: Rename: BitKeeper/deleted/.del-Adabas.crash-me~ce88ba1a540971ac -> sql-bench/Comments/Adabas.crash-me sql-bench/Comments/Access.crash-me: Rename: BitKeeper/deleted/.del-Access.crash-me~bb457ec282d939b6 -> sql-bench/Comments/Access.crash-me sql-bench/Comments/postgres.benchmark: Rename: BitKeeper/deleted/.del-postgres.benchmark~4d30890732b784a -> sql-bench/Comments/postgres.benchmark sql-bench/Comments/mysql.benchmark: Rename: BitKeeper/deleted/.del-mysql.benchmark~4d8729c0937456fc -> sql-bench/Comments/mysql.benchmark sql-bench/Comments/FrontBase.benchmark: Rename: BitKeeper/deleted/.del-FrontBase.benchmark~217041ef18274c2e -> sql-bench/Comments/FrontBase.benchmark sql-bench/Comments/interbase: Rename: BitKeeper/deleted/.del-interbase~cdad59622b4d6f3 -> sql-bench/Comments/interbase sql-bench/uname.bat: Rename: BitKeeper/deleted/.del-uname.bat~a6d933d2ee9314c -> sql-bench/uname.bat sql-bench/pwd.bat: Rename: BitKeeper/deleted/.del-pwd.bat~9b64050849abf51 -> sql-bench/pwd.bat sql-bench/example.bat: Rename: BitKeeper/deleted/.del-example.bat~22d0170bccf0f030 -> sql-bench/example.bat sql-bench/Makefile.am: Rename: BitKeeper/deleted/.del-Makefile.am~7b07da85b2e9375 -> sql-bench/Makefile.am sql-bench/Data/ATIS/transport.txt: Rename: BitKeeper/deleted/.del-transport.txt~fa4ca40735f8354c -> sql-bench/Data/ATIS/transport.txt sql-bench/Data/ATIS/time_zone.txt: Rename: BitKeeper/deleted/.del-time_zone.txt~4171f9ca732f65c0 -> sql-bench/Data/ATIS/time_zone.txt sql-bench/Data/Wisconsin/tenk.data: Rename: BitKeeper/deleted/.del-tenk.data~6aeaebdd534e458e -> sql-bench/Data/Wisconsin/tenk.data sql-bench/Data/Wisconsin/onek.data: Rename: BitKeeper/deleted/.del-onek.data~6cd1edaf596a7f7 -> sql-bench/Data/Wisconsin/onek.data sql-bench/Data/ATIS/stop1.txt: Rename: BitKeeper/deleted/.del-stop1.txt~f09ba164ad44a288 -> sql-bench/Data/ATIS/stop1.txt sql-bench/Data/ATIS/time_interval.txt: Rename: BitKeeper/deleted/.del-time_interval.txt~a1def62e267a59b2 -> sql-bench/Data/ATIS/time_interval.txt sql-bench/Data/ATIS/stop.txt: Rename: BitKeeper/deleted/.del-stop.txt~31fb564e1f415e34 -> sql-bench/Data/ATIS/stop.txt sql-bench/Data/ATIS/restriction.txt: Rename: BitKeeper/deleted/.del-restriction.txt~6ae208924617784a -> sql-bench/Data/ATIS/restriction.txt sql-bench/Data/ATIS/state.txt: Rename: BitKeeper/deleted/.del-state.txt~9dd470ce14075b90 -> sql-bench/Data/ATIS/state.txt sql-bench/Data/ATIS/restrict_class.txt: Rename: BitKeeper/deleted/.del-restrict_class.txt~2f741bf0ea498f84 -> sql-bench/Data/ATIS/restrict_class.txt sql-bench/Data/ATIS/month_name.txt: Rename: BitKeeper/deleted/.del-month_name.txt~4c44f7a323d57d92 -> sql-bench/Data/ATIS/month_name.txt sql-bench/Data/ATIS/restrict_carrier.txt: Rename: BitKeeper/deleted/.del-restrict_carrier.txt~925b5492f3f9cba3 -> sql-bench/Data/ATIS/restrict_carrier.txt sql-bench/Data/ATIS/ground_service.txt: Rename: BitKeeper/deleted/.del-ground_service.txt~1087e477e86e84c -> sql-bench/Data/ATIS/ground_service.txt sql-bench/Data/ATIS/food_service.txt: Rename: BitKeeper/deleted/.del-food_service.txt~66d95a150c28458 -> sql-bench/Data/ATIS/food_service.txt sql-bench/Data/ATIS/flight_day.txt: Rename: BitKeeper/deleted/.del-flight_day.txt~76868d6d265d441e -> sql-bench/Data/ATIS/flight_day.txt sql-bench/Data/ATIS/flight_fare.txt: Rename: BitKeeper/deleted/.del-flight_fare.txt~d7322593c8530487 -> sql-bench/Data/ATIS/flight_fare.txt sql-bench/Data/ATIS/flight_class.txt: Rename: BitKeeper/deleted/.del-flight_class.txt~1801101474c29098 -> sql-bench/Data/ATIS/flight_class.txt sql-bench/Data/ATIS/fconnection.txt: Rename: BitKeeper/deleted/.del-fconnection.txt~e0ef6a8b5560a713 -> sql-bench/Data/ATIS/fconnection.txt sql-bench/Data/ATIS/flight.txt: Rename: BitKeeper/deleted/.del-flight.txt~e5065423760e99eb -> sql-bench/Data/ATIS/flight.txt sql-bench/Data/ATIS/fare.txt: Rename: BitKeeper/deleted/.del-fare.txt~ea0652f490bc24a6 -> sql-bench/Data/ATIS/fare.txt sql-bench/Data/ATIS/day_name.txt: Rename: BitKeeper/deleted/.del-day_name.txt~f813b215955d894c -> sql-bench/Data/ATIS/day_name.txt sql-bench/Data/ATIS/dual_carrier.txt: Rename: BitKeeper/deleted/.del-dual_carrier.txt~a7dd776224fbd92b -> sql-bench/Data/ATIS/dual_carrier.txt sql-bench/Data/ATIS/date_day.txt: Rename: BitKeeper/deleted/.del-date_day.txt~4e9a282fcf54cfd8 -> sql-bench/Data/ATIS/date_day.txt sql-bench/Data/ATIS/compound_class.txt: Rename: BitKeeper/deleted/.del-compound_class.txt~d4a2f1b7f96340b9 -> sql-bench/Data/ATIS/compound_class.txt sql-bench/Data/ATIS/connect_leg.txt: Rename: BitKeeper/deleted/.del-connect_leg.txt~f97b6e94e108bb36 -> sql-bench/Data/ATIS/connect_leg.txt sql-bench/Data/ATIS/code_description.txt: Rename: BitKeeper/deleted/.del-code_description.txt~f9117373e438b0e2 -> sql-bench/Data/ATIS/code_description.txt sql-bench/Data/ATIS/city.txt: Rename: BitKeeper/deleted/.del-city.txt~d96dd6d073344d2e -> sql-bench/Data/ATIS/city.txt sql-bench/Data/ATIS/class_of_service.txt: Rename: BitKeeper/deleted/.del-class_of_service.txt~21f6b9848b8c76d -> sql-bench/Data/ATIS/class_of_service.txt sql-bench/Data/ATIS/airport_service.txt: Rename: BitKeeper/deleted/.del-airport_service.txt~6ee6d5b852b3e38 -> sql-bench/Data/ATIS/airport_service.txt sql-bench/Data/ATIS/airline.txt: Rename: BitKeeper/deleted/.del-airline.txt~a79f8eadf853f2c8 -> sql-bench/Data/ATIS/airline.txt sql-bench/Data/ATIS/airport.txt: Rename: BitKeeper/deleted/.del-airport.txt~59c78514130e1f45 -> sql-bench/Data/ATIS/airport.txt sql-bench/Data/ATIS/aircraft.txt: Rename: BitKeeper/deleted/.del-aircraft.txt~15e4de7ab37c92d3 -> sql-bench/Data/ATIS/aircraft.txt sql-bench/TODO: Rename: BitKeeper/deleted/.del-TODO~cac6d7a63c426ae5 -> sql-bench/TODO sql-bench/limits/sybase.cfg: Rename: BitKeeper/deleted/.del-sybase.cfg~c4636b12767b3f14 -> sql-bench/limits/sybase.cfg sql-bench/limits/solid-nt4.cfg: Rename: BitKeeper/deleted/.del-solid-nt4.cfg~cca779f0c9e29d31 -> sql-bench/limits/solid-nt4.cfg sql-bench/limits/solid.cfg: Rename: BitKeeper/deleted/.del-solid.cfg~5ae0e4342eadb0fb -> sql-bench/limits/solid.cfg sql-bench/limits/pg.cfg: Rename: BitKeeper/deleted/.del-pg.cfg~db59cf39a5d417be -> sql-bench/limits/pg.cfg sql-bench/limits/mysql.cfg: Rename: BitKeeper/deleted/.del-mysql.cfg~9cab20a8771b93cf -> sql-bench/limits/mysql.cfg sql-bench/limits/oracle.cfg: Rename: BitKeeper/deleted/.del-oracle.cfg~affab21af8f438fd -> sql-bench/limits/oracle.cfg sql-bench/limits/mysql-4.1.cfg: Rename: BitKeeper/deleted/.del-mysql-4.1.cfg~b6c5e74aefc99e3c -> sql-bench/limits/mysql-4.1.cfg sql-bench/limits/mysql-3.23.cfg: Rename: BitKeeper/deleted/.del-mysql-3.23.cfg~3cf9d6be54b77a3c -> sql-bench/limits/mysql-3.23.cfg sql-bench/limits/mysql-4.0.cfg: Rename: BitKeeper/deleted/.del-mysql-4.0.cfg~6c9d63c85b5ef574 -> sql-bench/limits/mysql-4.0.cfg sql-bench/limits/mysql-3.22.cfg: Rename: BitKeeper/deleted/.del-mysql-3.22.cfg~e706f26a161175cd -> sql-bench/limits/mysql-3.22.cfg sql-bench/limits/msql.cfg: Rename: BitKeeper/deleted/.del-msql.cfg~52710b12932cceb9 -> sql-bench/limits/msql.cfg sql-bench/limits/ms-sql65.cfg: Rename: BitKeeper/deleted/.del-ms-sql65.cfg~6b9bc3c460dbee05 -> sql-bench/limits/ms-sql65.cfg sql-bench/limits/mimer.cfg: Rename: BitKeeper/deleted/.del-mimer.cfg~234e6c1c3c47b612 -> sql-bench/limits/mimer.cfg sql-bench/limits/ms-sql.cfg: Rename: BitKeeper/deleted/.del-ms-sql.cfg~1907964264d2786a -> sql-bench/limits/ms-sql.cfg sql-bench/limits/interbase.cfg: Rename: BitKeeper/deleted/.del-interbase.cfg~c6951a0376cc6ff3 -> sql-bench/limits/interbase.cfg sql-bench/limits/interbase-dialect3.cfg: Rename: BitKeeper/deleted/.del-interbase-dialect3.cfg~46277bdfc74c667a -> sql-bench/limits/interbase-dialect3.cfg sql-bench/limits/interbase-superserver.cfg: Rename: BitKeeper/deleted/.del-interbase-superserver.cfg~22501198689243b0 -> sql-bench/limits/interbase-superserver.cfg sql-bench/limits/interbase-dialect1.cfg: Rename: BitKeeper/deleted/.del-interbase-dialect1.cfg~659206b5b9a11036 -> sql-bench/limits/interbase-dialect1.cfg sql-bench/limits/empress.cfg: Rename: BitKeeper/deleted/.del-empress.cfg~1f97f34d6560a499 -> sql-bench/limits/empress.cfg sql-bench/limits/frontbase.cfg: Rename: BitKeeper/deleted/.del-frontbase.cfg~71369e9c002696e -> sql-bench/limits/frontbase.cfg sql-bench/limits/db2.cfg: Rename: BitKeeper/deleted/.del-db2.cfg~711099b4d7906959 -> sql-bench/limits/db2.cfg sql-bench/limits/access.cfg: Rename: BitKeeper/deleted/.del-access.cfg~5239ea3655b7bba0 -> sql-bench/limits/access.cfg sql-bench/limits/access_odbc.cfg: Rename: BitKeeper/deleted/.del-access_odbc.cfg~34b4cf0eda56c4b1 -> sql-bench/limits/access_odbc.cfg sql-bench/limits/Informix.cfg: Rename: BitKeeper/deleted/.del-Informix.cfg~b94188e1ececb51b -> sql-bench/limits/Informix.cfg sql-bench/limits/Adabas.cfg: Rename: BitKeeper/deleted/.del-Adabas.cfg~343ed4e7f8b02111 -> sql-bench/limits/Adabas.cfg sql-bench/README: Rename: BitKeeper/deleted/.del-README~b1aa0c1bf9f5eb5e -> sql-bench/README BitKeeper/deleted/.del-create-pg_fast-Linux_2.2.14_my_SMP_i686-crashed: Delete: sql-bench/Results/create-pg_fast-Linux_2.2.14_my_SMP_i686-crashed Makefile.am: Added back sql-bench configure.in: Added back sql-bench dbug/dbug.c: Fixed memory leak in _db_set() This is not a complete fix as we can still get memory leaks if we do any of the following: mysqld --debug --debug CAll DBUG_SET or DBUG_SET_INITIAL more than once in a program Use SET @@global.debug=xxxx At some point we should fix the above, but this is not critical for normal operation (only for debugging) Bug #24497 Valgrind warning: get_one_option Note that all changes to _db_set_ is only a variable access change, and can be ignored while reviewing the bug fix. mysql-test/t/flush_read_lock_kill-master.opt: Added '+' to option, to be able to use this together with --debug mysql-test/valgrind.supp: Removed warning that is now fixed mysys/ptr_cmp.c: Fixed wrong pointer read (probably never used) scripts/make_binary_distribution.sh: Added back sql_bench sql/field.h: Removed class function that was identical in parent class sql/mysqld.cc: Removed some calls to my_thread_init() / my_thread_end() that was not needed. Only call DBUG_SET_INITAL, not DBUG_SET (Fixes memory leak in dbug) Mark some code as deadcode sql/net_serv.cc: Add information about from where error comes sql-bench/bench-init.pl.sh: Cleaned up help text sql-bench/server-cfg.sh: Don't write '/' after server name of no ssl version sql-common/client.c: Don't call net_clear() on COM_QUIT. This avoids a warning from net_clear() after shutdown: "skipped ## bytes from file" BUG#21428: skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown" sql/sql_parse.cc: Added comment sql/table.h: Removed compiler warning
619 lines
16 KiB
Bash
619 lines
16 KiB
Bash
#!@PERL@
|
|
# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult 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; either
|
|
# version 2 of the License, or (at your option) any later version.
|
|
#
|
|
# 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
|
|
#
|
|
# a little program to generate a table of results
|
|
# just read all the RUN-*.log files and format them nicely
|
|
# Made by Luuk de Boer
|
|
# Patched by Monty
|
|
|
|
use Getopt::Long;
|
|
|
|
$opt_server="mysql";
|
|
$opt_dir="output";
|
|
$opt_machine=$opt_cmp="";
|
|
$opt_relative=$opt_same_server=$opt_help=$opt_Information=$opt_skip_count=$opt_no_bars=$opt_verbose=0;
|
|
|
|
GetOptions("Information","help","server=s","cmp=s","machine=s","relative","same-server","dir=s","skip-count","no-bars","html","verbose") || usage();
|
|
|
|
usage() if ($opt_help || $opt_Information);
|
|
|
|
$opt_cmp=lc(join(",",sort(split(',',$opt_cmp))));
|
|
|
|
if ($opt_same_server)
|
|
{
|
|
$files="$opt_dir/RUN-$opt_server*$opt_machine";
|
|
}
|
|
else
|
|
{
|
|
$files="$opt_dir/RUN-*$opt_machine";
|
|
}
|
|
$files.= "-cmp-$opt_cmp" if (length($opt_cmp));
|
|
|
|
#
|
|
# Go trough all RUN files and gather statistics.
|
|
#
|
|
|
|
if ($#ARGV == -1)
|
|
{
|
|
@ARGV=glob($files);
|
|
$automatic_files=1;
|
|
}
|
|
|
|
foreach (@ARGV)
|
|
{
|
|
next if (!$opt_cmp && /-cmp-/ && $automatic_files || defined($found{$_}));
|
|
$prog=$filename = $_;
|
|
$found{$_}=1; # Remove dupplicates
|
|
/RUN-(.*)$/;
|
|
$tot{$prog}{'version'}=$1;
|
|
push(@key_order,$prog);
|
|
$next = 0;
|
|
open(TMP, "<$filename") || die "Can't open $filename: $!\n";
|
|
while (<TMP>)
|
|
{
|
|
chomp;
|
|
if ($next == 0) {
|
|
if (/Server version:\s+(\S+.*)/i)
|
|
{
|
|
$tot{$prog}{'server'} = $1;
|
|
}
|
|
elsif (/Arguments:\s+(.+)/i)
|
|
{
|
|
$arguments= $1;
|
|
# Remove some standard, not informative arguments
|
|
$arguments =~ s/--force|--log|--use-old\S*|--server=\S+|--cmp=\S+|--user=\S+|--pass=\S+|--machine=\S+|--dir=\S+//g;
|
|
if (($tmp=index($arguments,"--comment")) >= 0)
|
|
{
|
|
if (($end=index($arguments,$tmp+2,"--")) >= 0)
|
|
{
|
|
substr($arguments,$tmp,($end-$tmp))="";
|
|
}
|
|
else
|
|
{
|
|
$arguments=substr($arguments,0,$tmp);
|
|
}
|
|
}
|
|
$arguments =~ s/\s+/ /g;
|
|
$tot{$prog}{'arguments'}=$arguments;
|
|
}
|
|
elsif (/Comments:\s+(.+)/i) {
|
|
$tot{$prog}{'comments'} = $1;
|
|
} elsif (/^(\S+):.*(estimated\s|)total\stime:\s+([\d.]+)\s+(wallclock\s|)secs/i)
|
|
{
|
|
$tmp = $1; $tmp =~ s/://;
|
|
$tot{$prog}{$tmp} = [ $3, (length($2) ? "+" : "")];
|
|
$op1{$tmp} = $tmp;
|
|
} elsif (/Totals per operation:/i) {
|
|
$next = 1;
|
|
next;
|
|
}
|
|
}
|
|
elsif ($next == 1)
|
|
{
|
|
if (/^(\S+)\s+([\d.]+)\s+([\d.]+)\s+([\d.]+)\s+([\d.]+)\s+([\d.]+)\s*([+|?])*/)
|
|
{
|
|
$tot1{$prog}{$1} = [$2,$6,$7];
|
|
$op{$1} = $1;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if (!%op)
|
|
{
|
|
print "Didn't find any files matching: '$files'\n";
|
|
print "Use the --cmp=server,server option to compare benchmarks\n";
|
|
exit 1;
|
|
}
|
|
|
|
|
|
# everything is loaded ...
|
|
# now we have to create a fancy output :-)
|
|
|
|
# I prefer to redirect scripts instead to force it to file ; Monty
|
|
#
|
|
# open(RES, ">$resultfile") || die "Can't write to $resultfile: $!\n";
|
|
# select(RES)
|
|
#
|
|
|
|
if ($opt_html) {
|
|
html_output();
|
|
} else {
|
|
ascii_output();
|
|
}
|
|
exit 0;
|
|
|
|
#
|
|
# some output + format functions;
|
|
#
|
|
|
|
sub ascii_output {
|
|
print <<EOF;
|
|
This is the result file of the different benchmark tests.
|
|
|
|
The number in () after each tests shows how many SQL commands the particular
|
|
test did. As one test may have many different parameters this gives only
|
|
a rough picture of what was done. Check the source for more information :)
|
|
|
|
Keep in mind that one can\'t compare benchmarks run with different --cmp
|
|
options. The --cmp options sets the all limits according to the worst
|
|
limit for all server in the benchmark.
|
|
|
|
Numbers marked with '+' are estimated according to previous runs because
|
|
the query took longer than a given time-limit to finish. The estimation
|
|
shouldn\'t be far from the real result thought.
|
|
|
|
Numbers marked with '?' contains results that gave wrong result. This can only
|
|
be used as an indication of how long it took for the server to produce a wrong
|
|
result :)
|
|
|
|
Numbers marked with '*' are tests that was run a different number times
|
|
than the test in the first column. The reason for this is normally that the
|
|
marked test was run with different options that affects the number of tests
|
|
or that the test was from another version of the MySQL benchmarks.
|
|
|
|
Hope this will give you some idea how each db is performing at what thing ....
|
|
Hope you like it .... Luuk & Monty (1997)
|
|
|
|
EOF
|
|
|
|
if ($opt_relative)
|
|
{
|
|
print "Column 1 is in seconds. All other columns are presented relative\n";
|
|
print "to this. 1.00 is the same, bigger numbers indicates slower\n\n";
|
|
}
|
|
|
|
if ($opt_verbose)
|
|
{
|
|
print "The test values is printed in the format 'time:number of tests'\n";
|
|
}
|
|
|
|
if (length($opt_cmp))
|
|
{
|
|
print "The test was run with limits from: $opt_cmp\n\n";
|
|
}
|
|
print "The result logs which where found and the options:\n";
|
|
$bar= $opt_no_bars ? " " : "|";
|
|
|
|
# Move $opt_server first in array if not filename on command line
|
|
if ($automatic_files)
|
|
{
|
|
@key_order=sort {$a cmp $b} keys %tot;
|
|
for ($i=0; $i <= $#key_order; $i++)
|
|
{
|
|
if ($tot{$key_order[$i]}{'version'} =~ /^$opt_server-/)
|
|
{
|
|
unshift(@key_order,$key_order[$i]);
|
|
splice(@key_order,$i+1,1);
|
|
last;
|
|
}
|
|
}
|
|
}
|
|
# Print header
|
|
|
|
$column_count=0;
|
|
foreach $key (@key_order)
|
|
{
|
|
$tmp=$tmp=$tot{$key}{'version'};
|
|
$tmp =~ s/-cmp-$opt_cmp// if (length($opt_cmp));
|
|
$column_count++;
|
|
printf "%2d %-40.40s: %s %s\n", $column_count, $tmp,
|
|
$tot{$key}{'server'}, $tot{$key}{'arguments'};
|
|
print " $tot{$key}{'comments'}\n"
|
|
if ($tot{$key}{'comments'} =~ /\w+/);
|
|
}
|
|
|
|
print "\n";
|
|
|
|
$namewidth=($opt_skip_count && !$opt_verbose) ? 29 : 36;
|
|
$colwidth= $opt_relative ? 10 : 7;
|
|
$count_width=7;
|
|
$colwidth+=$count_width if ($opt_verbose);
|
|
|
|
print_sep("=");
|
|
printf "%-$namewidth.${namewidth}s${bar}", "Operation";
|
|
$count = 1;
|
|
foreach $key (@key_order)
|
|
{
|
|
printf "%${colwidth}d${bar}", $count;
|
|
$count++;
|
|
}
|
|
printf "\n%-$namewidth.${namewidth}s${bar}", "";
|
|
foreach $key (@key_order)
|
|
{
|
|
$ver=$tot{$key}{'version'};
|
|
$ver =~ s/-[a-zA-Z0-9_\.]+-cmp-$opt-cmp$//;
|
|
printf "%${colwidth}.${colwidth}s${bar}", $ver;
|
|
}
|
|
print "\n";
|
|
print_sep("-");
|
|
print_string($opt_relative ? "Relative results per test (First column is in seconds):" : "Results per test in seconds:");
|
|
print_sep("-");
|
|
|
|
foreach $key (sort {$a cmp $b} keys %op1)
|
|
{
|
|
printf "%-$namewidth.${namewidth}s${bar}", $key;
|
|
$first=undef();
|
|
foreach $server (@key_order)
|
|
{
|
|
print_value($first,$tot{$server}{$key}->[0],undef(),$tot{$server}{$key}->[1]);
|
|
$first=$tot{$server}{$key}->[0] if (!defined($first));
|
|
}
|
|
print "\n";
|
|
}
|
|
|
|
print_sep("-");
|
|
print_string("The results per operation:");
|
|
print_sep("-");
|
|
|
|
foreach $key (sort {$a cmp $b} keys %op)
|
|
{
|
|
next if ($key =~ /TOTALS/i);
|
|
$tmp=$key;
|
|
$count=$tot1{$key_order[0]}{$key}->[1];
|
|
$tmp.= " (" . $count . ")" if (!$skip_count);
|
|
printf "%-$namewidth.${namewidth}s${bar}", $tmp;
|
|
$first=undef();
|
|
foreach $server (@key_order)
|
|
{
|
|
$tmp= $count != $tot1{$server}{$key}->[1] ? "*" : "";
|
|
print_value($first,$tot1{$server}{$key}->[0],$tot1{$server}{$key}->[1],
|
|
$tot1{$server}{$key}->[2] . $tmp);
|
|
$first=$tot1{$server}{$key}->[0] if (!defined($first));
|
|
}
|
|
print "\n";
|
|
}
|
|
|
|
print_sep("-");
|
|
$key="TOTALS";
|
|
printf "%-$namewidth.${namewidth}s${bar}", $key;
|
|
$first=undef();
|
|
foreach $server (@key_order)
|
|
{
|
|
print_value($first,$tot1{$server}{$key}->[0],undef(),
|
|
$tot1{$server}{$key}->[2]);
|
|
$first=$tot1{$server}{$key}->[0] if (!defined($first));
|
|
}
|
|
print "\n";
|
|
print_sep("=");
|
|
}
|
|
|
|
|
|
sub html_output
|
|
{
|
|
my $template="template.html";
|
|
my $title="MySQL | | Information | Benchmarks | Compare with $opt_cmp";
|
|
my $image="info.gif";
|
|
$bar="";
|
|
|
|
open(TEMPLATE, $template) || die;
|
|
while (<TEMPLATE>)
|
|
{
|
|
if (/<center>/)
|
|
{
|
|
print $_;
|
|
print "<!---- This is AUTOMATICALLY Generated. Do not edit here! ---->\n";
|
|
}
|
|
elsif (/TITLE:SUBTITLE/)
|
|
{
|
|
s|TITLE:SUBTITLE|$title|;
|
|
print $_;
|
|
}
|
|
elsif (/TITLE:COMPARE/)
|
|
{
|
|
s|TITLE:COMPARE|$opt_cmp|;
|
|
print $_;
|
|
}
|
|
elsif (/ subchapter name /)
|
|
{
|
|
# Nothing here for now
|
|
print $_;
|
|
}
|
|
elsif (/ text of chapter /)
|
|
{
|
|
print $_;
|
|
print_html_body();
|
|
}
|
|
else
|
|
{
|
|
print $_;
|
|
}
|
|
}
|
|
close(TEMPLATE);
|
|
}
|
|
|
|
|
|
sub print_html_body
|
|
{
|
|
my ($title,$count,$key);
|
|
print <<EOF;
|
|
<center>
|
|
<font size=+4><b>MySQL Benchmark Results</b></font><br>
|
|
<font size=+1><b>Compare with $opt_cmp</b></font><p><p>
|
|
</center>
|
|
This is the result file of the different benchmark tests.
|
|
<p>
|
|
|
|
The number in () after each tests shows how many SQL commands the particular
|
|
test did. As one test may have many different parameters this gives only
|
|
a rough picture of what was done. Check the source for more information.
|
|
<p>
|
|
Keep in mind that one can\'t compare benchmarks run with different --cmp
|
|
options. The --cmp options sets the all limits according to the worst
|
|
limit for all server in the benchmark.
|
|
<p>
|
|
Numbers marked with '+' are estimated according to previous runs because
|
|
the query took longer than a given time-limit to finish. The estimation
|
|
shouldn\'t be far from the real result thought.
|
|
<p>
|
|
Numbers marked with '?' contains results that gave wrong result. This can only
|
|
be used as an indication of how long it took for the server to produce a wrong
|
|
result :)
|
|
<p>
|
|
Hope this will give you some idea how each db is performing at what thing ....
|
|
<br>
|
|
Hope you like it .... Luuk & Monty (1997)
|
|
<p><p>
|
|
EOF
|
|
|
|
if ($opt_relative)
|
|
{
|
|
print "Column 1 is in seconds. All other columns are presented relative<br>\n";
|
|
print "to this. 1.00 is the same, bigger numbers indicates slower<p>\n\n";
|
|
}
|
|
|
|
if (length($opt_cmp))
|
|
{
|
|
print "The test was run with limits from: $opt_cmp\n\n";
|
|
}
|
|
print "The result logs which where found and the options:<br>\n";
|
|
|
|
# Move $opt_server first in array
|
|
if ($automatic_files)
|
|
{
|
|
@key_order=sort {$a cmp $b} keys %tot;
|
|
for ($i=0; $i <= $#key_order; $i++)
|
|
{
|
|
if ($tot{$key_order[$i]}{'version'} =~ /^$opt_server-/)
|
|
{
|
|
unshift(@key_order,$key_order[$i]);
|
|
splice(@key_order,$i+1,1);
|
|
last;
|
|
}
|
|
}
|
|
}
|
|
# Print header
|
|
print "<p><center><table border=1 width=100%>\n";
|
|
$column_count=0;
|
|
foreach $key (@key_order)
|
|
{
|
|
$tmp=$tot{$key}{'version'};
|
|
$tmp =~ s/-cmp-$opt_cmp// if (length($opt_cmp));
|
|
$column_count++;
|
|
# printf "<tr><td>%2d<td>%-36.36s<td>%s %s</tr>\n", $column_count, $tmp,
|
|
printf "<tr><td>%2d</td><td>%s</td><td>%s %s</td></tr>\n",
|
|
$column_count, $tmp, $tot{$key}{'server'}, $tot{$key}{'arguments'};
|
|
print "<tr><td colspan=3>$tot{$key}{'comments'}</td></tr>\n"
|
|
if ($tot{$key}{'comments'} =~ /\w+/);
|
|
}
|
|
|
|
print "</table></center><p><center><table border=1 width=100%>\n";
|
|
|
|
$namewidth=$opt_skip_count ? 22 :29;
|
|
$colwidth= $opt_relative ? 10 : 7;
|
|
$count_width=7;
|
|
|
|
printf "<tr><td><b>%s</b></td>\n", "Operation";
|
|
$count = 1;
|
|
foreach $key (@key_order)
|
|
{
|
|
$ver=$tot{$key}{'version'};
|
|
printf "<td align=center><b>%d", $count;
|
|
printf "<br>%${colwidth}.${colwidth}s</b></td>\n", substr($ver,0,index($ver,"-"));
|
|
$count++;
|
|
}
|
|
print "</tr>\n";
|
|
$title = $opt_relative ? "Relative results per test (First column is in seconds):" : "Results per test in seconds:";
|
|
printf "<tr><td colspan=%d><b>%s</b></td></tr>\n", $count, $title;
|
|
|
|
foreach $key (sort {$a cmp $b} keys %op1)
|
|
{
|
|
if (!$opt_html)
|
|
{
|
|
printf "<tr><td>%-$namewidth.${namewidth}s</td>", $key;
|
|
}
|
|
else
|
|
{
|
|
print "<tr><td>$key</td>";
|
|
}
|
|
$first=undef();
|
|
foreach $server (@key_order)
|
|
{
|
|
print_value($first,$tot{$server}{$key}->[0],undef(),
|
|
$tot{$server}{$key}->[1]);
|
|
$first=$tot{$server}{$key}->[0] if (!defined($first));
|
|
}
|
|
print "</tr>\n";
|
|
}
|
|
|
|
$title = "The results per operation:";
|
|
printf "<tr><td colspan=%d><b>%s</b></td></tr>\n", $count, $title;
|
|
|
|
foreach $key (sort {$a cmp $b} keys %op)
|
|
{
|
|
next if ($key =~ /TOTALS/i);
|
|
$tmp=$key;
|
|
$tmp.= " (" . $tot1{$key_order[0]}{$key}->[1] . ")" if (!$skip_count);
|
|
if (!$opt_html)
|
|
{
|
|
printf "<tr><td>%-$namewidth.${namewidth}s</td>", $tmp;
|
|
}
|
|
else
|
|
{
|
|
print "<tr><td>$tmp</td>";
|
|
}
|
|
$first=undef();
|
|
foreach $server (@key_order)
|
|
{
|
|
print_value($first,$tot1{$server}{$key}->[0],
|
|
$tot1{$server}{$key}->[1],
|
|
$tot1{$server}{$key}->[2]);
|
|
$first=$tot1{$server}{$key}->[0] if (!defined($first));
|
|
}
|
|
print "</tr>\n";
|
|
}
|
|
|
|
$key="TOTALS";
|
|
printf "<tr><td><b>%-$namewidth.${namewidth}s</b></td>", $key;
|
|
$first=undef();
|
|
foreach $server (@key_order)
|
|
{
|
|
print_value($first,$tot1{$server}{$key}->[0],undef(),
|
|
$tot1{$server}{$key}->[2]);
|
|
$first=$tot1{$server}{$key}->[0] if (!defined($first));
|
|
}
|
|
print "</tr>\n</table>\n";
|
|
}
|
|
|
|
|
|
sub print_sep
|
|
{
|
|
my ($sep)=@_;
|
|
print $sep x ($namewidth + (($colwidth+1) * $column_count)+1),"\n";
|
|
}
|
|
|
|
|
|
sub print_value
|
|
{
|
|
my ($first,$value,$count,$flags)=@_;
|
|
my ($tmp,$width);
|
|
|
|
if (defined($value))
|
|
{
|
|
if (!defined($first) || !$opt_relative)
|
|
{
|
|
$tmp=sprintf("%.2f",$value);
|
|
}
|
|
else
|
|
{
|
|
$first=1 if ($first == 0); # Assume that it took one second instead of 0
|
|
$tmp= sprintf("%.2f",$value/$first);
|
|
}
|
|
if (defined($flags))
|
|
{
|
|
$tmp="+".$tmp if ($flags =~ /\+/);
|
|
$tmp="?".$tmp if ($flags =~ /\?/);
|
|
$tmp="*".$tmp if ($flags =~ /\*/);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
$tmp="";
|
|
}
|
|
$width= ($opt_verbose ? $colwidth - $count_width : $colwidth);
|
|
if (!$opt_html)
|
|
{
|
|
$tmp= " " x ($width-length($tmp)) . $tmp if (length($tmp) < $width);
|
|
}
|
|
if ($opt_verbose)
|
|
{
|
|
if ($count)
|
|
{
|
|
$tmp.= ":" . " " x ($count_width-1-length($count)) . $count;
|
|
}
|
|
else
|
|
{
|
|
$tmp.= " " x ($count_width);
|
|
}
|
|
}
|
|
|
|
if (!$opt_html) {
|
|
print $tmp . "${bar}";
|
|
} else {
|
|
print "<td align=right>$tmp</td>";
|
|
}
|
|
}
|
|
|
|
|
|
sub print_string
|
|
{
|
|
my ($str)=@_;
|
|
if (!$opt_html)
|
|
{
|
|
my ($width);
|
|
$width=$namewidth + ($colwidth+1)*$column_count;
|
|
$str=substr($str,1,$width) if (length($str) > $width);
|
|
print($str," " x ($width - length($str)),"${bar}\n");
|
|
}
|
|
else
|
|
{
|
|
print $str,"\n";
|
|
}
|
|
}
|
|
|
|
|
|
sub usage
|
|
{
|
|
print <<EOF;
|
|
$0 Ver 1.2
|
|
|
|
This program parses all RUN files from old 'run-all-tests --log' scripts
|
|
and makes a nice comparable table.
|
|
|
|
$0 takes currently the following options:
|
|
|
|
--help or --Information
|
|
Shows this help
|
|
|
|
--cmp=server,server,server (Default $opt_cmp)
|
|
Compares all runs that are done with the same --cmp options to run-all-tests.
|
|
The most normal options are '--cmp=mysql,pg,solid' and '--cmp ""'
|
|
|
|
--dir=... (Default $opt_dir)
|
|
From which directory one should get the runs. All runs made by
|
|
run-all-tests --log is saved in the 'output' directory.
|
|
In the 'results' directory you may have some example runs from different
|
|
databases.
|
|
|
|
--html
|
|
Print the table in html format.
|
|
|
|
--machine='full-machine-name' (Default $opt_machine)
|
|
Use only runs that match this machine.
|
|
|
|
--relative
|
|
Show all numbers in times of the first server where the time for the
|
|
first server is 1.0
|
|
|
|
--same-server
|
|
Compare all runs for --server=.... The --machine is not used in this case
|
|
This is nice to compare how the same server runs on different machines.
|
|
|
|
--server='server name' (Default $opt_server)
|
|
Put this server in the first result column.
|
|
|
|
--skip-count
|
|
Do not write the number of tests after the test-name.
|
|
|
|
--verbose
|
|
Write the number of tests in each column. This is useful when some column
|
|
is marked with '*'.
|
|
EOF
|
|
|
|
exit(0);
|
|
}
|