From 82bfcd2b805cbf86e24847d4619a7569effe532d Mon Sep 17 00:00:00 2001
From: Andrey Piskunov <andrey.piskunov@mariadb.com>
Date: Fri, 5 Aug 2022 16:30:18 +0300
Subject: [PATCH] Restructure benchmarks  (#2492)

* Add chargen

* Restructure

* Remove redundant line

* Correct directories

* Scale up the numbers
---
 benchmarks/bench.sh                                    | 10 ++++++++--
 benchmarks/{ => charbench}/chargen.sh                  |  2 +-
 .../select_bench.lua}                                  |  0
 benchmarks/{ => numbench}/numgen.sh                    |  2 +-
 benchmarks/{ => numbench}/select_bench.lua             |  0
 5 files changed, 10 insertions(+), 4 deletions(-)
 rename benchmarks/{ => charbench}/chargen.sh (67%)
 rename benchmarks/{select_text_bench.lua => charbench/select_bench.lua} (100%)
 mode change 100644 => 100755
 rename benchmarks/{ => numbench}/numgen.sh (55%)
 rename benchmarks/{ => numbench}/select_bench.lua (100%)

diff --git a/benchmarks/bench.sh b/benchmarks/bench.sh
index bb03485f4..60004a0b5 100755
--- a/benchmarks/bench.sh
+++ b/benchmarks/bench.sh
@@ -50,17 +50,20 @@ die() {
   exit "$code"
 }
 
+RUN_DIRECTORY=$(pwd)
 
-cd $MDB_SOURCE_PATH/columnstore/columnstore/benchmarks
-
+LUA_PATH=$MDB_SOURCE_PATH/columnstore/columnstore/benchmarks/?.lua
+export LUA_PATH
 DATA=$(sudo mktemp -p /var)
 eval ./$GEN > "$DATA"
 
+cd $MDB_SOURCE_PATH/columnstore/columnstore/
 git checkout $BRANCH1
 sudo $MDB_SOURCE_PATH/columnstore/columnstore/build/bootstrap_mcs.sh -t RelWithDebInfo
 echo "Build done; benchmarking $BRANCH1 now"
 git checkout with_benchmarks
 #Prepare should only create the table, we will fill it with cpimport
+cd $RUN_DIRECTORY
 sysbench $SCRIPT \
         --mysql-socket=/run/mysqld/mysqld.sock \
         --db-driver=mysql \
@@ -75,10 +78,12 @@ BRANCH1_DATA=$(sysbench $SCRIPT \
         --mysql-db=test \
         --time=$TIME run | tail -n +12)
 
+cd $MDB_SOURCE_PATH/columnstore/columnstore/
 git checkout $BRANCH2
 sudo $MDB_SOURCE_PATH/columnstore/columnstore/build/bootstrap_mcs.sh -t RelWithDebInfo
 echo "Build done; benchmarking $BRANCH2 now"
 git checkout with_benchmarks
+cd $RUN_DIRECTORY
 sysbench $SCRIPT \
         --mysql-socket=/run/mysqld/mysqld.sock \
         --db-driver=mysql \
@@ -93,4 +98,5 @@ BRANCH2_DATA=$(sysbench $SCRIPT \
         --mysql-db=test \
         --time=$TIME run | tail -n +12)
 
+cd $MDB_SOURCE_PATH/columnstore/columnstore/benchmarks
 python3 parse_bench.py "$BRANCH2" "$BRANCH1" "$BRANCH2_DATA" "$BRANCH1_DATA" "$TIME"
diff --git a/benchmarks/chargen.sh b/benchmarks/charbench/chargen.sh
similarity index 67%
rename from benchmarks/chargen.sh
rename to benchmarks/charbench/chargen.sh
index fb69b7e0a..181bbf93a 100755
--- a/benchmarks/chargen.sh
+++ b/benchmarks/charbench/chargen.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-for (( VAR=1; VAR<=1000; VAR++ ))
+for (( VAR=1; VAR<=1000000000; VAR++ ))
 do
     shuf -er -n3  {A..Z} {a..z} | tr -d '\n'
     echo
diff --git a/benchmarks/select_text_bench.lua b/benchmarks/charbench/select_bench.lua
old mode 100644
new mode 100755
similarity index 100%
rename from benchmarks/select_text_bench.lua
rename to benchmarks/charbench/select_bench.lua
diff --git a/benchmarks/numgen.sh b/benchmarks/numbench/numgen.sh
similarity index 55%
rename from benchmarks/numgen.sh
rename to benchmarks/numbench/numgen.sh
index 0f096a1e5..b5c6acc4e 100755
--- a/benchmarks/numgen.sh
+++ b/benchmarks/numbench/numgen.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-seq 1 100000000
+seq 1 1000000000
diff --git a/benchmarks/select_bench.lua b/benchmarks/numbench/select_bench.lua
similarity index 100%
rename from benchmarks/select_bench.lua
rename to benchmarks/numbench/select_bench.lua