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 2015/11/02 23:19:20 UTC
[13/17] storm git commit: Renaming variable and fixing merge
Renaming variable and fixing merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/94de2a59
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/94de2a59
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/94de2a59
Branch: refs/heads/master
Commit: 94de2a5932e4a68a53f15428927b72b8c1ee8563
Parents: fd70d9c
Author: Sumit Chawla <su...@gmail.com>
Authored: Sat Sep 26 12:17:12 2015 -0700
Committer: Sumit Chawla <su...@gmail.com>
Committed: Sat Sep 26 12:17:12 2015 -0700
----------------------------------------------------------------------
.../src/jvm/storm/kafka/DynamicBrokersReader.java | 8 ++++----
.../src/jvm/storm/kafka/trident/OpaqueTridentKafkaSpout.java | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/94de2a59/external/storm-kafka/src/jvm/storm/kafka/DynamicBrokersReader.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/storm/kafka/DynamicBrokersReader.java b/external/storm-kafka/src/jvm/storm/kafka/DynamicBrokersReader.java
index 292b558..d0f6724 100644
--- a/external/storm-kafka/src/jvm/storm/kafka/DynamicBrokersReader.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/DynamicBrokersReader.java
@@ -42,7 +42,7 @@ public class DynamicBrokersReader {
private CuratorFramework _curator;
private String _zkPath;
private String _topic;
- private Boolean _wildcardTopic;
+ private Boolean _isWildcardTopic;
public DynamicBrokersReader(Map conf, String zkStr, String zkPath, String topic) {
// Check required parameters
@@ -56,7 +56,7 @@ public class DynamicBrokersReader {
_zkPath = zkPath;
_topic = topic;
- _wildcardTopic = Utils.getBoolean(conf.get("kafka.topic.wildcard.match"), false);
+ _isWildcardTopic = Utils.getBoolean(conf.get("kafka.topic.wildcard.match"), false);
try {
_curator = CuratorFrameworkFactory.newClient(
zkStr,
@@ -79,7 +79,7 @@ public class DynamicBrokersReader {
List<GlobalPartitionInformation> partitions = new ArrayList<GlobalPartitionInformation>();
for (String topic : topics) {
- GlobalPartitionInformation globalPartitionInformation = new GlobalPartitionInformation(topic, this._wildcardTopic);
+ GlobalPartitionInformation globalPartitionInformation = new GlobalPartitionInformation(topic, this._isWildcardTopic);
try {
int numPartitionsForTopic = getNumPartitions(topic);
String brokerInfoPath = brokerPath();
@@ -117,7 +117,7 @@ public class DynamicBrokersReader {
private List<String> getTopics() {
List<String> topics = new ArrayList<String>();
- if (!_wildcardTopic) {
+ if (!_isWildcardTopic) {
topics.add(_topic);
return topics;
} else {
http://git-wip-us.apache.org/repos/asf/storm/blob/94de2a59/external/storm-kafka/src/jvm/storm/kafka/trident/OpaqueTridentKafkaSpout.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/storm/kafka/trident/OpaqueTridentKafkaSpout.java b/external/storm-kafka/src/jvm/storm/kafka/trident/OpaqueTridentKafkaSpout.java
index 4e2da42..fbd1d7a 100644
--- a/external/storm-kafka/src/jvm/storm/kafka/trident/OpaqueTridentKafkaSpout.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/trident/OpaqueTridentKafkaSpout.java
@@ -37,7 +37,7 @@ public class OpaqueTridentKafkaSpout implements IOpaquePartitionedTridentSpout<L
}
@Override
- public IOpaquePartitionedTridentSpout.Emitter<GlobalPartitionInformation, Partition, Map> getEmitter(Map conf, TopologyContext context) {
+ public IOpaquePartitionedTridentSpout.Emitter<List<GlobalPartitionInformation>, Partition, Map> getEmitter(Map conf, TopologyContext context) {
return new TridentKafkaEmitter(conf, context, _config, context
.getStormId()).asOpaqueEmitter();
}