Add config property rollbackPercent

The pure 1% probability for illegal item entry
on NEW_ORDER can lead to actually having less
than 1% at the end of the run. Defaulting to 1.01%
and making it configurable should prevent that.

src/main/java/com/github/pgsqlio/benchmarksql/jtpcc/jTPCC.java

@@ -70,6 +70,7 @@ public class jTPCC {
   public static double orderStatusWeight;
   public static double deliveryWeight;
   public static double stockLevelWeight;
+  public static double rollbackPercent;
 
   private OSCollector osCollector = null;
   private jTPCCTData terminal_data[];
@@ -171,6 +172,9 @@ public jTPCC() throws FileNotFoundException {
     log.info("main, {}", sb.toString());
     log.info("main, ");
 
+    rollbackPercent = Double.parseDouble(getProp(ini, "rollbackPercent", "1.01"));
+    log.info("main, ");
+
     sutThreadDelay = (rampupSUTMins * 60000) / numSUTThreads;
     terminalDelay = (rampupTerminalMins * 60000) / (numWarehouses * 10);
 

src/main/java/com/github/pgsqlio/benchmarksql/jtpcc/jTPCCMonkey.java

@@ -374,7 +374,7 @@ private void generateNewOrder(jTPCCTData tdata) {
 
       // 2.4.1.4 - 1% of orders must use an invalid ol_o_id in the last
       // order line generated.
-      if (rnd.nextInt(1, 100) == 1) {
+      if (rnd.nextDouble(0.0, 100.0) <= jTPCC.rollbackPercent) {
         screen.ol_i_id[ol_idx - 1] = 999999;
         tdata.trans_rbk = true;
       }

src/main/resources/FlaskService/sample.last.properties

@@ -1,96 +1,107 @@
-# General Driver and connection parameters
-#
-# db={ postgres | oracle | firebird | mariadb | transact-sql }
-# driver=<JDBC_DRIVER_CLASS>
-# application={ Generic | PostgreSQLStoredProc | OracleStoredProc }
-# conn=<JDBC_URI>
-# user=<USERNAME>
-# password=<PASSWORD>
-db=postgres
-driver=org.postgresql.Driver
-application=Generic
-conn=jdbc:postgresql://localhost:5432/postgres
-user=benchmarksql
-password=PWbmsql
-
-# Scaling and timing configuration
-warehouses=50
-loadWorkers=8
-monkeys=2
-sutThreads=16
-maxDeliveryBGThreads=12
-maxDeliveryBGPerWarehouse=1
-rampupMins=10
-rampupSUTMins=5
-rampupTerminalMins=5
-runMins=30
-reportIntervalSecs=30
-restartSUTThreadProbability=0.0
-keyingTimeMultiplier=1.0
-thinkTimeMultiplier=1.0
-traceTerminalIO=false
-
-# Below are the definitions for the "attempted" transaction mix.
-# The TPC-C specification requires minimum percentages for all but
-# the NEW_ORDER transaction. If a test run happens to have any of
-# those four types fall below those minimums, the entire test is
-# invalid. We don't want that to happen, so we specify values just
-# a tiny bit above the required minimum.
-# The newOrderWeight is calculated as 100.0 - sum(all_other_types).
-paymentWeight=43.2
-orderStatusWeight=4.2
-deliveryWeight=4.2
-stockLevelWeight=4.2
-
-# BenchmarkSQL includes three OS metric collector scripts implemented
-# in Python3. Two require to have collectd installed on the server
-# systems, you want to include in the performance report. The data
-# will be saved in resultDirectory/data/os-metric.json. The third
-# is based on Prometheus and node_exporter.
-
-# mcCollectdMqtt.py is a metric collector that expects the collectd
-# instances on the servers to send the metric data to an MQTT broker.
-
-#osCollectorScript=./mcCollectdMqtt.py \
-#    -h mymqttbroker.localdomain \
-#    -t collectd/mydbserver.localdomain/# \
-#    -t collectd/mybackrest.localdomain/#
-
-# mcCollectdGraphite.py is a metric collector that expects the
-# collectd instances on the servers to send the metric data to
-# a graphite/whisper database and be available through the /render
-# API.
-
-#osCollectorScript=./mcCollectdGraphite.py \
-#    -u http://mygraphite.localdomain/render/ \
-#    -t collectd.mydbserver_localdomain.*.* \
-#    -t collectd.mydbserver_localdomain.*.*.* \
-#    -t collectd.mybackrest_localdomain.*.* \
-#    -t collectd.mybackrest_localdomain.*.*.*
-
-# mcPrometheus.py retrieves the metric data from a Prometheus
-# server through the API. It converts the output into the same
-# format as the former two produce. The instances listed are
-# the same names given in the "instance" label of the metric
-# data scraped by Prometheus. The port number will be removed
-# in the os-metric.json output.
-
-#osCollectorScript=./mcPrometheus.py \
-#    -u http://myprometheus.localdomain:9090/api/v1/query_range \
-#    -i mydbserver.localdomain:9100 \
-#    -i mybackrest.localdomain:9100
-
-# The report script is what generates the detailed HTML report for
-# the benchmark run. It is a Jinja2 template based reporting system
-# that includes graphs of various metrics, captured during the benchmark.
-
-reportScript=./generateReport.py -t report_simple.html
-
-#reportScript=./generateReport.py \
-#    -t report_extended.html \
-#    -c 'mydbserver.localdomain:DB server' \
-#    -d 'mydbserver.localdomain:DB server:hda2' \
-#    -i 'mydbserver.localdomain:DB server:eth0' \
-#    -c 'mybackrest.localdomain:pgbackrest server' \
-#    -d 'mybackrest.localdomain:pgbackrest server:hda2' \
-#    -i 'mybackrest.localdomain:pgbackrest server:eth0'
+# General Driver and connection parameters
+#
+# db={ postgres | oracle | firebird | mariadb | transact-sql }
+# driver=<JDBC_DRIVER_CLASS>
+# application={ Generic | PostgreSQLStoredProc | OracleStoredProc }
+# conn=<JDBC_URI>
+# user=<USERNAME>
+# password=<PASSWORD>
+db=postgres
+driver=org.postgresql.Driver
+application=Generic
+conn=jdbc:postgresql://localhost:5432/postgres
+user=benchmarksql
+password=PWbmsql
+
+# Scaling and timing configuration
+warehouses=50
+loadWorkers=8
+monkeys=2
+sutThreads=16
+maxDeliveryBGThreads=12
+maxDeliveryBGPerWarehouse=1
+rampupMins=10
+rampupSUTMins=5
+rampupTerminalMins=5
+runMins=30
+reportIntervalSecs=30
+restartSUTThreadProbability=0.0
+keyingTimeMultiplier=1.0
+thinkTimeMultiplier=1.0
+traceTerminalIO=false
+
+# Below are the definitions for the "attempted" transaction mix.
+# The TPC-C specification requires minimum percentages for all but
+# the NEW_ORDER transaction. If a test run happens to have any of
+# those four types fall below those minimums, the entire test is
+# invalid. We don't want that to happen, so we specify values just
+# a tiny bit above the required minimum.
+# The newOrderWeight is calculated as 100.0 - sum(all_other_types).
+paymentWeight=43.2
+orderStatusWeight=4.2
+deliveryWeight=4.2
+stockLevelWeight=4.2
+
+# The TPC-C require a minimum of 1% of the NEW_ORDER transactions
+# to roll back due to a user entry error (non existing item
+# number. Doing it with a strict 1/100th probability can lead to
+# undershooting this target, so we default to 1.01% to be sure.
+rollbackPercent=1.01
+
+# Directory name to create for collecting detailed result data.
+# Comment this out to suppress. Note that the Flask UI will define
+# this by itself, so don't specify it if you run through the UI.
+resultDirectory=my_result_%tY-%tm-%td_%tH%tM%tS
+
+# BenchmarkSQL includes three OS metric collector scripts implemented
+# in Python3. Two require to have collectd installed on the server
+# systems, you want to include in the performance report. The data
+# will be saved in resultDirectory/data/os-metric.json. The third
+# is based on Prometheus and node_exporter.
+
+# mcCollectdMqtt.py is a metric collector that expects the collectd
+# instances on the servers to send the metric data to an MQTT broker.
+
+#osCollectorScript=./mcCollectdMqtt.py \
+#    -h mymqttbroker.localdomain \
+#    -t collectd/mydbserver.localdomain/# \
+#    -t collectd/mybackrest.localdomain/#
+
+# mcCollectdGraphite.py is a metric collector that expects the
+# collectd instances on the servers to send the metric data to
+# a graphite/whisper database and be available through the /render
+# API.
+
+#osCollectorScript=./mcCollectdGraphite.py \
+#    -u http://mygraphite.localdomain/render/ \
+#    -t collectd.mydbserver_localdomain.*.* \
+#    -t collectd.mydbserver_localdomain.*.*.* \
+#    -t collectd.mybackrest_localdomain.*.* \
+#    -t collectd.mybackrest_localdomain.*.*.*
+
+# mcPrometheus.py retrieves the metric data from a Prometheus
+# server through the API. It converts the output into the same
+# format as the former two produce. The instances listed are
+# the same names given in the "instance" label of the metric
+# data scraped by Prometheus. The port number will be removed
+# in the os-metric.json output.
+
+#osCollectorScript=./mcPrometheus.py \
+#    -u http://myprometheus.localdomain:9090/api/v1/query_range \
+#    -i mydbserver.localdomain:9100 \
+#    -i mybackrest.localdomain:9100
+
+# The report script is what generates the detailed HTML report for
+# the benchmark run. It is a Jinja2 template based reporting system
+# that includes graphs of various metrics, captured during the benchmark.
+
+reportScript=./generateReport.py -t report_simple.html
+
+#reportScript=./generateReport.py \
+#    -t report_extended.html \
+#    -c 'mydbserver.localdomain:DB server' \
+#    -d 'mydbserver.localdomain:DB server:hda2' \
+#    -i 'mydbserver.localdomain:DB server:eth0' \
+#    -c 'mybackrest.localdomain:pgbackrest server' \
+#    -d 'mybackrest.localdomain:pgbackrest server:hda2' \
+#    -i 'mybackrest.localdomain:pgbackrest server:eth0'

src/main/resources/sample.firebird.properties

@@ -42,6 +42,12 @@ orderStatusWeight=4.2
 deliveryWeight=4.2
 stockLevelWeight=4.2
 
+# The TPC-C require a minimum of 1% of the NEW_ORDER transactions
+# to roll back due to a user entry error (non existing item
+# number. Doing it with a strict 1/100th probability can lead to
+# undershooting this target, so we default to 1.01% to be sure.
+rollbackPercent=1.01
+
 # Directory name to create for collecting detailed result data.
 # Comment this out to suppress. Note that the Flask UI will define
 # this by itself, so don't specify it if you run through the UI.

src/main/resources/sample.mariadb.properties

@@ -42,6 +42,12 @@ orderStatusWeight=4.2
 deliveryWeight=4.2
 stockLevelWeight=4.2
 
+# The TPC-C require a minimum of 1% of the NEW_ORDER transactions
+# to roll back due to a user entry error (non existing item
+# number. Doing it with a strict 1/100th probability can lead to
+# undershooting this target, so we default to 1.01% to be sure.
+rollbackPercent=1.01
+
 # Directory name to create for collecting detailed result data.
 # Comment this out to suppress. Note that the Flask UI will define
 # this by itself, so don't specify it if you run through the UI.

src/main/resources/sample.oracle.properties

@@ -42,6 +42,12 @@ orderStatusWeight=4.2
 deliveryWeight=4.2
 stockLevelWeight=4.2
 
+# The TPC-C require a minimum of 1% of the NEW_ORDER transactions
+# to roll back due to a user entry error (non existing item
+# number. Doing it with a strict 1/100th probability can lead to
+# undershooting this target, so we default to 1.01% to be sure.
+rollbackPercent=1.01
+
 # Directory name to create for collecting detailed result data.
 # Comment this out to suppress. Note that the Flask UI will define
 # this by itself, so don't specify it if you run through the UI.

src/main/resources/sample.postgresql.properties

@@ -42,6 +42,12 @@ orderStatusWeight=4.2
 deliveryWeight=4.2
 stockLevelWeight=4.2
 
+# The TPC-C require a minimum of 1% of the NEW_ORDER transactions
+# to roll back due to a user entry error (non existing item
+# number. Doing it with a strict 1/100th probability can lead to
+# undershooting this target, so we default to 1.01% to be sure.
+rollbackPercent=1.01
+
 # Directory name to create for collecting detailed result data.
 # Comment this out to suppress. Note that the Flask UI will define
 # this by itself, so don't specify it if you run through the UI.

src/main/resources/sample.transact-sql.properties

@@ -42,6 +42,12 @@ orderStatusWeight=4.2
 deliveryWeight=4.2
 stockLevelWeight=4.2
 
+# The TPC-C require a minimum of 1% of the NEW_ORDER transactions
+# to roll back due to a user entry error (non existing item
+# number. Doing it with a strict 1/100th probability can lead to
+# undershooting this target, so we default to 1.01% to be sure.
+rollbackPercent=1.01
+
 # Directory name to create for collecting detailed result data.
 # Comment this out to suppress. Note that the Flask UI will define
 # this by itself, so don't specify it if you run through the UI.