Skip to content

Commit 09e2871

Browse files
committed
Fix code reviews.
1 parent db9f0c5 commit 09e2871

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

lib/BinaryProtoLookupService.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ class PULSAR_PUBLIC BinaryProtoLookupService : public LookupService {
5050
Future<Result, LookupDataResultPtr> getPartitionMetadataAsync(const TopicNamePtr& topicName) override;
5151

5252
Future<Result, NamespaceTopicsPtr> getTopicsOfNamespaceAsync(
53-
const NamespaceNamePtr& nsName,
54-
CommandGetTopicsOfNamespace_Mode mode = CommandGetTopicsOfNamespace_Mode_PERSISTENT) override;
53+
const NamespaceNamePtr& nsName, CommandGetTopicsOfNamespace_Mode mode) override;
5554

5655
Future<Result, boost::optional<SchemaInfo>> getSchema(const TopicNamePtr& topicName) override;
5756

lib/HTTPLookupService.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ class HTTPLookupService : public LookupService, public std::enable_shared_from_t
8080
Future<Result, boost::optional<SchemaInfo>> getSchema(const TopicNamePtr& topicName) override;
8181

8282
Future<Result, NamespaceTopicsPtr> getTopicsOfNamespaceAsync(
83-
const NamespaceNamePtr& nsName,
84-
CommandGetTopicsOfNamespace_Mode mode = CommandGetTopicsOfNamespace_Mode_PERSISTENT) override;
83+
const NamespaceNamePtr& nsName, CommandGetTopicsOfNamespace_Mode mode) override;
8584
};
8685
} // namespace pulsar
8786

lib/LookupService.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ class LookupService {
7474
* Returns all the topics name for a given namespace.
7575
*/
7676
virtual Future<Result, NamespaceTopicsPtr> getTopicsOfNamespaceAsync(
77-
const NamespaceNamePtr& nsName,
78-
CommandGetTopicsOfNamespace_Mode mode = CommandGetTopicsOfNamespace_Mode_PERSISTENT) = 0;
77+
const NamespaceNamePtr& nsName, CommandGetTopicsOfNamespace_Mode mode) = 0;
7978

8079
/**
8180
* returns current SchemaInfo {@link SchemaInfo} for a given topic.

lib/PatternMultiTopicsConsumerImpl.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,10 @@ void PatternMultiTopicsConsumerImpl::onTopicsRemoved(NamespaceTopicsPtr removedT
195195
NamespaceTopicsPtr PatternMultiTopicsConsumerImpl::topicsPatternFilter(
196196
const std::vector<std::string>& topics, const PULSAR_REGEX_NAMESPACE::regex& pattern) {
197197
NamespaceTopicsPtr topicsResultPtr = std::make_shared<std::vector<std::string>>();
198-
for (const auto& it : topics) {
199-
auto topic = TopicName::removeDomain(it);
198+
for (const auto& topicStr : topics) {
199+
auto topic = TopicName::removeDomain(topicStr);
200200
if (PULSAR_REGEX_NAMESPACE::regex_match(topic, pattern)) {
201-
topicsResultPtr->push_back(std::move(it));
201+
topicsResultPtr->push_back(std::move(topicStr));
202202
}
203203
}
204204
return topicsResultPtr;

lib/RetryableLookupService.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ class RetryableLookupService : public LookupService,
6161
}
6262

6363
Future<Result, NamespaceTopicsPtr> getTopicsOfNamespaceAsync(
64-
const NamespaceNamePtr& nsName,
65-
CommandGetTopicsOfNamespace_Mode mode = CommandGetTopicsOfNamespace_Mode_PERSISTENT) override {
64+
const NamespaceNamePtr& nsName, CommandGetTopicsOfNamespace_Mode mode) override {
6665
return executeAsync<NamespaceTopicsPtr>(
6766
"get-topics-of-namespace-" + nsName->toString(),
6867
[this, nsName, mode] { return lookupService_->getTopicsOfNamespaceAsync(nsName, mode); });

tests/LookupServiceTest.cc

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,10 @@ static void testMultiAddresses(LookupService& lookupService) {
101101
results.clear();
102102
for (int i = 0; i < numRequests; i++) {
103103
NamespaceTopicsPtr data;
104-
const auto result =
105-
lookupService.getTopicsOfNamespaceAsync(TopicName::get("topic")->getNamespaceName()).get(data);
104+
const auto result = lookupService
105+
.getTopicsOfNamespaceAsync(TopicName::get("topic")->getNamespaceName(),
106+
CommandGetTopicsOfNamespace_Mode_PERSISTENT)
107+
.get(data);
106108
LOG_INFO("getTopicsOfNamespaceAsync [" << i << "] " << result);
107109
results.emplace_back(result);
108110
}
@@ -147,7 +149,8 @@ TEST(LookupServiceTest, testRetry) {
147149
LOG_INFO("getPartitionMetadataAsync returns " << lookupDataResultPtr->getPartitions() << " partitions");
148150

149151
PulsarFriend::setServiceUrlIndex(serviceNameResolver, 0);
150-
auto future3 = lookupService->getTopicsOfNamespaceAsync(topicNamePtr->getNamespaceName());
152+
auto future3 = lookupService->getTopicsOfNamespaceAsync(topicNamePtr->getNamespaceName(),
153+
CommandGetTopicsOfNamespace_Mode_PERSISTENT);
151154
NamespaceTopicsPtr namespaceTopicsPtr;
152155
ASSERT_EQ(ResultOk, future3.get(namespaceTopicsPtr));
153156
LOG_INFO("getTopicPartitionName Async returns " << namespaceTopicsPtr->size() << " topics");
@@ -208,7 +211,8 @@ TEST(LookupServiceTest, testTimeout) {
208211
afterMethod("getPartitionMetadataAsync");
209212

210213
beforeMethod();
211-
auto future3 = lookupService->getTopicsOfNamespaceAsync(topicNamePtr->getNamespaceName());
214+
auto future3 = lookupService->getTopicsOfNamespaceAsync(topicNamePtr->getNamespaceName(),
215+
CommandGetTopicsOfNamespace_Mode_PERSISTENT);
212216
NamespaceTopicsPtr namespaceTopicsPtr;
213217
ASSERT_EQ(ResultTimeout, future3.get(namespaceTopicsPtr));
214218
afterMethod("getTopicsOfNamespaceAsync");

0 commit comments

Comments
 (0)