From 2a7406e0fa0dde947cdb6b4da43bb8b117dee99d Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Wed, 17 Jun 2020 13:32:57 -0500
Subject: [PATCH] #162 Allow hash range functions to span single value ranges

---
 .../basics/shared/from_long/to_int/HashRange.java      |  7 +++----
 .../basics/shared/from_long/to_long/HashRange.java     | 10 ++++++----
 .../library/basics/shared/unary_int/HashRange.java     |  7 +++----
 .../library/basics/tests/long_long/HashRangeTest.java  |  7 +++++++
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashRange.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashRange.java
index fa4790eaa..dcc3fd8df 100644
--- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashRange.java
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashRange.java
@@ -21,12 +21,11 @@ public class HashRange implements LongToIntFunction {
 
     @Example({"HashRange(35L,39L)","map the input to a number in the range 35-38, inclusive, of type int"})
     public HashRange(int minValue, int maxValue) {
-        this.minValue = minValue;
-
-        if (maxValue<=minValue) {
+        if (maxValue<minValue) {
             throw new RuntimeException("HashRange must have min and max value in that order.");
         }
-        this.width = maxValue - minValue;
+        this.minValue = minValue;
+        this.width = (maxValue - minValue) +1;
     }
 
     @Override
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRange.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRange.java
index b5218bb5c..bdd9f0f40 100644
--- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRange.java
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRange.java
@@ -8,6 +8,9 @@ import java.util.function.LongUnaryOperator;
  * Return a value within a range, pseudo-randomly. This is equivalent to
  * returning a value with in range between 0 and some maximum value, but
  * with a minimum value added.
+ *
+ * You can specify hash ranges as small as a single-element range, like
+ * (5,5), or as wide as the relevant data type allows.
  */
 @ThreadSafeMapper
 public class HashRange implements LongUnaryOperator {
@@ -22,12 +25,11 @@ public class HashRange implements LongUnaryOperator {
     }
 
     public HashRange(long minValue, long maxValue) {
-        this.minValue = minValue;
-
-        if (maxValue<=minValue) {
+        if (maxValue<minValue) {
             throw new RuntimeException("HashRange must have min and max value in that order.");
         }
-        this.width = maxValue - minValue;
+        this.minValue = minValue;
+        this.width = (maxValue - minValue)+1;
     }
 
     @Override
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/HashRange.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/HashRange.java
index 2d031b164..78daf37a8 100644
--- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/HashRange.java
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/HashRange.java
@@ -17,12 +17,11 @@ public class HashRange implements IntUnaryOperator {
     }
 
     public HashRange(int minValue, int maxValue) {
-        this.minValue = minValue;
-
-        if (maxValue<=minValue) {
+        if (maxValue<minValue) {
             throw new RuntimeException("HashRange must have min and max value in that order.");
         }
-        this.width = maxValue - minValue;
+        this.minValue = minValue;
+        this.width = (maxValue - minValue) +1;
     }
 
     @Override
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/HashRangeTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/HashRangeTest.java
index e8124ee16..2c684f013 100644
--- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/HashRangeTest.java
+++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/HashRangeTest.java
@@ -13,4 +13,11 @@ public class HashRangeTest {
         assertThat(hashRange.applyAsLong(32L)).isEqualTo(11L);
     }
 
+    @Test
+    public void testSingleElementRange() {
+        HashRange hashRange = new HashRange(33L,33L);
+        long l = hashRange.applyAsLong(93874L);
+        assertThat(l).isEqualTo(33L);
+    }
+
 }
\ No newline at end of file