[improve][broker] Improve the extensibility of the TopicBundleAssignm…

…entStrategy interface class (#23773)
apache · Jan 7, 2025 · b8efc53 · b8efc53
1 parent 817e419
commit b8efc53
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/...r/src/main/java/org/apache/pulsar/common/naming/ConsistentHashingTopicBundleAssigner.java b/...r/src/main/java/org/apache/pulsar/common/naming/ConsistentHashingTopicBundleAssigner.java
@@ -22,9 +22,14 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Optional;
 import org.apache.pulsar.broker.PulsarService;
+import org.apache.pulsar.broker.ServiceConfiguration;
+import org.apache.pulsar.broker.namespace.NamespaceService;
 
 public class ConsistentHashingTopicBundleAssigner implements TopicBundleAssignmentStrategy {
     private PulsarService pulsar;
+
+    private volatile HashFunction hashFunction;
+
     @Override
     public NamespaceBundle findBundle(TopicName topicName, NamespaceBundles namespaceBundles) {
         NamespaceBundle bundle = namespaceBundles.getBundle(calculateBundleHashCode(topicName));
@@ -36,7 +41,10 @@ public NamespaceBundle findBundle(TopicName topicName, NamespaceBundles namespac
 
     @Override
     public long calculateBundleHashCode(TopicName topicName) {
-        return getBundleHashFunc().hashString(topicName.toString(), StandardCharsets.UTF_8).padToLong();
+        if (hashFunction == null) {
+            hashFunction = getBundleHashFunc();
+        }
+        return hashFunction.hashString(topicName.toString(), StandardCharsets.UTF_8).padToLong();
     }
 
     @Override
@@ -45,6 +53,7 @@ public void init(PulsarService pulsarService) {
     }
 
     private HashFunction getBundleHashFunc() {
-        return Optional.of(pulsar.getNamespaceService().getNamespaceBundleFactory().getHashFunc()).get();
+        return Optional.ofNullable(pulsar.getNamespaceService()).map(NamespaceService::getNamespaceBundleFactory)
+                .map(NamespaceBundleFactory::getHashFunc).orElseThrow(() -> new RuntimeException("HashFunc not specified"));
     }
 }
diff --git a/...oker/src/test/java/org/apache/pulsar/common/naming/TopicBundleAssignmentStrategyTest.java b/...oker/src/test/java/org/apache/pulsar/common/naming/TopicBundleAssignmentStrategyTest.java
@@ -30,6 +30,8 @@
 
 import com.google.common.hash.Hashing;
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.nio.charset.StandardCharsets;
 import java.util.HashSet;
 import java.util.Optional;