Updated benchmarks (0048a58f) · Commits · Software / OSDI20 Artifacts / mariadb

client/mysqlbinlog.cc

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@
		#include <time.h>
		#include "log_event.h"

		#define PROBE_HEADER_LEN (4+EVENT_LEN_OFFSET)
		#define PROBE_HEADER_LEN (4+EVENT_LEN_OFFSET+4)

		#define CLIENT_CAPABILITIES (CLIENT_LONG_PASSWORD \| CLIENT_LONG_FLAG \| CLIENT_LOCAL_FILES)

		@@ -102,7 +102,7 @@ static void die(const char* fmt, ...)

		static void print_version()
		{
		printf("%s Ver 1.6 for %s at %s\n",my_progname,SYSTEM_TYPE, MACHINE_TYPE);
		printf("%s Ver 1.7 for %s at %s\n",my_progname,SYSTEM_TYPE, MACHINE_TYPE);
		}

configure.in

+2 −2

Original line number	Diff line number	Diff line
		@@ -819,8 +819,8 @@ case $SYSTEM_TYPE in
		;;
		hpux10.20)
		echo "Enabling snprintf workaround for hpux 10.20"
		CFLAGS="$CFLAGS -DHAVE_BROKEN_SNPRINTF -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX"
		CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_SNPRINTF -D_INCLUDE_LONGLONG -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX"
		CFLAGS="$CFLAGS -DHAVE_BROKEN_SNPRINTF -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX -DSIGNAL_WITH_VIO_CLOSE"
		CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_SNPRINTF -D_INCLUDE_LONGLONG -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX -DSIGNAL_WITH_VIO_CLOSE"
		if test "$with_named_thread" = "no"
		then
		echo "Using --with-named-thread=-lpthread"

mysql-test/mysql-test-run.sh

+9 −9

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ which ()
		do
		for dir in $PATH
		do
		if test -e $dir/$file
		if test -f $dir/$file
		then
		echo "$dir/$file"
		continue 2
		@@ -49,7 +49,7 @@ sleep_until_file_deleted ()
		loop=$SLEEP_TIME_FOR_DELETE
		while (test $loop -gt 0)
		do
		if [ ! -e $file ]
		if [ ! -r $file ]
		then
		sleep $SLEEP_TIME_AFTER_RESTART
		return
		@@ -65,7 +65,7 @@ sleep_until_file_exists ()
		org_time=$2
		while (test $loop -gt 0)
		do
		if [ -e $file ]
		if [ -r $file ]
		then
		return
		fi
		@@ -317,15 +317,15 @@ MANAGER_PID_FILE="$MYRUN_DIR/manager.pid"

		MASTER_MYDDIR="$MYSQL_TEST_DIR/var/master-data"
		MASTER_MYSOCK="$MYSQL_TMP_DIR/master.sock"
		MASTER_MYPID="$MYRUN_DIR/mysqld.pid"
		MASTER_MYLOG="$MYSQL_TEST_DIR/var/log/mysqld.log"
		MASTER_MYERR="$MYSQL_TEST_DIR/var/log/mysqld.err"
		MASTER_MYPID="$MYRUN_DIR/master.pid"
		MASTER_MYLOG="$MYSQL_TEST_DIR/var/log/master.log"
		MASTER_MYERR="$MYSQL_TEST_DIR/var/log/master.err"

		SLAVE_MYDDIR="$MYSQL_TEST_DIR/var/slave-data"
		SLAVE_MYSOCK="$MYSQL_TMP_DIR/slave.sock"
		SLAVE_MYPID="$MYRUN_DIR/mysqld-slave.pid"
		SLAVE_MYLOG="$MYSQL_TEST_DIR/var/log/mysqld-slave.log"
		SLAVE_MYERR="$MYSQL_TEST_DIR/var/log/mysqld-slave.err"
		SLAVE_MYPID="$MYRUN_DIR/slave.pid"
		SLAVE_MYLOG="$MYSQL_TEST_DIR/var/log/slave.log"
		SLAVE_MYERR="$MYSQL_TEST_DIR/var/log/slave.err"

		SMALL_SERVER="-O key_buffer_size=1M -O sort_buffer=256K -O max_heap_table_size=1M"

sql-bench/bench-init.pl.sh

+11 −2

Original line number	Diff line number	Diff line
		@@ -44,6 +44,8 @@ $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;

		$opt_time_limit=10*60; # Don't wait more than 10 min for some tests
		@@ -51,9 +53,9 @@ $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",
		"socket=s") \|\| usage();
		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") \|\| usage();

		usage() if ($opt_help);
		$server=get_server($opt_server,$opt_host,$opt_database,$opt_odbc,
		@@ -585,6 +587,13 @@ All benchmarks takes the following options:
		--verbose
		This is a test specific option that is only used when debugging a test.
		Print more information about what is going on.

		--optimization='some comments'
		Add coments about optimization of DBMS, which was done before the test.

		--hw='some comments'
		Add coments about hardware used for this test.

		EOF
		exit(0);
		}

sql-bench/run-all-tests.sh

+11 −5

Original line number	Diff line number	Diff line
		@@ -109,7 +109,9 @@ print "Running tests on: $machine\n";
		print "Arguments: $log_prog_args\n";
		print "Comments: $opt_comments\n";
		print "Limits from: $opt_cmp\n";
		print "Server version: $server_version\n\n";
		print "Server version: $server_version\n";
		print "Optimization: $opt_optimization\n";
		print "Hardware: $opt_hw\n\n";


		$estimated=$warning=$got_warning=0;
		@@ -285,10 +287,6 @@ sub read_headers
		{
		$log_prog_args=$1;
		}
		elsif (/^Comments.:\s+(.)$/)
		{
		$opt_comments=$1;
		}
		elsif (/^Limits.:\s+(.)$/)
		{
		$opt_cmp=$1;
		@@ -297,6 +295,14 @@ sub read_headers
		{
		$server_version=$1;
		}
		elsif (/^Optimiz.:\s+(.)$/)
		{
		$opt_optimization=$1;
		}
		elsif (/^Hardwar.:\s+(.)$/)
		{
		$opt_hw=$1;
		}
		}
		close(TMP);
		}