hash config to a long

Author: sergiitk

xds/src/main/java/io/grpc/xds/RlqsFilterConfig.java

@@ -35,9 +35,11 @@ public final String typeUrl() {
 
   public abstract String domain();
 
+  // TODO(sergiitk): make not nullable, introduce RlqsFilterConfigOverride
   @Nullable
   public abstract GrpcService rlqsService();
 
+  // TODO(sergiitk): make not nullable, introduce RlqsFilterConfigOverride
   @Nullable
   public abstract Matcher<HttpMatchInput, RlqsBucketSettings> bucketMatchers();
 

xds/src/main/java/io/grpc/xds/internal/rlqs/RlqsCache.java

@@ -24,6 +24,7 @@
 import io.grpc.SynchronizationContext;
 import io.grpc.xds.RlqsFilterConfig;
 import io.grpc.xds.client.Bootstrapper.RemoteServerInfo;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledExecutorService;
@@ -41,7 +42,7 @@ public final class RlqsCache {
     throw new RlqsPoolSynchronizationException(message, error);
   });
 
-  private final ConcurrentHashMap<String, RlqsEngine> enginePool = new ConcurrentHashMap<>();
+  private final ConcurrentHashMap<Long, RlqsEngine> enginePool = new ConcurrentHashMap<>();
   Set<String> enginesToShutdown = Sets.newConcurrentHashSet();
   private final ScheduledExecutorService scheduler;
 
@@ -65,7 +66,7 @@ public void shutdown() {
       shutdown = true;
       logger.log(Level.FINER, "Shutting down RlqsCache");
       enginesToShutdown.clear();
-      for (String configHash : enginePool.keySet()) {
+      for (long configHash : enginePool.keySet()) {
         enginePool.get(configHash).shutdown();
       }
       enginePool.clear();
@@ -78,11 +79,11 @@ public void shutdownRlqsEngine(RlqsFilterConfig oldConfig) {
   }
 
   public RlqsEngine getOrCreateRlqsEngine(final RlqsFilterConfig config) {
-    String configHash = hashRlqsFilterConfig(config);
+    long configHash = hashRlqsFilterConfig(config);
     return enginePool.computeIfAbsent(configHash, k -> newRlqsEngine(k, config));
   }
 
-  private RlqsEngine newRlqsEngine(String configHash, RlqsFilterConfig config) {
+  private RlqsEngine newRlqsEngine(long configHash, RlqsFilterConfig config) {
     // TODO(sergiitk): [IMPL] get channel creds from the bootstrap.
     ChannelCredentials creds = InsecureChannelCredentials.create();
     return new RlqsEngine(
@@ -93,11 +94,13 @@ private RlqsEngine newRlqsEngine(String configHash, RlqsFilterConfig config) {
         scheduler);
   }
 
-  private String hashRlqsFilterConfig(RlqsFilterConfig config) {
+  private long hashRlqsFilterConfig(RlqsFilterConfig config) {
     // TODO(sergiitk): [QUESTION] better name? - ask Eric.
     // TODO(sergiitk): [DESIGN] the key should be hashed (domain + buckets) merged config?
     // TODO(sergiitk): [IMPL] Hash buckets
-    return config.rlqsService().targetUri() + config.domain();
+    int k1 = Objects.hash(config.rlqsService().targetUri(), config.domain());
+    int k2 = config.bucketMatchers().hashCode();
+    return Long.rotateLeft(Integer.toUnsignedLong(k1), 32) + Integer.toUnsignedLong(k2);
   }
 
   /**

xds/src/main/java/io/grpc/xds/internal/rlqs/RlqsEngine.java

@@ -38,13 +38,13 @@ public class RlqsEngine {
   private final RlqsClient rlqsClient;
   private final Matcher<HttpMatchInput, RlqsBucketSettings> bucketMatchers;
   private final RlqsBucketCache bucketCache;
-  private final String configHash;
+  private final long configHash;
   private final ScheduledExecutorService scheduler;
   private final ConcurrentMap<Long, ScheduledFuture<?>> timers = new ConcurrentHashMap<>();
 
   public RlqsEngine(
       RemoteServerInfo rlqsServer, String domain,
-      Matcher<HttpMatchInput, RlqsBucketSettings> bucketMatchers, String configHash,
+      Matcher<HttpMatchInput, RlqsBucketSettings> bucketMatchers, long configHash,
       ScheduledExecutorService scheduler) {
     this.bucketMatchers = bucketMatchers;
     this.configHash = configHash;