[accumulo-testing] branch main updated: Use non deprecated version of Hashing.murmur3_32() (#199)

[domgarguilo]

This is an automated email from the ASF dual-hosted git repository.

domgarguilo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo-testing.git


The following commit(s) were added to refs/heads/main by this push:
     new 62a9b06  Use non deprecated version of Hashing.murmur3_32() (#199)
62a9b06 is described below

commit 62a9b067d95721a55c3404bb1834d1acddde78ed
Author: Dom G <dominic.gargu...@gmail.com>
AuthorDate: Thu Mar 24 14:33:04 2022 -0400

    Use non deprecated version of Hashing.murmur3_32() (#199)
---
 src/main/java/org/apache/accumulo/testing/gcs/Persistence.java |  5 +++--
 .../testing/performance/tests/ConditionalMutationsPT.java      | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/apache/accumulo/testing/gcs/Persistence.java 
b/src/main/java/org/apache/accumulo/testing/gcs/Persistence.java
index 213e8fa..8d1d7ff 100644
--- a/src/main/java/org/apache/accumulo/testing/gcs/Persistence.java
+++ b/src/main/java/org/apache/accumulo/testing/gcs/Persistence.java
@@ -83,12 +83,13 @@ public class Persistence {
   }
 
   private String toHexWithHash(long l1, long l2) {
-    int hc = 
Hashing.murmur3_32().newHasher().putLong(l1).putLong(l2).hash().asInt();
+    int hc = 
Hashing.murmur3_32_fixed().newHasher().putLong(l1).putLong(l2).hash().asInt();
     return toHex(hc) + ":" + toHex(l1) + ":" + toHex(l2);
   }
 
   private String toHexWithHash(long l1, long l2, long l3) {
-    int hc = 
Hashing.murmur3_32().newHasher().putLong(l1).putLong(l2).putLong(l3).hash().asInt();
+    int hc = 
Hashing.murmur3_32_fixed().newHasher().putLong(l1).putLong(l2).putLong(l3).hash()
+        .asInt();
     return toHex(hc) + ":" + toHex(l1) + ":" + toHex(l2) + ":" + toHex(l3);
   }
 
diff --git 
a/src/main/java/org/apache/accumulo/testing/performance/tests/ConditionalMutationsPT.java
 
b/src/main/java/org/apache/accumulo/testing/performance/tests/ConditionalMutationsPT.java
index 39ca17f..efdf946 100644
--- 
a/src/main/java/org/apache/accumulo/testing/performance/tests/ConditionalMutationsPT.java
+++ 
b/src/main/java/org/apache/accumulo/testing/performance/tests/ConditionalMutationsPT.java
@@ -392,12 +392,12 @@ public class ConditionalMutationsPT implements 
PerformanceTest {
   }
 
   private static Mutation genRow(int row, int numCols) {
-    String r = String.format("%08x", 
Math.abs(Hashing.murmur3_32().hashInt(row).asInt()));
+    String r = String.format("%08x", 
Math.abs(Hashing.murmur3_32_fixed().hashInt(row).asInt()));
     Mutation m = new Mutation(r);
 
     for (int col = 0; col < numCols; col++) {
       String c = String.format("%04x",
-          Math.abs(Hashing.murmur3_32().hashInt(col).asInt() & 0xffff));
+          Math.abs(Hashing.murmur3_32_fixed().hashInt(col).asInt() & 0xffff));
       m.put("data", c, "1");
     }
     return m;
@@ -409,7 +409,7 @@ public class ConditionalMutationsPT implements 
PerformanceTest {
     BatchWriter bw = env.getClient().createBatchWriter(tableName, new 
BatchWriterConfig());
     numRows = numRows * 10;
     for (int row = 0; row < numRows; row++) {
-      String r = String.format("%08x", 
Math.abs(Hashing.murmur3_32().hashInt(row).asInt()));
+      String r = String.format("%08x", 
Math.abs(Hashing.murmur3_32_fixed().hashInt(row).asInt()));
       Mutation m = new Mutation(r);
       m.put("ntfy", "absfasf3", "");
       bw.addMutation(m);
@@ -419,7 +419,7 @@ public class ConditionalMutationsPT implements 
PerformanceTest {
 
   private static String randRow(Random rand, int numRows) {
     int row = rand.nextInt(numRows);
-    return String.format("%08x", 
Math.abs(Hashing.murmur3_32().hashInt(row).asInt()));
+    return String.format("%08x", 
Math.abs(Hashing.murmur3_32_fixed().hashInt(row).asInt()));
   }
 
   private static Collection<String> randCols(Random rand, int num, int 
numCols) {
@@ -427,7 +427,7 @@ public class ConditionalMutationsPT implements 
PerformanceTest {
     while (cols.size() < num) {
       int col = rand.nextInt(numCols);
       String c = String.format("%04x",
-          Math.abs(Hashing.murmur3_32().hashInt(col).asInt() & 0xffff));
+          Math.abs(Hashing.murmur3_32_fixed().hashInt(col).asInt() & 0xffff));
       cols.add(c);
     }
     return cols;