use threadlocal random generator to avoid contention

src/main/java/com/oltpbenchmark/benchmarks/auctionmark/AuctionMarkBenchmark.java

@@ -38,7 +38,7 @@ public class AuctionMarkBenchmark extends BenchmarkModule {
     private static final Logger LOG = LoggerFactory.getLogger(AuctionMarkBenchmark.class);
 
 
-    private final RandomGenerator rng = new RandomGenerator((int) System.currentTimeMillis());
+    private final RandomGenerator rng = new RandomGenerator();
 
     public AuctionMarkBenchmark(WorkloadConfiguration workConf) {
         super(workConf);

src/main/java/com/oltpbenchmark/benchmarks/chbenchmark/CHBenCHmarkLoader.java

@@ -40,7 +40,7 @@
 import java.util.concurrent.CountDownLatch;
 
 public class CHBenCHmarkLoader extends Loader<CHBenCHmark> {
-    private static final RandomGenerator ran = new RandomGenerator(0);
+    private static final RandomGenerator ran = new RandomGenerator();
 
 
     //create possible keys for n_nationkey ([a-zA-Z0-9])

src/main/java/com/oltpbenchmark/benchmarks/seats/SEATSBenchmark.java

@@ -31,7 +31,7 @@
 
 public class SEATSBenchmark extends BenchmarkModule {
 
-    private final RandomGenerator rng = new RandomGenerator((int) System.currentTimeMillis());
+    private final RandomGenerator rng = new RandomGenerator();
 
     public SEATSBenchmark(WorkloadConfiguration workConf) {
         super(workConf);

src/main/java/com/oltpbenchmark/benchmarks/tpcc/TPCCUtil.java

@@ -59,7 +59,7 @@ public static Customer newCustomerFromResults(ResultSet rs)
         return c;
     }
 
-    private static final RandomGenerator ran = new RandomGenerator(0);
+    private static final RandomGenerator ran = new RandomGenerator();
 
     public static String randomStr(int strLen) {
         if (strLen > 1) {

src/main/java/com/oltpbenchmark/benchmarks/tpch/TPCHWorker.java

@@ -34,7 +34,7 @@ public class TPCHWorker extends Worker<TPCHBenchmark> {
     public TPCHWorker(TPCHBenchmark benchmarkModule, int id) {
         super(benchmarkModule, id);
         this.rng().setSeed(15721);
-        rand = new RandomGenerator(this.rng().nextInt());
+        rand = new RandomGenerator();
     }
 
     @Override

src/main/java/com/oltpbenchmark/util/RandomGenerator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 by OLTPBenchmark Project
+ * Copyright 2023 by OLTPBenchmark Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,110 +16,147 @@
  */
 
 
-package com.oltpbenchmark.util;
-
-import java.util.Random;
-
-public class RandomGenerator extends Random {
-
-    /**
-     * Constructor
-     *
-     * @param seed
-     */
-    public RandomGenerator(int seed) {
-        super(seed);
-    }
-
-    /**
-     * Returns a random int value between minimum and maximum (inclusive)
-     *
-     * @param minimum
-     * @param maximum
-     * @returns a int in the range [minimum, maximum]. Note that this is inclusive.
-     */
-    public int number(int minimum, int maximum) {
-
-        int range_size = maximum - minimum + 1;
-        int value = this.nextInt(range_size);
-        value += minimum;
-
-        return value;
-    }
-
-    /**
-     * Returns a random long value between minimum and maximum (inclusive)
-     *
-     * @param minimum
-     * @param maximum
-     * @return
-     */
-    public long number(long minimum, long maximum) {
-
-        long range_size = (maximum - minimum) + 1;
-
-        // error checking and 2^x checking removed for simplicity.
-        long bits, val;
-        do {
-            bits = (this.nextLong() << 1) >>> 1;
-            val = bits % range_size;
-        }
-        while (bits - val + range_size < 0L);
-        val += minimum;
-
-
-        return val;
-    }
-
-    /**
-     * @param decimal_places
-     * @param minimum
-     * @param maximum
-     * @return
-     */
-    public double fixedPoint(int decimal_places, double minimum, double maximum) {
-
-
-        int multiplier = 1;
-        for (int i = 0; i < decimal_places; ++i) {
-            multiplier *= 10;
-        }
-
-        int int_min = (int) (minimum * multiplier + 0.5);
-        int int_max = (int) (maximum * multiplier + 0.5);
-
-        return (double) this.number(int_min, int_max) / (double) multiplier;
-    }
-
-    /**
-     * @returns a random alphabetic string with length in range [minimum_length, maximum_length].
-     */
-    public String astring(int minimum_length, int maximum_length) {
-        return randomString(minimum_length, maximum_length, 'a', 26);
-    }
-
-
-    /**
-     * @returns a random numeric string with length in range [minimum_length, maximum_length].
-     */
-    public String nstring(int minimum_length, int maximum_length) {
-        return randomString(minimum_length, maximum_length, '0', 10);
-    }
-
-    /**
-     * @param minimum_length
-     * @param maximum_length
-     * @param base
-     * @param numCharacters
-     * @return
-     */
-    private String randomString(int minimum_length, int maximum_length, char base, int numCharacters) {
-        int length = number(minimum_length, maximum_length);
-        byte baseByte = (byte) base;
-        byte[] bytes = new byte[length];
-        for (int i = 0; i < length; ++i) {
-            bytes[i] = (byte) (baseByte + number(0, numCharacters - 1));
-        }
-        return new String(bytes);
-    }
-}
+ package com.oltpbenchmark.util;
+
+ import java.util.concurrent.ThreadLocalRandom;
+
+ public class RandomGenerator extends java.util.Random {
+
+     /**
+      * Constructor
+      */
+     public RandomGenerator() {
+     }
+
+     @Override
+     protected int next(int bits) {
+         return ThreadLocalRandom.current().nextInt() >>> (32 - bits);
+     }
+
+     @Override
+     public int nextInt() {
+         return ThreadLocalRandom.current().nextInt();
+     }
+
+     @Override
+     public int nextInt(int bound) {
+         return ThreadLocalRandom.current().nextInt(bound);
+     }
+
+     @Override
+     public long nextLong() {
+         return ThreadLocalRandom.current().nextLong();
+     }
+
+     @Override
+     public boolean nextBoolean() {
+         return ThreadLocalRandom.current().nextBoolean();
+     }
+
+     @Override
+     public float nextFloat() {
+         return ThreadLocalRandom.current().nextFloat();
+     }
+
+     @Override
+     public double nextDouble() {
+         return ThreadLocalRandom.current().nextDouble();
+     }
+
+     @Override
+     public double nextGaussian() {
+         return ThreadLocalRandom.current().nextGaussian();
+     }
+
+     /**
+      * Returns a random int value between minimum and maximum (inclusive)
+      *
+      * @param minimum
+      * @param maximum
+      * @returns a int in the range [minimum, maximum]. Note that this is inclusive.
+      */
+     public int number(int minimum, int maximum) {
+
+         int range_size = maximum - minimum + 1;
+         int value = ThreadLocalRandom.current().nextInt(range_size);
+         value += minimum;
+
+         return value;
+     }
+
+     /**
+      * Returns a random long value between minimum and maximum (inclusive)
+      *
+      * @param minimum
+      * @param maximum
+      * @return
+      */
+     public long number(long minimum, long maximum) {
+
+         long range_size = (maximum - minimum) + 1;
+
+         // error checking and 2^x checking removed for simplicity.
+         long bits, val;
+         do {
+             bits = (ThreadLocalRandom.current().nextLong() << 1) >>> 1;
+             val = bits % range_size;
+         }
+         while (bits - val + range_size < 0L);
+         val += minimum;
+
+
+         return val;
+     }
+
+     /**
+      * @param decimal_places
+      * @param minimum
+      * @param maximum
+      * @return
+      */
+     public double fixedPoint(int decimal_places, double minimum, double maximum) {
+
+
+         int multiplier = 1;
+         for (int i = 0; i < decimal_places; ++i) {
+             multiplier *= 10;
+         }
+
+         int int_min = (int) (minimum * multiplier + 0.5);
+         int int_max = (int) (maximum * multiplier + 0.5);
+
+         return (double) this.number(int_min, int_max) / (double) multiplier;
+     }
+
+     /**
+      * @returns a random alphabetic string with length in range [minimum_length, maximum_length].
+      */
+     public String astring(int minimum_length, int maximum_length) {
+         return randomString(minimum_length, maximum_length, 'a', 26);
+     }
+
+
+     /**
+      * @returns a random numeric string with length in range [minimum_length, maximum_length].
+      */
+     public String nstring(int minimum_length, int maximum_length) {
+         return randomString(minimum_length, maximum_length, '0', 10);
+     }
+
+     /**
+      * @param minimum_length
+      * @param maximum_length
+      * @param base
+      * @param numCharacters
+      * @return
+      */
+     private String randomString(int minimum_length, int maximum_length, char base, int numCharacters) {
+         int length = number(minimum_length, maximum_length);
+         byte baseByte = (byte) base;
+         byte[] bytes = new byte[length];
+         for (int i = 0; i < length; ++i) {
+             bytes[i] = (byte) (baseByte + number(0, numCharacters - 1));
+         }
+         return new String(bytes);
+     }
+ }

src/test/java/com/oltpbenchmark/benchmarks/auctionmark/TestAuctionMarkLoader.java

@@ -58,7 +58,7 @@ public void testSaveLoadProfile() throws Exception {
         assertNotNull(orig);
         assertFalse(orig.users_per_itemCount.isEmpty());
 
-        AuctionMarkProfile copy = new AuctionMarkProfile(this.benchmark, new RandomGenerator(0));
+        AuctionMarkProfile copy = new AuctionMarkProfile(this.benchmark, new RandomGenerator());
         assertTrue(copy.users_per_itemCount.isEmpty());
 
         List<Worker<?>> workers = this.benchmark.makeWorkers();

src/test/java/com/oltpbenchmark/benchmarks/auctionmark/util/TestUserIdGenerator.java

@@ -47,7 +47,7 @@ public class TestUserIdGenerator {
 
     private static final int NUM_CLIENTS = 10;
     private static final int NUM_USERS = 1000;
-    private static final RandomGenerator rand = new RandomGenerator(0); // (int)System.currentTimeMillis());
+    private static final RandomGenerator rand = new RandomGenerator();
 
     private static final Zipf randomNumItems = new Zipf(rand,
             AuctionMarkConstants.ITEM_ITEMS_PER_SELLER_MIN,

src/test/java/com/oltpbenchmark/util/TestCollectionUtil.java

@@ -117,7 +117,7 @@ public void testGetFirst() {
     @Test
     public void testPop() {
         String[] expected = new String[11];
-        RandomGenerator rng = new RandomGenerator(0);
+        RandomGenerator rng = new RandomGenerator();
         for (int i = 0; i < expected.length; i++) {
             expected[i] = rng.astring(1, 32);
         } // FOR