Merge branch '2.2' into 2.3

This commit is contained in:
Markus Mäkelä
2019-01-03 09:21:47 +02:00
14 changed files with 235 additions and 148 deletions

View File

@ -1,78 +1,77 @@
#ifndef SYSBENCH_COMMANDS_H
#define SYSBENCH_COMMANDS_H
/*const char * sysbench_prepare =
* "sysbench --test=oltp \
* --oltp-table-size=1000000 --mysql-db=test --mysql-user=skysql --mysql-password=skysql \
/*const char * SYSBENCH_PREPARE =
* "sysbench oltp_read_write \
* --mysql-db=test --mysql-user=skysql --mysql-password=skysql \
* --mysql-port=4006 --mysql-host=%s prepare";
*
*
*
* const char * sysbench_command =
* "sysbench --test=oltp \
* const char * SYSBENCH_COMMAND =
* "sysbench oltp_read_write \
* --mysql-host=%s --mysql-port=%d --mysql-user=skysql --mysql-password=skysql \
* --mysql-db=test --mysql-table-engine=innodb \
* --num-threads=32 --oltp-table-size=1000000 --oltp-read-only=off \
* --mysql-db=test \
* --num-threads=32 \
* --oltp-dist-type=uniform --oltp-skip-trx=off --init-rng=on --oltp-test-mode=complex \
* --max-requests=0 --max-time=600 run";*/
* --max-requests=0 --time=600 run";*/
const char* sysbench_prepare
=
"%s/sysbench --test=%s/tests/db/oltp.lua \
--oltp-table-size=1000000 --mysql-db=test --mysql-user=skysql --mysql-password=skysql \
--mysql-port=4006 --mysql-host=%s --oltp-tables-count=4 prepare";
const char* SYSBENCH_PREPARE =
"sysbench oltp_read_write \
--mysql-db=test --mysql-user=skysql --mysql-password=skysql \
--mysql-port=4006 --mysql-host=%s prepare";
const char* sysbench_command
=
"%s/sysbench --test=%s/tests/db/oltp.lua \
const char* SYSBENCH_COMMAND =
"sysbench oltp_read_write \
--mysql-host=%s --mysql-port=%d --mysql-user=skysql --mysql-password=skysql \
--mysql-db=test --mysql-table-engine=innodb --mysql-ignore-duplicates=on \
--num-threads=32 --oltp-table-size=1000000 --oltp-tables-count=2 --oltp-read-only=%s \
--oltp-dist-type=uniform --oltp-skip-trx=off --init-rng=on --oltp-test-mode=complex \
--max-requests=0 --report-interval=5 --max-time=100 run";
--mysql-db=test \
--threads=32 \
--max-requests=0 --report-interval=5 --time=100 run";
const char* SYSBENCH_PREPARE_RO =
"sysbench oltp_read_only \
--mysql-db=test --mysql-user=skysql --mysql-password=skysql \
--mysql-port=4006 --mysql-host=%s prepare";
const char* sysbench_prepare1
=
"%s/sysbench --test=%s/tests/db/oltp.lua \
--oltp-table-size=1000 --mysql-db=test --mysql-user=skysql --mysql-password=skysql \
--mysql-port=4006 --mysql-host=%s --oltp-tables-count=1 prepare";
const char* sysbench_command1
=
"%s/sysbench --test=%s/tests/db/oltp.lua \
--mysql-host=%s --mysql-port=%d --mysql-user=skysql --mysql-password=skysql \
--mysql-db=test --mysql-table-engine=innodb --mysql-ignore-duplicates=on \
--num-threads=32 --oltp-table-size=1000 --oltp-tables-count=1 --oltp-read-only=%s \
--oltp-dist-type=uniform --oltp-skip-trx=off --init-rng=on --oltp-test-mode=complex \
--max-requests=0 --report-interval=5 --max-time=100 run";
const char* sysbench_command_long
=
"%s/sysbench --test=%s/tests/db/oltp.lua \
const char* SYSBENCH_COMMAND_RO =
"sysbench oltp_read_only \
--mysql-host=%s --mysql-port=%d --mysql-user=skysql --mysql-password=skysql \
--mysql-db=test --mysql-table-engine=innodb --mysql-ignore-duplicates=on \
--num-threads=32 --oltp-table-size=1000000 --oltp-tables-count=2 --oltp-read-only=%s \
--oltp-dist-type=uniform --oltp-skip-trx=off --init-rng=on --oltp-test-mode=complex \
--max-requests=0 --report-interval=5 --max-time=2592000 run";
--mysql-db=test \
--threads=32 \
--max-requests=0 --report-interval=5 --time=100 run";
const char* sysbench_prepare_short
=
"%s/sysbench --test=%s/tests/db/oltp.lua \
--oltp-table-size=10000 --mysql-db=test --mysql-user=skysql --mysql-password=skysql \
--mysql-port=4006 --mysql-host=%s --oltp-tables-count=4 prepare";
const char* SYSBENCH_PREPARE1 =
"sysbench oltp_read_write \
--mysql-db=test --mysql-user=skysql --mysql-password=skysql \
--mysql-port=4006 --mysql-host=%s prepare";
const char* sysbench_command_short
=
"%s/sysbench --test=%s/tests/db/oltp.lua \
const char* SYSBENCH_COMMAND1 =
"sysbench oltp_read_write \
--mysql-host=%s --mysql-port=%d --mysql-user=skysql --mysql-password=skysql \
--mysql-db=test \
--threads=32 \
--max-requests=0 --report-interval=5 --time=100 run";
const char* SYSBENCH_COMMAND_LONG =
"sysbench oltp_read_write \
--mysql-host=%s --mysql-port=%d --mysql-user=skysql --mysql-password=skysql \
--mysql-db=test \
--threads=32 \
--max-requests=0 --report-interval=5 --time=2592000 run";
const char* SYSBENCH_PREPARE_SHORT =
"sysbench oltp_read_write \
--mysql-db=test --mysql-user=skysql --mysql-password=skysql \
--mysql-port=4006 --mysql-host=%s prepare";
const char* SYSBENCH_COMMAND_SHORT =
"sysbench oltp_read_write \
--mysql-host=%s --mysql-port=%d --mysql-user=skysql --mysql-password=skysql \
--mysql-db=test --mysql-table-engine=innodb --mysql-ignore-duplicates=on \
--num-threads=32 --oltp-table-size=10000 --oltp-tables-count=2 --oltp-read-only=%s \
--oltp-dist-type=uniform --oltp-skip-trx=off --init-rng=on --oltp-test-mode=complex \
--max-requests=0 --report-interval=5 --max-time=300 run";
--mysql-db=test \
--threads=32 \
--max-requests=0 --report-interval=5 --time=300 run";
#endif // SYSBENCH_COMMANDS_H