revision-id: 4ffc3da2ff971ae6b99d150ee52514c89478a9c2 () parent(s): 014e2d16defac0de290de65148b8a425fa710be1 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-02-28 10:02:38 -0500 message: Cleanup part#3 --- mariadb-tpcds-tooling2/01-generate-dataset.sh | 2 ++ mariadb-tpcds-tooling2/20-run-queries-pg.sh | 3 +-- mariadb-tpcds-tooling2/run-queries-mysql8.sh | 2 ++ run-all-mariadb-10.4.sh | 12 ++++++++---- setup-server/setup-postgresql-11.sh | 0 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/mariadb-tpcds-tooling2/01-generate-dataset.sh b/mariadb-tpcds-tooling2/01-generate-dataset.sh index 3fb580a..0272c9c 100755 --- a/mariadb-tpcds-tooling2/01-generate-dataset.sh +++ b/mariadb-tpcds-tooling2/01-generate-dataset.sh @@ -16,6 +16,8 @@ fi if [ ! -d v2.8.0rc4 ] ; then + unzip tpc-ds-tool.zip + # Modify the toolkit to produce MySQL dialect and compile it ( cd v2.8.0rc4/tools diff --git a/mariadb-tpcds-tooling2/20-run-queries-pg.sh b/mariadb-tpcds-tooling2/20-run-queries-pg.sh index f00c119..86d959a 100644 --- a/mariadb-tpcds-tooling2/20-run-queries-pg.sh +++ b/mariadb-tpcds-tooling2/20-run-queries-pg.sh @@ -9,11 +9,10 @@ done (./postgresql-11.2-inst/bin/psql tpcds | tee pg-result.txt) << END select - query_stream, count(*), sum(query_time_ms) + query_stream, count(*), sum(query_time_ms) / (60*1000) from my_tpcds_result group by query_stream; END - diff --git a/mariadb-tpcds-tooling2/run-queries-mysql8.sh b/mariadb-tpcds-tooling2/run-queries-mysql8.sh index 1e071e8..64dc0df 100755 --- a/mariadb-tpcds-tooling2/run-queries-mysql8.sh +++ b/mariadb-tpcds-tooling2/run-queries-mysql8.sh @@ -1,5 +1,7 @@ #!/bin/bash +echo "THis script is out of date" +exit 1 # TODO: factor out the config soemwhere, and then this is the same as with MariaDB MYSQL="./mysql-8.0/runtime_output_directory/mysql" diff --git a/run-all-mariadb-10.4.sh b/run-all-mariadb-10.4.sh index 4fd69c0..2ba2fed 100755 --- a/run-all-mariadb-10.4.sh +++ b/run-all-mariadb-10.4.sh @@ -1,7 +1,11 @@ #!/bin/bash set -e -./setup-server/setup-mariadb-current.sh 10.2 | tee log-build +mkdir -p logs +./setup-server/setup-mariadb-current.sh 10.4 | tee logs/setup-mariadb + +./mariadb-tpcds-tooling2/01-generate-dataset.sh | tee logs/generate-dataset +./mariadb-tpcds-tooling2/10-prepare-queries.sh | tee logs/prepare-queries +./mariadb-tpcds-tooling2/02-load-dataset.sh | tee logs/load-dataset +./mariadb-tpcds-tooling2/20-run-queries.sh | tee logs/run-queries + -./mariadb-tpcds-tooling2/prepare-benchmark-and-data.sh | tee log-prepare -./mariadb-tpcds-tooling2/prepare-queries.sh | tee log-run -./mariadb-tpcds-tooling2/run-queries.sh | tee log-benchmark diff --git a/setup-server/setup-postgresql-11.sh b/setup-server/setup-postgresql-11.sh old mode 100644 new mode 100755