Cleanup benchmarks

Author: JonasKunz

benchmarks/src/main/java/org/elasticsearch/benchmark/exponentialhistogram/ExponentialHistogramGenerationBench.java

@@ -32,6 +32,7 @@
 import java.util.Random;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
+import java.util.function.DoubleSupplier;
 import java.util.function.Supplier;
 
 @BenchmarkMode(Mode.AverageTime)
@@ -54,36 +55,36 @@ public class ExponentialHistogramGenerationBench {
 
     double[] data = new double[1000000];
 
+    int index;
+
     @Setup
     public void setUp() {
         random = ThreadLocalRandom.current();
         histoGenerator = new ExponentialHistogramGenerator(bucketCount);
 
-        Supplier<Double> nextRandom = () -> distribution.equals("GAUSSIAN") ? random.nextGaussian() : random.nextDouble();
+        DoubleSupplier nextRandom = () -> distribution.equals("GAUSSIAN") ? random.nextGaussian() : random.nextDouble();
 
         // Make sure that we start with a non-empty histogram, as this distorts initial additions
         for (int i = 0; i < 10000; ++i) {
-            histoGenerator.add(nextRandom.get());
+            histoGenerator.add(nextRandom.getAsDouble());
         }
 
         for (int i = 0; i < data.length; ++i) {
-            data[i] = nextRandom.get();
+            data[i] = nextRandom.getAsDouble();
         }
-    }
 
-    @State(Scope.Thread)
-    public static class ThreadState {
-        int index = 0;
+        index = 0;
     }
 
+
     @Benchmark
     @BenchmarkMode(Mode.AverageTime)
     @OutputTimeUnit(TimeUnit.MICROSECONDS)
-    public void add(ThreadState state) {
-        if (state.index >= data.length) {
-            state.index = 0;
+    public void add() {
+        if (index >= data.length) {
+            index = 0;
         }
-        histoGenerator.add(data[state.index++]);
+        histoGenerator.add(data[index++]);
     }
 
     public static void main(String[] args) throws RunnerException {

benchmarks/src/main/java/org/elasticsearch/benchmark/exponentialhistogram/ExponentialHistogramMergeBench.java

@@ -40,7 +40,7 @@
 @State(Scope.Thread)
 public class ExponentialHistogramMergeBench {
 
-    @Param({ "1000", "5000" })
+    @Param({ "1000", "2000", "5000" })
     int bucketCount;
 
     @Param({ "0.01", "0.1", "0.25", "0.5", "1.0", "2.0" })
@@ -51,6 +51,8 @@ public class ExponentialHistogramMergeBench {
 
     ExponentialHistogram[] toMerge = new ExponentialHistogram[10_000];
 
+    int index;
+
     @Setup
     public void setUp() {
         random = ThreadLocalRandom.current();
@@ -83,6 +85,8 @@ public void setUp() {
                 throw new IllegalArgumentException("Expected bucket count to be " + dataPointSize + ", but was " + cnt);
             }
         }
+
+        index = 0;
     }
 
     private static int getBucketCount(ExponentialHistogram histo) {
@@ -96,18 +100,13 @@ private static int getBucketCount(ExponentialHistogram histo) {
         return cnt;
     }
 
-    @State(Scope.Thread)
-    public static class ThreadState {
-        int index = 0;
-    }
-
     @Benchmark
     @BenchmarkMode(Mode.AverageTime)
     @OutputTimeUnit(TimeUnit.MICROSECONDS)
-    public void add(ThreadState state) {
-        if (state.index >= toMerge.length) {
-            state.index = 0;
+    public void add() {
+        if (index >= toMerge.length) {
+            index = 0;
         }
-        histoMerger.add(toMerge[state.index++]);
+        histoMerger.add(toMerge[index++]);
     }
 }