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/09/24 18:49:44 UTC
[2/4] storm git commit: STORM-1017: Ignore ignoreZkOffsets for
trident.
STORM-1017: Ignore ignoreZkOffsets for trident.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/56cfdbf8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/56cfdbf8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/56cfdbf8
Branch: refs/heads/master
Commit: 56cfdbf8d9b3b6044d7aa05dfb6b501c24b2f277
Parents: a89b7ff
Author: Priyank <ps...@hortonworks.com>
Authored: Tue Sep 22 09:14:26 2015 -0700
Committer: Priyank <ps...@hortonworks.com>
Committed: Tue Sep 22 09:14:26 2015 -0700
----------------------------------------------------------------------
.../src/jvm/storm/kafka/trident/OpaqueTridentKafkaSpout.java | 4 ++--
.../jvm/storm/kafka/trident/TransactionalTridentKafkaSpout.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/56cfdbf8/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 136e7d2..7e7e4d8 100644
--- a/external/storm-kafka/src/jvm/storm/kafka/trident/OpaqueTridentKafkaSpout.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/trident/OpaqueTridentKafkaSpout.java
@@ -30,7 +30,6 @@ public class OpaqueTridentKafkaSpout implements IOpaquePartitionedTridentSpout<G
TridentKafkaConfig _config;
- String _topologyInstanceId = UUID.randomUUID().toString();
public OpaqueTridentKafkaSpout(TridentKafkaConfig config) {
_config = config;
@@ -38,7 +37,8 @@ public class OpaqueTridentKafkaSpout implements IOpaquePartitionedTridentSpout<G
@Override
public IOpaquePartitionedTridentSpout.Emitter<GlobalPartitionInformation, Partition, Map> getEmitter(Map conf, TopologyContext context) {
- return new TridentKafkaEmitter(conf, context, _config, _topologyInstanceId).asOpaqueEmitter();
+ return new TridentKafkaEmitter(conf, context, _config, context
+ .getStormId()).asOpaqueEmitter();
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/56cfdbf8/external/storm-kafka/src/jvm/storm/kafka/trident/TransactionalTridentKafkaSpout.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/storm/kafka/trident/TransactionalTridentKafkaSpout.java b/external/storm-kafka/src/jvm/storm/kafka/trident/TransactionalTridentKafkaSpout.java
index 8c10bed..9feffc8 100644
--- a/external/storm-kafka/src/jvm/storm/kafka/trident/TransactionalTridentKafkaSpout.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/trident/TransactionalTridentKafkaSpout.java
@@ -29,7 +29,6 @@ import java.util.UUID;
public class TransactionalTridentKafkaSpout implements IPartitionedTridentSpout<GlobalPartitionInformation, Partition, Map> {
TridentKafkaConfig _config;
- String _topologyInstanceId = UUID.randomUUID().toString();
public TransactionalTridentKafkaSpout(TridentKafkaConfig config) {
_config = config;
@@ -43,7 +42,8 @@ public class TransactionalTridentKafkaSpout implements IPartitionedTridentSpout<
@Override
public IPartitionedTridentSpout.Emitter getEmitter(Map conf, TopologyContext context) {
- return new TridentKafkaEmitter(conf, context, _config, _topologyInstanceId).asTransactionalEmitter();
+ return new TridentKafkaEmitter(conf, context, _config, context
+ .getStormId()).asTransactionalEmitter();
}
@Override