Feat: Support for Distributions in Templated Workloads

data/templated/example.xml

@@ -10,10 +10,10 @@
       </types>
       <values>
          <value dist="uniform" min="1" max="3"/>
-         <value dist="zipfian" min="1"/>
+         <value dist="zipfian" min="1" max="2"/>
       </values>
        <values>
-         <value dist="scrambled" seed="999"/>
+         <value dist="scrambled" min="0" max="4" seed="999"/>
          <value dist="normal" min="1" max="3" seed="1"/>
       </values>
    </template>
@@ -54,7 +54,7 @@
       </types>
       <values>
          <value dist="normal" min="10" max="12.5"/>
-         <value dist="uniform" min="15.1"/>
+         <value dist="uniform" min="15.1" max="100.22"/>
       </values>
       <values>
          <value>10.50</value>
@@ -106,9 +106,9 @@
          <value>1</value>
          <value>1</value>
          <value>1</value>
-         <value dist="uniform" min="1674477220000" max="1706013220000"/>
+         <value dist="uniform" min="1999-12-12 01:01:55" max="1706013220000"/>
          <value dist="normal" min="0.5" max="12.5"/>
-         <value dist="uniform" max="23"/>
+         <value dist="uniform" min="0" max="23"/>
       </values>
    </template>
 </templates>

src/main/java/com/oltpbenchmark/benchmarks/templated/README.md

@@ -73,7 +73,7 @@ Each time the query is run, a different value will substitute the `?`.
             <value dist="uniform" min="0" max="1000" seed="1"/>
         </values>
          <values>
-            <value dist="zipf" max="1000" seed="1"/>
+            <value dist="zipf" min="0" max="1000" seed="1"/>
         </values>
     </template>
     <!-- ... -->
@@ -93,17 +93,17 @@ The distributions are dependent on the type of the value. Currently, the followi
 The following properties can be set on the value:
 
 -   `dist`: The distribution of the values
--   `min`: The minimum value the generator can produce. Defaults to 0
--   `max`: The maximum value the generator can produce. Defaults to 1
--   `seed`: A seed for the generator to ensure consistency
+-   `min`: The minimum value the generator can produce.
+-   `max`: The maximum value the generator can produce.
+-   `seed`: A seed for the generator to ensure consistency. Default is 0
 
-*NOTE:* For `Timestamp`, `Date`, and `Time` types, the min and max values must be converted to UNIX time (milliseconds).
+*NOTE:* For `Timestamp`, `Date`, and `Time` types, the min and max values must be converted to UNIX time (milliseconds) OR given as strings in the following format: (yyyy-MM-dd HH:mm:ss).
 The value is interpreted as the milliseconds since January 1, 1970, 00:00:00 GMT/UTC.
 ```xml
 <value 
     dist="uniform" 
-    min="1674477220000" // Mon Jan 23 2023 12:33:40 
-    max="1706013220000" // Tue Jan 23 2024 12:33:40 
+    min="2023-01-23 12:33:40" // Mon Jan 23 2023 12:33:40 
+    max="1706013220000"       // Tue Jan 23 2024 12:33:40 
     seed="0"
 />
 ```

src/main/java/com/oltpbenchmark/benchmarks/templated/TemplatedBenchmark.java

@@ -184,11 +184,14 @@ private CustomClassLoader loadQueryTemplates(String file) {
 
       for (TemplateType template : templates.getTemplateList()) {
         ImmutableParsedQueryTemplate.Builder b = ImmutableParsedQueryTemplate.builder();
+        List<String> templateTypes = template.getTypes().getTypeList();
+
         b.name(template.getName());
         b.query(template.getQuery());
-        b.paramsTypes(template.getTypes().getTypeList());
+        b.paramsTypes(templateTypes);
 
         for (ValuesType paramValue : template.getValuesList()) {
+          int typeIndex = 0;
           for (ValueType value : paramValue.getValueList()) {
             /* Lightweight constructor used if no distribution is present */
             if (value.getDist() == null
@@ -198,8 +201,13 @@ private CustomClassLoader loadQueryTemplates(String file) {
             } else {
               b.addParamsValues(
                   new TemplatedValue(
-                      value.getDist(), value.getMin(), value.getMax(), value.getSeed()));
+                      value.getDist(),
+                      value.getMin(),
+                      value.getMax(),
+                      value.getSeed(),
+                      templateTypes.get(typeIndex)));
             }
+            typeIndex++;
           }
         }
 
@@ -274,6 +282,10 @@ private String buildTemplatedValueString(List<TemplatedValue> params) {
                 + "\""
                 + param.getSeed()
                 + "\""
+                + ","
+                + "\""
+                + param.getValueType()
+                + "\""
                 + "),";
       } else {
         result +=

src/main/java/com/oltpbenchmark/benchmarks/templated/procedures/GenericQuery.java

@@ -117,7 +117,7 @@ public PreparedStatement getStatement(Connection conn, List<TemplatedValue> para
                 generatedInt = param.getNextLongScrambled().intValue();
                 break;
               default:
-                throw param.createRuntimeException(paramType);
+                throw param.createRuntimeException();
             }
             stmt.setInt(i + 1, generatedInt);
             break;
@@ -132,7 +132,7 @@ public PreparedStatement getStatement(Connection conn, List<TemplatedValue> para
                 generatedFloat = param.getNextFloatBinomial();
                 break;
               default:
-                throw param.createRuntimeException(paramType);
+                throw param.createRuntimeException();
             }
             stmt.setFloat(i + 1, generatedFloat);
             break;
@@ -152,7 +152,7 @@ public PreparedStatement getStatement(Connection conn, List<TemplatedValue> para
                 generatedLong = param.getNextLongScrambled();
                 break;
               default:
-                throw param.createRuntimeException(paramType);
+                throw param.createRuntimeException();
             }
             stmt.setLong(i + 1, generatedLong);
             break;
@@ -162,7 +162,7 @@ public PreparedStatement getStatement(Connection conn, List<TemplatedValue> para
                 stmt.setString(i + 1, param.getNextString());
                 break;
               default:
-                throw param.createRuntimeException(paramType);
+                throw param.createRuntimeException();
             }
             break;
           case TIMESTAMP:
@@ -183,7 +183,7 @@ public PreparedStatement getStatement(Connection conn, List<TemplatedValue> para
                 generatedTimestamp = param.getNextLongScrambled();
                 break;
               default:
-                throw param.createRuntimeException(paramType);
+                throw param.createRuntimeException();
             }
             if (paramType == JDBCSupportedType.TIMESTAMP) {
               stmt.setTimestamp(i + 1, new Timestamp(generatedTimestamp));