You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2018/07/09 21:47:25 UTC
[2/3] storm git commit: STORM-3082: Port to master
STORM-3082: Port to master
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f6208b84
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f6208b84
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f6208b84
Branch: refs/heads/master
Commit: f6208b84c5a4eda09e18bf9ee31e12f43802f304
Parents: b82ffcf
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Mon Jul 9 23:35:26 2018 +0200
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Mon Jul 9 23:35:46 2018 +0200
----------------------------------------------------------------------
.../apache/storm/kafka/spout/subscription/NamedTopicFilter.java | 2 +-
.../storm/kafka/spout/subscription/NamedTopicFilterTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f6208b84/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/subscription/NamedTopicFilter.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/subscription/NamedTopicFilter.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/subscription/NamedTopicFilter.java
index 277ebac..1591265 100644
--- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/subscription/NamedTopicFilter.java
+++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/subscription/NamedTopicFilter.java
@@ -56,7 +56,7 @@ public class NamedTopicFilter implements TopicFilter {
Set<TopicPartition> allPartitions = new HashSet<>();
for (String topic : topics) {
List<PartitionInfo> partitionInfoList = consumer.partitionsFor(topic);
- if(partitionInfoList != null) {
+ if (partitionInfoList != null) {
for (PartitionInfo partitionInfo : partitionInfoList) {
allPartitions.add(new TopicPartition(partitionInfo.topic(), partitionInfo.partition()));
}
http://git-wip-us.apache.org/repos/asf/storm/blob/f6208b84/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/subscription/NamedTopicFilterTest.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/subscription/NamedTopicFilterTest.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/subscription/NamedTopicFilterTest.java
index c7717f9..f449a84 100644
--- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/subscription/NamedTopicFilterTest.java
+++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/subscription/NamedTopicFilterTest.java
@@ -72,7 +72,7 @@ public class NamedTopicFilterTest {
when(consumerMock.partitionsFor(presentTopic)).thenReturn(Collections.singletonList(createPartitionInfo(presentTopic, 2)));
when(consumerMock.partitionsFor(absentTopic)).thenReturn(null);
- List<TopicPartition> presentPartitions = filter.getFilteredTopicPartitions(consumerMock);
+ Set<TopicPartition> presentPartitions = filter.getAllSubscribedPartitions(consumerMock);
assertThat("Expected filter to pass only topics which are present", presentPartitions,
contains(new TopicPartition(presentTopic, 2)));
}