Merge pull request #1945 from yabinmeng/main

Add sizing function as parameter to AlphaNumericString()
nosqlbench · May 10, 2024 · 64a2886 · 64a2886
2 parents 3db1504 + fcc6355
commit 64a2886
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 9 deletions.
diff --git a/nb-adapters/adapter-s4j/pom.xml b/nb-adapters/adapter-s4j/pom.xml
@@ -37,7 +37,7 @@
     </description>
 
     <properties>
-        <s4j.version>4.1.2-alpha</s4j.version>
+        <s4j.version>4.1.3-alpha</s4j.version>
     </properties>
 
     <dependencies>

diff --git a/.../io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/AlphaNumericString.java b/.../io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/AlphaNumericString.java
@@ -18,10 +18,13 @@
 
 import io.nosqlbench.virtdata.api.annotations.Categories;
 import io.nosqlbench.virtdata.api.annotations.Category;
+import io.nosqlbench.virtdata.api.annotations.Example;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
+import io.nosqlbench.virtdata.api.bindings.VirtDataConversions;
 import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.Hash;
 
 import java.util.function.LongFunction;
+import java.util.function.LongToIntFunction;
 
 /**
  * Create an alpha-numeric string of the specified length, character-by-character.
@@ -32,20 +35,39 @@ public class AlphaNumericString implements LongFunction<String> {
     private static final String AVAILABLE_CHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
     private final ThreadLocal<StringBuilder> threadStringBuilder = ThreadLocal.withInitial(StringBuilder::new);
     private final Hash hash = new Hash();
-    private final int length;
+    private final LongToIntFunction lengthFunc;
 
-    public AlphaNumericString(int length)
-    {
-        if (length < 0)
-        {
-            throw new RuntimeException("AlphaNumericString must have length >= 0");
+    @Example({
+        "AlphaNumericString(10)",
+        "Create a 10-character alpha-numeric string"
+    })
+    @Example({
+        "AlphaNumericString(HashRange(10, 20))",
+        "Create an alpha-numeric string with a length between 10 and 20 characters"
+    })
+    public AlphaNumericString(int length) {
+        this.lengthFunc = l -> length;
+    }
+
+    public AlphaNumericString(Object lengthfunc) {
+        if (lengthfunc instanceof Number) {
+            int length = ((Number) lengthfunc).intValue();
+            this.lengthFunc = l -> length;
+        }
+        else {
+            this.lengthFunc = VirtDataConversions.adaptFunction(lengthfunc, LongToIntFunction.class);
         }
-        this.length = length;
     }
 
     @Override
     public String apply(long operand)
     {
+        int length = lengthFunc.applyAsInt(operand);
+        if (length < 0)
+        {
+            throw new RuntimeException("AlphaNumericString must have length >= 0");
+        }
+
         long hashValue = operand;
         StringBuilder sb = threadStringBuilder.get();
         sb.setLength(0);
@@ -61,6 +83,6 @@ public String apply(long operand)
     @Override
     public String toString()
     {
-        return "AlphaNumericString(length=" + length + ")";
+        return "AlphaNumericString(lengthFunc.class=" + lengthFunc.getClass().getSimpleName() + ")";
     }
 }