Fix code reviews.

apache · Mar 30, 2023 · 6f93009 · 6f93009
1 parent f0dc16e
commit 6f93009
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/lib/BinaryProtoLookupService.h b/lib/BinaryProtoLookupService.h
@@ -50,8 +50,7 @@ class PULSAR_PUBLIC BinaryProtoLookupService : public LookupService {
     Future<Result, LookupDataResultPtr> getPartitionMetadataAsync(const TopicNamePtr& topicName) override;
 
     Future<Result, NamespaceTopicsPtr> getTopicsOfNamespaceAsync(
-        const NamespaceNamePtr& nsName,
-        CommandGetTopicsOfNamespace_Mode mode = CommandGetTopicsOfNamespace_Mode_PERSISTENT) override;
+        const NamespaceNamePtr& nsName, CommandGetTopicsOfNamespace_Mode mode) override;
 
     Future<Result, boost::optional<SchemaInfo>> getSchema(const TopicNamePtr& topicName) override;
 

diff --git a/lib/HTTPLookupService.h b/lib/HTTPLookupService.h
@@ -80,8 +80,7 @@ class HTTPLookupService : public LookupService, public std::enable_shared_from_t
     Future<Result, boost::optional<SchemaInfo>> getSchema(const TopicNamePtr& topicName) override;
 
     Future<Result, NamespaceTopicsPtr> getTopicsOfNamespaceAsync(
-        const NamespaceNamePtr& nsName,
-        CommandGetTopicsOfNamespace_Mode mode = CommandGetTopicsOfNamespace_Mode_PERSISTENT) override;
+        const NamespaceNamePtr& nsName, CommandGetTopicsOfNamespace_Mode mode) override;
 };
 }  // namespace pulsar
 

diff --git a/lib/LookupService.h b/lib/LookupService.h
@@ -74,8 +74,7 @@ class LookupService {
      * Returns all the topics name for a given namespace.
      */
     virtual Future<Result, NamespaceTopicsPtr> getTopicsOfNamespaceAsync(
-        const NamespaceNamePtr& nsName,
-        CommandGetTopicsOfNamespace_Mode mode = CommandGetTopicsOfNamespace_Mode_PERSISTENT) = 0;
+        const NamespaceNamePtr& nsName, CommandGetTopicsOfNamespace_Mode mode) = 0;
 
     /**
      * returns current SchemaInfo {@link SchemaInfo} for a given topic.

diff --git a/lib/PatternMultiTopicsConsumerImpl.cc b/lib/PatternMultiTopicsConsumerImpl.cc
@@ -195,10 +195,10 @@ void PatternMultiTopicsConsumerImpl::onTopicsRemoved(NamespaceTopicsPtr removedT
 NamespaceTopicsPtr PatternMultiTopicsConsumerImpl::topicsPatternFilter(
     const std::vector<std::string>& topics, const PULSAR_REGEX_NAMESPACE::regex& pattern) {
     NamespaceTopicsPtr topicsResultPtr = std::make_shared<std::vector<std::string>>();
-    for (const auto& it : topics) {
-        auto topic = TopicName::removeDomain(it);
+    for (const auto& topicStr : topics) {
+        auto topic = TopicName::removeDomain(topicStr);
         if (PULSAR_REGEX_NAMESPACE::regex_match(topic, pattern)) {
-            topicsResultPtr->push_back(std::move(it));
+            topicsResultPtr->push_back(std::move(topicStr));
         }
     }
     return topicsResultPtr;

diff --git a/lib/RetryableLookupService.h b/lib/RetryableLookupService.h
@@ -61,8 +61,7 @@ class RetryableLookupService : public LookupService,
     }
 
     Future<Result, NamespaceTopicsPtr> getTopicsOfNamespaceAsync(
-        const NamespaceNamePtr& nsName,
-        CommandGetTopicsOfNamespace_Mode mode = CommandGetTopicsOfNamespace_Mode_PERSISTENT) override {
+        const NamespaceNamePtr& nsName, CommandGetTopicsOfNamespace_Mode mode) override {
         return executeAsync<NamespaceTopicsPtr>(
             "get-topics-of-namespace-" + nsName->toString(),
             [this, nsName, mode] { return lookupService_->getTopicsOfNamespaceAsync(nsName, mode); });

diff --git a/tests/LookupServiceTest.cc b/tests/LookupServiceTest.cc
@@ -101,8 +101,10 @@ static void testMultiAddresses(LookupService& lookupService) {
     results.clear();
     for (int i = 0; i < numRequests; i++) {
         NamespaceTopicsPtr data;
-        const auto result =
-            lookupService.getTopicsOfNamespaceAsync(TopicName::get("topic")->getNamespaceName()).get(data);
+        const auto result = lookupService
+                                .getTopicsOfNamespaceAsync(TopicName::get("topic")->getNamespaceName(),
+                                                           CommandGetTopicsOfNamespace_Mode_PERSISTENT)
+                                .get(data);
         LOG_INFO("getTopicsOfNamespaceAsync [" << i << "] " << result);
         results.emplace_back(result);
     }
@@ -147,7 +149,8 @@ TEST(LookupServiceTest, testRetry) {
     LOG_INFO("getPartitionMetadataAsync returns " << lookupDataResultPtr->getPartitions() << " partitions");
 
     PulsarFriend::setServiceUrlIndex(serviceNameResolver, 0);
-    auto future3 = lookupService->getTopicsOfNamespaceAsync(topicNamePtr->getNamespaceName());
+    auto future3 = lookupService->getTopicsOfNamespaceAsync(topicNamePtr->getNamespaceName(),
+                                                            CommandGetTopicsOfNamespace_Mode_PERSISTENT);
     NamespaceTopicsPtr namespaceTopicsPtr;
     ASSERT_EQ(ResultOk, future3.get(namespaceTopicsPtr));
     LOG_INFO("getTopicPartitionName Async returns " << namespaceTopicsPtr->size() << " topics");
@@ -208,7 +211,8 @@ TEST(LookupServiceTest, testTimeout) {
     afterMethod("getPartitionMetadataAsync");
 
     beforeMethod();
-    auto future3 = lookupService->getTopicsOfNamespaceAsync(topicNamePtr->getNamespaceName());
+    auto future3 = lookupService->getTopicsOfNamespaceAsync(topicNamePtr->getNamespaceName(),
+                                                            CommandGetTopicsOfNamespace_Mode_PERSISTENT);
     NamespaceTopicsPtr namespaceTopicsPtr;
     ASSERT_EQ(ResultTimeout, future3.get(namespaceTopicsPtr));
     afterMethod("getTopicsOfNamespaceAsync");