From b35426c39034057521f63c75e81c271c22fb0b56 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Fri, 17 Jul 2020 18:40:51 -0500
Subject: [PATCH] always hash input for hashed collection functions

---
 .../basics/shared/from_long/to_collection/ListHashed.java       | 2 +-
 .../basics/shared/from_long/to_collection/MapHashed.java        | 2 +-
 .../basics/shared/from_long/to_collection/MapSizedHashed.java   | 2 +-
 .../basics/shared/from_long/to_collection/SetHashed.java        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListHashed.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListHashed.java
index c8cec84ab..f9090cfe3 100644
--- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListHashed.java
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListHashed.java
@@ -45,9 +45,9 @@ public class ListHashed implements LongFunction<List<Object>> {
         long hash = value;
         List<Object> list = new ArrayList<>(size);
         for (int i = 0; i < size; i++) {
+            hash = hasher.applyAsLong(hash);
             int selector = Math.min(i, valueFuncs.size() - 1);
             LongFunction<?> func = valueFuncs.get(selector);
-            hash = hasher.applyAsLong(hash);
             list.add(func.apply(hash));
         }
         return list;
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapHashed.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapHashed.java
index 57e26218c..1587743ac 100644
--- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapHashed.java
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapHashed.java
@@ -48,9 +48,9 @@ public class MapHashed implements LongFunction<java.util.Map<Object,Object>> {
 
         java.util.Map<Object,Object> map = new HashMap<>(size);
         for (int i = 0; i < size; i++) {
+            hash = hasher.applyAsLong(hash);
             int keySelector = Math.min(i, keyFuncs.size() - 1);
             int valSelector = Math.min(i, valueFuncs.size() -1);
-            hash = hasher.applyAsLong(hash);
 
             Object keyObject = keyFuncs.get(keySelector).apply(hash);
             Object valueObject = valueFuncs.get(valSelector).apply(hash);
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapSizedHashed.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapSizedHashed.java
index 5b12071e4..08a85d97a 100644
--- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapSizedHashed.java
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapSizedHashed.java
@@ -54,9 +54,9 @@ public class MapSizedHashed implements LongFunction<java.util.Map<Object,Object>
 
         java.util.Map<Object,Object> map = new HashMap<>(size);
         for (int i = 0; i < size; i++) {
+            hash = hasher.applyAsLong(hash);
             int keySelector = Math.min(i, keyFuncs.size() - 1);
             int valSelector = Math.min(i, valueFuncs.size() -1);
-            hash = hasher.applyAsLong(hash);
 
             Object keyObject = keyFuncs.get(keySelector).apply(hash);
             Object valueObject = valueFuncs.get(valSelector).apply(hash);
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetHashed.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetHashed.java
index 7794973d6..10eadeb36 100644
--- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetHashed.java
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetHashed.java
@@ -42,9 +42,9 @@ public class SetHashed implements LongFunction<java.util.Set<Object>> {
         long hash = value;
         java.util.Set<Object> list = new HashSet<>(size);
         for (int i = 0; i < size; i++) {
+            hash = hasher.applyAsLong(hash);
             int selector = Math.min(i, valueFuncs.size() - 1);
             LongFunction<?> func = valueFuncs.get(selector);
-            hash = hasher.applyAsLong(hash);
             list.add(func.apply(hash));
         }
         return list;