Rename back

Author: BewareMyPower

lib/BinaryProtoLookupService.cc

@@ -47,10 +47,9 @@ auto BinaryProtoLookupService::findBroker(const std::string& address, bool autho
     }
 
     // NOTE: we can use move capture for topic since C++14
-    cnxPool_.getRandomConnectionAsync(address).addListener([this, promise, topic, address, authoritative,
-                                                            redirectCount](
-                                                               Result result,
-                                                               const ClientConnectionWeakPtr& weakCnx) {
+    cnxPool_.getConnectionAsync(address).addListener([this, promise, topic, address, authoritative,
+                                                      redirectCount](Result result,
+                                                                     const ClientConnectionWeakPtr& weakCnx) {
         if (result != ResultOk) {
             promise->setFailed(result);
             return;
@@ -110,7 +109,7 @@ Future<Result, LookupDataResultPtr> BinaryProtoLookupService::getPartitionMetada
     }
     std::string lookupName = topicName->toString();
     const auto address = serviceNameResolver_.resolveHost();
-    cnxPool_.getRandomConnectionAsync(address, address)
+    cnxPool_.getConnectionAsync(address, address)
         .addListener(std::bind(&BinaryProtoLookupService::sendPartitionMetadataLookupRequest, this,
                                lookupName, std::placeholders::_1, std::placeholders::_2, promise));
     return promise->getFuture();
@@ -163,7 +162,7 @@ Future<Result, NamespaceTopicsPtr> BinaryProtoLookupService::getTopicsOfNamespac
         return promise->getFuture();
     }
     std::string namespaceName = nsName->toString();
-    cnxPool_.getRandomConnectionAsync(serviceNameResolver_.resolveHost())
+    cnxPool_.getConnectionAsync(serviceNameResolver_.resolveHost())
         .addListener(std::bind(&BinaryProtoLookupService::sendGetTopicsOfNamespaceRequest, this,
                                namespaceName, mode, std::placeholders::_1, std::placeholders::_2, promise));
     return promise->getFuture();
@@ -177,7 +176,7 @@ Future<Result, SchemaInfo> BinaryProtoLookupService::getSchema(const TopicNamePt
         promise->setFailed(ResultInvalidTopicName);
         return promise->getFuture();
     }
-    cnxPool_.getRandomConnectionAsync(serviceNameResolver_.resolveHost())
+    cnxPool_.getConnectionAsync(serviceNameResolver_.resolveHost())
         .addListener(std::bind(&BinaryProtoLookupService::sendGetSchemaRequest, this, topicName->toString(),
                                version, std::placeholders::_1, std::placeholders::_2, promise));
 

lib/ConnectionPool.h

@@ -77,17 +77,17 @@ class PULSAR_PUBLIC ConnectionPool {
                                                                const std::string& physicalAddress,
                                                                int keySuffix);
 
-    int generateRandomIndex() { return randomDistribution_(randomEngine_); }
-
-    Future<Result, ClientConnectionWeakPtr> getRandomConnectionAsync(const std::string& logicalAddress,
-                                                                     const std::string& physicalAddress) {
+    Future<Result, ClientConnectionWeakPtr> getConnectionAsync(const std::string& logicalAddress,
+                                                               const std::string& physicalAddress) {
         return getConnectionAsync(logicalAddress, physicalAddress, generateRandomIndex());
     }
 
-    Future<Result, ClientConnectionWeakPtr> getRandomConnectionAsync(const std::string& address) {
-        return getRandomConnectionAsync(address, address);
+    Future<Result, ClientConnectionWeakPtr> getConnectionAsync(const std::string& address) {
+        return getConnectionAsync(address, address);
     }
 
+    int generateRandomIndex() { return randomDistribution_(randomEngine_); }
+
    private:
     ClientConfiguration clientConfiguration_;
     ExecutorServiceProviderPtr executorProvider_;