revision-id: 2d680311bfb1a087948e75746bf0534e431a1844 () parent(s): 2e595032f0e4c1727f18ce89173fdc2b40416f53 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-02-27 22:34:58 -0500 message: More cleanups (not finished) --- mariadb-tpcds-tooling2/20-run-queries-pg.sh | 5 +++-- mariadb-tpcds-tooling2/20-run-queries.sh | 28 ++++++++++++++++++++++++++++ mariadb-tpcds-tooling2/run-queries.sh | 15 --------------- 3 files changed, 31 insertions(+), 17 deletions(-) diff --git a/mariadb-tpcds-tooling2/20-run-queries-pg.sh b/mariadb-tpcds-tooling2/20-run-queries-pg.sh index 90c608d..f00c119 100644 --- a/mariadb-tpcds-tooling2/20-run-queries-pg.sh +++ b/mariadb-tpcds-tooling2/20-run-queries-pg.sh @@ -7,12 +7,13 @@ ls queries-for-pg/*.sql | while read a ; do ./postgresql-11.2-inst/bin/psql tpcds < $a | tee benchmark-output-raw.txt done -cat << END +(./postgresql-11.2-inst/bin/psql tpcds | tee pg-result.txt) << END select query_stream, count(*), sum(query_time_ms) from my_tpcds_result group by query_stream; -END | ./postgresql-11.2-inst/bin/psql tpcds | tee pg-result.txt +END + diff --git a/mariadb-tpcds-tooling2/20-run-queries.sh b/mariadb-tpcds-tooling2/20-run-queries.sh new file mode 100755 index 0000000..5cea382 --- /dev/null +++ b/mariadb-tpcds-tooling2/20-run-queries.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +if [ ! -f mysql-config.sh ] ; then + echo "Cannot find mysql-config.sh - did you setup the db?" + exit 1; +fi + +source mysql-config.sh +echo "Running data using $MYSQL $MYSQL_ARGS"; + +ls queries-for-mysql/*.sql | while read a ; do + $MYSQL $MYSQL_ARGS tpcds < $a | tee benchmark-output-raw.txt +done + +($MYSQL $MYSQL_ARGS tpcds | tee mysql-result.txt) << END +select + query_stream, count(*), sum(query_time_ms) +from + my_tpcds_result +group by + query_stream; +END + + + + +#grep LOG_END benchmark-output-raw.txt | sort | awk '//{printf ("%s %s\n" , $2, $3) }' + diff --git a/mariadb-tpcds-tooling2/run-queries.sh b/mariadb-tpcds-tooling2/run-queries.sh deleted file mode 100755 index c56a3b2..0000000 --- a/mariadb-tpcds-tooling2/run-queries.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - - -# TODO: factor out the config soemwhere -MYSQL="./mariadb-10.2/client/mysql" -SOCKET="--socket=/tmp/mysql20.sock" -MYSQL_USER="-uroot" -MYSQL_ARGS="$MYSQL_USER $SOCKET" - -ls queries-for-mysql/*.sql | while read a ; do - $MYSQL $MYSQL_ARGS tpcds < $a | tee benchmark-output-raw.txt -done - -#grep LOG_END benchmark-output-raw.txt | sort | awk '//{printf ("%s %s\n" , $2, $3) }' -