Removed all references to Memory.internal.
diff --git a/src/main/java/org/apache/datasketches/hash/XxHash.java b/src/main/java/org/apache/datasketches/hash/XxHash.java
index 27a96d2..397a325 100644
--- a/src/main/java/org/apache/datasketches/hash/XxHash.java
+++ b/src/main/java/org/apache/datasketches/hash/XxHash.java
@@ -40,12 +40,6 @@
* @author Lee Rhodes
*/
public class XxHash {
- // Unsigned, 64-bit primes
- private static final long P1 = -7046029288634856825L;
- private static final long P2 = -4417276706812531889L;
- private static final long P3 = 1609587929392839161L;
- private static final long P4 = -8796714831421723037L;
- private static final long P5 = 2870177450012600261L;
/**
* Compute the hash of the given Memory object.
@@ -67,24 +61,7 @@
* @return the hash
*/
public static long hash(final long in, final long seed) {
- long hash = seed + P5;
- hash += 8;
- long k1 = in;
- k1 *= P2;
- k1 = Long.rotateLeft(k1, 31);
- k1 *= P1;
- hash ^= k1;
- hash = (Long.rotateLeft(hash, 27) * P1) + P4;
- return finalize(hash);
- }
-
- private static long finalize(long hash) {
- hash ^= hash >>> 33;
- hash *= P2;
- hash ^= hash >>> 29;
- hash *= P3;
- hash ^= hash >>> 32;
- return hash;
+ return org.apache.datasketches.memory.XxHash.hashLong(in, seed);
}
}
diff --git a/src/main/java/org/apache/datasketches/tuple/Util.java b/src/main/java/org/apache/datasketches/tuple/Util.java
index 97b0319..46f2027 100644
--- a/src/main/java/org/apache/datasketches/tuple/Util.java
+++ b/src/main/java/org/apache/datasketches/tuple/Util.java
@@ -24,9 +24,10 @@
import static org.apache.datasketches.Util.ceilingPowerOf2;
import static org.apache.datasketches.Util.startingSubMultiple;
import static org.apache.datasketches.hash.MurmurHash3.hash;
+import static org.apache.datasketches.memory.XxHash.*;
import org.apache.datasketches.SketchesArgumentException;
-import org.apache.datasketches.memory.internal.XxHash64;
+
/**
* Common utility functions for Tuples
@@ -121,7 +122,7 @@
* @return the hash of the string
*/
public static long stringHash(final String s) {
- return XxHash64.hashChars(s.toCharArray(), 0, s.length(), PRIME);
+ return hashString(s, 0, s.length(), PRIME);
}
/**
@@ -130,7 +131,7 @@
*/
public static long stringArrHash(final String[] strArray) {
final String s = stringConcat(strArray);
- return XxHash64.hashChars(s.toCharArray(), 0, s.length(), PRIME);
+ return hashCharArr(s.toCharArray(), 0, s.length(), PRIME);
}
}
