Enable rate to be < 1. (#310)

Co-authored-by: Andy Pavlo <[email protected]>

Author: mbutrovich

src/main/java/com/oltpbenchmark/DBWorkload.java

@@ -277,7 +277,7 @@ public static void main(String[] args) throws Exception {
                     weight_strings = Arrays.asList(work.getString("weights[not(@bench)]").split("\\s*,\\s*"));
                 }
 
-                int rate = 1;
+                double rate = 1;
                 boolean rateLimited = true;
                 boolean disabled = false;
                 boolean timed;
@@ -295,9 +295,9 @@ public static void main(String[] args) throws Exception {
                     System.exit(-1);
                 } else {
                     try {
-                        rate = Integer.parseInt(rate_string);
-                        if (rate < 1) {
-                            LOG.error("Rate limit must be at least 1. Use unlimited or disabled values instead.");
+                        rate = Double.parseDouble(rate_string);
+                        if (rate <= 0) {
+                            LOG.error("Rate limit must be at least 0. Use unlimited or disabled values instead.");
                             System.exit(-1);
                         }
                     } catch (NumberFormatException e) {

src/main/java/com/oltpbenchmark/Phase.java

@@ -33,7 +33,7 @@ public enum Arrival {
     private final int id;
     private final int time;
     private final int warmupTime;
-    private final int rate;
+    private final double rate;
     private final Arrival arrival;
 
 
@@ -47,7 +47,7 @@ public enum Arrival {
     private int nextSerial;
 
 
-    Phase(String benchmarkName, int id, int t, int wt, int r, List<Double> weights, boolean rateLimited, boolean disabled, boolean serial, boolean timed, int activeTerminals, Arrival a) {
+    Phase(String benchmarkName, int id, int t, int wt, double r, List<Double> weights, boolean rateLimited, boolean disabled, boolean serial, boolean timed, int activeTerminals, Arrival a) {
         this.benchmarkName = benchmarkName;
         this.id = id;
         this.time = t;
@@ -114,7 +114,7 @@ public int getWarmupTime() {
         return warmupTime;
     }
 
-    public int getRate() {
+    public double getRate() {
         return rate;
     }
 

src/main/java/com/oltpbenchmark/ThreadBench.java

@@ -118,7 +118,7 @@ private Results runRateLimitedMultiPhase() {
         long warmup = warmupStart;
         long measureEnd = -1;
         // used to determine the longest sleep interval
-        int lowestRate = Integer.MAX_VALUE;
+        double lowestRate = Double.MAX_VALUE;
 
         Phase phase = null;
 
@@ -166,7 +166,7 @@ private Results runRateLimitedMultiPhase() {
 
             for (WorkloadState workState : workStates) {
                 if (workState.getCurrentPhase() != null) {
-                    rateFactor = workState.getCurrentPhase().getRate() / lowestRate;
+                    rateFactor = (int) (workState.getCurrentPhase().getRate() / lowestRate);
                 } else {
                     rateFactor = 1;
                 }
@@ -345,12 +345,12 @@ private Results runRateLimitedMultiPhase() {
         }
     }
 
-    private long getInterval(int lowestRate, Phase.Arrival arrival) {
+    private long getInterval(double lowestRate, Phase.Arrival arrival) {
         // TODO Auto-generated method stub
         if (arrival == Phase.Arrival.POISSON) {
             return (long) ((-Math.log(1 - Math.random()) / lowestRate) * 1000000000.);
         } else {
-            return (long) (1000000000. / (double) lowestRate + 0.5);
+            return (long) (1000000000. / lowestRate + 0.5);
         }
     }
 

src/main/java/com/oltpbenchmark/WorkloadConfiguration.java

@@ -148,7 +148,7 @@ public void initializeState(BenchmarkState benchmarkState) {
         this.workloadState = new WorkloadState(benchmarkState, phases, terminals);
     }
 
-    public void addPhase(int id, int time, int warmup, int rate, List<Double> weights, boolean rateLimited, boolean disabled, boolean serial, boolean timed, int active_terminals, Phase.Arrival arrival) {
+    public void addPhase(int id, int time, int warmup, double rate, List<Double> weights, boolean rateLimited, boolean disabled, boolean serial, boolean timed, int active_terminals, Phase.Arrival arrival) {
         phases.add(new Phase(benchmarkName, id, time, warmup, rate, weights, rateLimited, disabled, serial, timed, active_terminals, arrival));
     }