Merge pull request #3 from alexanderlaw/main

Add the sysbench benchmark

Author: AndrewBille

Diff for: Dockerfile-pgapt

@@ -17,7 +17,7 @@ RUN p=$EXTRA_OS_PACKAGES; p="${p%\"}";p="${p#\"}"; \
     apt update && apt install -y $p python3 python3-dev python3-pip \
     software-properties-common wget vim time pkg-config locales recode \
     git gcc make libreadline-dev zlib1g-dev libicu-dev bison flex gettext \
-    openjdk-17-jdk maven
+    openjdk-17-jdk maven sysbench
 
 RUN locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8
 ENV LANG en_US.UTF-8

Diff for: Dockerfile-proapt

@@ -19,7 +19,7 @@ RUN p=$EXTRA_OS_PACKAGES; p="${p%\"}";p="${p#\"}"; \
     apt update && apt install -y $p python3 python3-dev python3-pip \
     software-properties-common wget vim time pkg-config locales recode \
     git gcc make libreadline-dev zlib1g-dev libicu-dev bison flex gettext \
-    openjdk-17-jdk maven
+    openjdk-17-jdk maven sysbench
 
 RUN locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8
 ENV LANG en_US.UTF-8

Diff for: Dockerfile-src

@@ -18,7 +18,7 @@ RUN p=$EXTRA_OS_PACKAGES; p="${p%\"}";p="${p#\"}"; \
     apt update && apt install -y $p python3 python3-dev python3-pip \
     software-properties-common wget vim time pkg-config locales recode \
     git gcc make libreadline-dev zlib1g-dev libicu-dev bison flex gettext \
-    openjdk-17-jdk maven
+    openjdk-17-jdk maven sysbench
 
 RUN locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8
 ENV LANG en_US.UTF-8

Diff for: README.md

@@ -84,7 +84,7 @@ Or
 4) You can also compare benchmark results for several instances in an
 automated non-visual way. Run
 
-       ./analyze-benchmarks.py -i 'intance-1-pattern' 'intance-2-pattern'
+       ./analyze-benchmarks.py -i 'instance-1-pattern' 'instance-2-pattern'
 
 For example, to compare results of benchmarking instances shown above, run:
 

Diff for: analyze-benchmarks.py

@@ -75,7 +75,7 @@ def main(instances, resultsfile, percent, targetmetric, targetvalue):
                             metrics[metric_id][ipat] = []
                         value = float(metric.get('value'))
                         if metric_id.startswith(('tps', 'tpm', 'xacts')) or \
-                           metric_id.endswith(('_ops', '_rps')):
+                           metric_id.endswith(('_tps', '_ops', '_rps')):
                             value = -value
                         metrics[metric_id][ipat].append(value)
             if not inst_ipat:

Diff for: config.xml

@@ -389,6 +389,30 @@ done
             </results>
         </benchmark>
 
+        <benchmark id="sysbench">
+            <prepare>
+<![CDATA[
+createuser sbtest && createdb sbtest --owner=sbtest >results/prepare.log 2>&1
+]]>
+            </prepare>
+            <execute>
+<![CDATA[
+(for t in /usr/share/sysbench/*.lua; do
+tn=\$(basename \$t .lua);
+[[ "\$tn" == oltp_common ]] && continue;
+sysbench --db-driver=pgsql --threads=10 --table_size=100000 \$tn prepare &&
+sysbench --db-driver=pgsql --threads=10 --table_size=100000 --time=60 \$tn run | sed -e "s/^/\$tn: /" &&
+sysbench --db-driver=pgsql --threads=10 \$tn cleanup;
+done
+) >results/run.log 2>&1; cat results/run.log
+]]>
+            </execute>
+            <results>
+                <metricset id="load_$1_tps" regexp="^([a-z_]+):\s+transactions:\s+[0-9.]+\s+\(([0-9.]+) per sec\.\)" />
+                <metricset id="load_$1_ops" regexp="^([a-z_]+):\s+queries:\s+[0-9.]+\s+\(([0-9.]+) per sec\.\)" />
+            </results>
+        </benchmark>
+
         <benchmark id="insert-1m">
             <execute>
 <![CDATA[