Moved XxHash64 library to enable shared use across projects

Author: Zgoda91

settings.gradle

@@ -93,6 +93,7 @@ include ":grpc-inprocess"
 include ":grpc-util"
 include ":grpc-opentelemetry"
 include ":grpc-context-override-opentelemetry"
+include ":grpc-third-party:zero-allocation-hashing"
 
 project(':grpc-api').projectDir = "$rootDir/api" as File
 project(':grpc-core').projectDir = "$rootDir/core" as File
@@ -130,6 +131,7 @@ project(':grpc-inprocess').projectDir = "$rootDir/inprocess" as File
 project(':grpc-util').projectDir = "$rootDir/util" as File
 project(':grpc-opentelemetry').projectDir = "$rootDir/opentelemetry" as File
 project(':grpc-context-override-opentelemetry').projectDir = "$rootDir/contextstorage" as File
+project(':grpc-third-party:zero-allocation-hashing').projectDir = "$rootDir/third-party/zero-allocation-hashing" as File
 
 if (settings.hasProperty('skipCodegen') && skipCodegen.toBoolean()) {
     println '*** Skipping the build of codegen and compilation of proto files because skipCodegen=true'

third-party/zero-allocation-hashing/BUILD.bazel

@@ -0,0 +1,26 @@
+load("@rules_java//java:defs.bzl", "java_binary", "java_library", "java_test")
+
+java_library(
+    name = "zero-allocation-hashing",
+    srcs = [
+        "src/main/java/io/grpc/tp/zah/XxHash64.java",
+    ],
+    deps = [
+        "@maven//:com_google_guava_guava",
+    ],
+    visibility = [
+        "//xds:__pkg__",
+        "//util:__pkg__",
+    ],
+)
+
+java_test(
+    name = "XxHash64Test",
+    size = "small",
+    srcs = ["src/test/java/io/grpc/tp/zah/XxHash64Test.java"],
+    deps = [
+        ":zero-allocation-hashing",
+        "@maven//:com_google_guava_guava",
+        "@maven//:junit_junit",
+    ],
+)

xds/third_party/zero-allocation-hashing/LICENSE renamed to third-party/zero-allocation-hashing/LICENSE

@@ -0,0 +1,25 @@
+plugins {
+    id "java-library"
+}
+
+description = 'gRPC: Zero Allocation Hashing'
+
+dependencies {
+    implementation libraries.guava
+
+    testImplementation libraries.junit
+}
+
+tasks.named("jar").configure {
+    manifest {
+        attributes('Automatic-Module-Name': 'io.grpc.tp.zah')
+    }
+}
+
+tasks.named("checkstyleMain").configure {
+    enabled = false
+}
+
+tasks.named("checkstyleTest").configure {
+    enabled = false
+}

xds/third_party/zero-allocation-hashing/NOTICE renamed to third-party/zero-allocation-hashing/NOTICE

@@ -18,7 +18,7 @@
  * Modified by the gRPC Authors
  */
 
-package io.grpc.xds;
+package io.grpc.tp.zah;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -33,8 +33,8 @@
  * <a href="https://github.com/OpenHFT/Zero-Allocation-Hashing/blob/master/src/main/java/net/openhft/hashing/XxHash.java">
  * OpenHFT/Zero-Allocation-Hashing</a>.
  */
-final class XxHash64 {
-  static final XxHash64 INSTANCE = new XxHash64(0);
+final public class XxHash64 {
+  static public final XxHash64 INSTANCE = new XxHash64(0);
 
   // Primes if treated as unsigned
   private static final long P1 = -7046029288634856825L;
@@ -47,12 +47,12 @@ final class XxHash64 {
   private final long seed;
   private final long voidHash;
 
-  XxHash64(long seed) {
+  public XxHash64(long seed) {
     this.seed = seed;
     this.voidHash = finalize(seed + P5);
   }
 
-  long hashLong(long input) {
+  public long hashLong(long input) {
     input = byteOrder == ByteOrder.LITTLE_ENDIAN ? input : Long.reverseBytes(input);
     long hash = seed + P5 + 8;
     input *= P2;
@@ -63,15 +63,15 @@ long hashLong(long input) {
     return finalize(hash);
   }
 
-  long hashInt(int input) {
+  public long hashInt(int input) {
     input = byteOrder == ByteOrder.LITTLE_ENDIAN ? input : Integer.reverseBytes(input);
     long hash = seed + P5 + 4;
     hash ^= (input & 0xFFFFFFFFL) * P1;
     hash = Long.rotateLeft(hash, 23) * P2 + P3;
     return finalize(hash);
   }
 
-  long hashShort(short input) {
+  public long hashShort(short input) {
     input = byteOrder == ByteOrder.LITTLE_ENDIAN ? input : Short.reverseBytes(input);
     long hash = seed + P5 + 2;
     hash ^= (input & 0xFFL) * P5;
@@ -81,22 +81,22 @@ long hashShort(short input) {
     return finalize(hash);
   }
 
-  long hashChar(char input) {
+  public long hashChar(char input) {
     return hashShort((short) input);
   }
 
-  long hashByte(byte input) {
+  public long hashByte(byte input) {
     long hash = seed + P5 + 1;
     hash ^= (input & 0xFF) * P5;
     hash = Long.rotateLeft(hash, 11) * P1;
     return finalize(hash);
   }
 
-  long hashVoid() {
+  public long hashVoid() {
     return voidHash;
   }
 
-  long hashAsciiString(String input) {
+  public long hashAsciiString(String input) {
     ByteSupplier supplier = new AsciiStringByteSupplier(input);
     return hashBytes(supplier);
   }
@@ -106,7 +106,7 @@ long hashBytes(byte[] bytes) {
     return hashBytes(supplier);
   }
 
-  long hashBytes(byte[] bytes, int offset, int len) {
+  public long hashBytes(byte[] bytes, int offset, int len) {
     ByteSupplier supplier = new PlainByteSupplier(bytes, offset, len);
     return hashBytes(supplier);
   }

third-party/zero-allocation-hashing/build.gradle

@@ -18,7 +18,7 @@
  * Modified by the gRPC Authors
  */
 
-package io.grpc.xds;
+package io.grpc.tp.zah;
 
 import static org.junit.Assert.assertEquals;
 

xds/third_party/zero-allocation-hashing/main/java/io/grpc/xds/XxHash64.java renamed to third-party/zero-allocation-hashing/src/main/java/io/grpc/tp/zah/XxHash64.java

@@ -31,6 +31,7 @@ java_library(
         "//services:metrics",
         "//services:metrics_internal",
         "//stub",
+        "//third-party/zero-allocation-hashing",
         "//util",
         "@com_google_protobuf//:protobuf_java",
         "@com_google_protobuf//:protobuf_java_util",
@@ -73,7 +74,6 @@ java_binary(
     srcs = glob(
         [
             "src/main/java/**/*.java",
-            "third_party/zero-allocation-hashing/main/java/**/*.java",
         ],
         exclude = ["src/main/java/io/grpc/xds/orca/**"],
     ),

xds/third_party/zero-allocation-hashing/test/java/io/grpc/xds/XxHash64Test.java renamed to third-party/zero-allocation-hashing/src/test/java/io/grpc/tp/zah/XxHash64Test.java

@@ -13,9 +13,6 @@ description = "gRPC: XDS plugin"
 
 sourceSets {
     thirdparty {
-        java {
-            srcDir "${projectDir}/third_party/zero-allocation-hashing/main/java"
-        }
         proto {
             srcDir 'third_party/cel-spec/src/main/proto'
             srcDir 'third_party/envoy/src/main/proto'
@@ -27,11 +24,6 @@ sourceSets {
     main {
         output.classesDirs.from(sourceSets.thirdparty.output.classesDirs)
     }
-    test {
-        java {
-            srcDir "${projectDir}/third_party/zero-allocation-hashing/test/java"
-        }
-    }
 }
 
 configurations {
@@ -50,6 +42,7 @@ dependencies {
             project(':grpc-util'),
             project(':grpc-services'),
             project(':grpc-auth'),
+            project(':grpc-third-party:zero-allocation-hashing'),
             project(path: ':grpc-alts', configuration: 'shadow'),
             libraries.guava,
             libraries.gson,

xds/BUILD.bazel

@@ -39,6 +39,7 @@
 import io.grpc.Metadata;
 import io.grpc.Status;
 import io.grpc.SynchronizationContext;
+import io.grpc.tp.zah.XxHash64;
 import io.grpc.util.MultiChildLoadBalancer;
 import io.grpc.xds.ThreadSafeRandom.ThreadSafeRandomImpl;
 import io.grpc.xds.client.XdsLogger;