This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch main21
in repository https://gitbox.apache.org/repos/asf/datasketches-java.git
The following commit(s) were added to refs/heads/main21 by this push:
new 3034a347 Changes to MurmurHash3v3 to *3v4
3034a347 is described below
commit 3034a347162efdb2fb75c18b231cf0c018920bea
Author: Lee Rhodes <[email protected]>
AuthorDate: Sat Feb 8 20:48:08 2025 -0800
Changes to MurmurHash3v3 to *3v4
---
...rmurHash3v3Test.java => MurmurHash3v4Test.java} | 72 +++++++++++-----------
1 file changed, 36 insertions(+), 36 deletions(-)
diff --git a/src/test/java/org/apache/datasketches/hash/MurmurHash3v3Test.java
b/src/test/java/org/apache/datasketches/hash/MurmurHash3v4Test.java
similarity index 83%
rename from src/test/java/org/apache/datasketches/hash/MurmurHash3v3Test.java
rename to src/test/java/org/apache/datasketches/hash/MurmurHash3v4Test.java
index 8699a091..6cd4d624 100644
--- a/src/test/java/org/apache/datasketches/hash/MurmurHash3v3Test.java
+++ b/src/test/java/org/apache/datasketches/hash/MurmurHash3v4Test.java
@@ -28,13 +28,13 @@ import static org.testng.Assert.fail;
import org.testng.annotations.Test;
import org.apache.datasketches.memory.Memory;
-import org.apache.datasketches.memory.internal.MurmurHash3v3;
+import org.apache.datasketches.memory.internal.MurmurHash3v4;
import org.apache.datasketches.memory.WritableMemory;
/**
* @author Lee Rhodes
*/
-public class MurmurHash3v3Test {
+public class MurmurHash3v4Test {
private Random rand = new Random();
private static final int trials = 1 << 20;
@@ -154,33 +154,33 @@ public class MurmurHash3v3Test {
}
private static final long[] hashV2(long[] key, long seed) {
- return MurmurHash3v3.hash(key, seed);
+ return MurmurHash3v4.hash(key, seed);
}
private static final long[] hashV2(int[] key2, long seed) {
- return MurmurHash3v3.hash(key2, seed);
+ return MurmurHash3v4.hash(key2, seed);
}
private static final long[] hashV2(char[] key, long seed) {
- return MurmurHash3v3.hash(key, seed);
+ return MurmurHash3v4.hash(key, seed);
}
private static final long[] hashV2(byte[] key, long seed) {
- return MurmurHash3v3.hash(key, seed);
+ return MurmurHash3v4.hash(key, seed);
}
//V2 single primitives
private static final long[] hashV2(long key, long seed, long[] out) {
- return MurmurHash3v3.hash(key, seed, out);
+ return MurmurHash3v4.hash(key, seed, out);
}
// private static final long[] hashV2(double key, long seed, long[] out) {
-// return MurmurHash3v3.hash(key, seed, out);
+// return MurmurHash3v4.hash(key, seed, out);
// }
// private static final long[] hashV2(String key, long seed, long[] out) {
-// return MurmurHash3v3.hash(key, seed, out);
+// return MurmurHash3v4.hash(key, seed, out);
// }
@@ -197,9 +197,9 @@ public class MurmurHash3v3Test {
WritableMemory wmem = WritableMemory.allocate(cap);
for (int i = 0; i < cap; i++) { wmem.putByte(i, (byte)(-128 + i)); }
- for (int offset = 0; offset < 16; offset++) {
+ for (int offset = 3; offset < 16; offset++) {
int arrLen = cap - offset;
- hash1 = MurmurHash3v3.hash(wmem, offset, arrLen, seed, hash1);
+ hash1 = MurmurHash3v4.hash(wmem, offset, arrLen, seed, hash1);
byte[] byteArr2 = new byte[arrLen];
wmem.getByteArray(offset, byteArr2, 0, arrLen);
hash2 = MurmurHash3.hash(byteArr2, seed);
@@ -222,8 +222,8 @@ public class MurmurHash3v3Test {
for (int i = 0; i < j; i++) { wmem.putByte(i, (byte) (-128 + i)); }
long[] hash1 = MurmurHash3.hash(in, 0);
- hash2 = MurmurHash3v3.hash(wmem, offset, bytes, seed, hash2);
- long[] hash3 = MurmurHash3v3.hash(in, seed);
+ hash2 = MurmurHash3v4.hash(wmem, offset, bytes, seed, hash2);
+ long[] hash3 = MurmurHash3v4.hash(in, seed);
assertEquals(hash1, hash2);
assertEquals(hash1, hash3);
@@ -246,8 +246,8 @@ public class MurmurHash3v3Test {
for (int i = 0; i < j; i++) { wmem.putInt(i, i); }
long[] hash1 = MurmurHash3.hash(in, 0);
- hash2 = MurmurHash3v3.hash(wmem, offset, bytes, seed, hash2);
- long[] hash3 = MurmurHash3v3.hash(in, seed);
+ hash2 = MurmurHash3v4.hash(wmem, offset, bytes, seed, hash2);
+ long[] hash3 = MurmurHash3v4.hash(in, seed);
assertEquals(hash1, hash2);
assertEquals(hash1, hash3);
@@ -270,8 +270,8 @@ public class MurmurHash3v3Test {
for (int i = 0; i < j; i++) { wmem.putInt(i, i); }
long[] hash1 = MurmurHash3.hash(in, 0);
- hash2 = MurmurHash3v3.hash(wmem, offset, bytes, seed, hash2);
- long[] hash3 = MurmurHash3v3.hash(in, seed);
+ hash2 = MurmurHash3v4.hash(wmem, offset, bytes, seed, hash2);
+ long[] hash3 = MurmurHash3v4.hash(in, seed);
assertEquals(hash1, hash2);
assertEquals(hash1, hash3);
@@ -294,8 +294,8 @@ public class MurmurHash3v3Test {
for (int i = 0; i < j; i++) { wmem.putLong(i, i); }
long[] hash1 = MurmurHash3.hash(in, 0);
- hash2 = MurmurHash3v3.hash(wmem, offset, bytes, seed, hash2);
- long[] hash3 = MurmurHash3v3.hash(in, seed);
+ hash2 = MurmurHash3v4.hash(wmem, offset, bytes, seed, hash2);
+ long[] hash3 = MurmurHash3v4.hash(in, seed);
assertEquals(hash1, hash2);
assertEquals(hash1, hash3);
@@ -313,8 +313,8 @@ public class MurmurHash3v3Test {
WritableMemory wmem = WritableMemory.writableWrap(in);
long[] hash1 = MurmurHash3.hash(in, 0);
- hash2 = MurmurHash3v3.hash(wmem, offset, bytes, seed, hash2);
- long[] hash3 = MurmurHash3v3.hash(in, seed);
+ hash2 = MurmurHash3v4.hash(wmem, offset, bytes, seed, hash2);
+ long[] hash3 = MurmurHash3v4.hash(in, seed);
assertEquals(hash1, hash2);
assertEquals(hash1, hash3);
@@ -325,57 +325,57 @@ public class MurmurHash3v3Test {
long seed = 123;
long[] hashOut = new long[2];
try {
- MurmurHash3v3.hash(Memory.wrap(new long[0]), 0, 0, seed, hashOut);
//mem empty
+ MurmurHash3v4.hash(Memory.wrap(new long[0]), 0, 0, seed, hashOut);
//mem empty
fail();
} catch (final IllegalArgumentException e) { } //OK
try {
String s = "";
- MurmurHash3v3.hash(s, seed, hashOut); //string empty
+ MurmurHash3v4.hash(s, seed, hashOut); //string empty
fail();
} catch (final IllegalArgumentException e) { } //OK
try {
String s = null;
- MurmurHash3v3.hash(s, seed, hashOut); //string null
+ MurmurHash3v4.hash(s, seed, hashOut); //string null
fail();
} catch (final IllegalArgumentException e) { } //OK
try {
byte[] barr = new byte[0];
- MurmurHash3v3.hash(barr, seed); //byte[] empty
+ MurmurHash3v4.hash(barr, seed); //byte[] empty
fail();
} catch (final IllegalArgumentException e) { } //OK
try {
byte[] barr = null;
- MurmurHash3v3.hash(barr, seed); //byte[] null
+ MurmurHash3v4.hash(barr, seed); //byte[] null
fail();
} catch (final IllegalArgumentException e) { } //OK
try {
char[] carr = new char[0];
- MurmurHash3v3.hash(carr, seed); //char[] empty
+ MurmurHash3v4.hash(carr, seed); //char[] empty
fail();
} catch (final IllegalArgumentException e) { } //OK
try {
char[] carr = null;
- MurmurHash3v3.hash(carr, seed); //char[] null
+ MurmurHash3v4.hash(carr, seed); //char[] null
fail();
} catch (final IllegalArgumentException e) { } //OK
try {
int[] iarr = new int[0];
- MurmurHash3v3.hash(iarr, seed); //int[] empty
+ MurmurHash3v4.hash(iarr, seed); //int[] empty
fail();
} catch (final IllegalArgumentException e) { } //OK
try {
int[] iarr = null;
- MurmurHash3v3.hash(iarr, seed); //int[] null
+ MurmurHash3v4.hash(iarr, seed); //int[] null
fail();
} catch (final IllegalArgumentException e) { } //OK
try {
long[] larr = new long[0];
- MurmurHash3v3.hash(larr, seed); //long[] empty
+ MurmurHash3v4.hash(larr, seed); //long[] empty
fail();
} catch (final IllegalArgumentException e) { } //OK
try {
long[] larr = null;
- MurmurHash3v3.hash(larr, seed); //long[] null
+ MurmurHash3v4.hash(larr, seed); //long[] null
fail();
} catch (final IllegalArgumentException e) { } //OK
}
@@ -385,9 +385,9 @@ public class MurmurHash3v3Test {
long seed = 123;
long[] hashOut = new long[2];
String s = "123";
- assertTrue(MurmurHash3v3.hash(s, seed, hashOut)[0] != 0);
+ assertTrue(MurmurHash3v4.hash(s, seed, hashOut)[0] != 0);
long v = 123;
- assertTrue(MurmurHash3v3.hash(v, seed, hashOut)[0] != 0);
+ assertTrue(MurmurHash3v4.hash(v, seed, hashOut)[0] != 0);
}
@Test
@@ -415,8 +415,8 @@ public class MurmurHash3v3Test {
WritableMemory wmem = WritableMemory.writableWrap(dataArr);
long[] hash1 = MurmurHash3.hash(dataArr, 0);
- hash2 = MurmurHash3v3.hash(wmem, offset, bytes, seed, hash2);
- long[] hash3 = MurmurHash3v3.hash(dbl, seed, hash2);
+ hash2 = MurmurHash3v4.hash(wmem, offset, bytes, seed, hash2);
+ long[] hash3 = MurmurHash3v4.hash(dbl, seed, hash2);
assertEquals(hash1, hash2);
assertEquals(hash1, hash3);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
