You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2018/02/08 21:03:25 UTC
[1/2] storm git commit: STORM-2941: Fix checkstyle issues in
KafkaSpout
Repository: storm
Updated Branches:
refs/heads/master 5f0573983 -> ec537fdf5
STORM-2941: Fix checkstyle issues in KafkaSpout
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d6d1d48a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d6d1d48a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d6d1d48a
Branch: refs/heads/master
Commit: d6d1d48a2f36ceb65be9a598b141baad18760489
Parents: c02f4a0
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Feb 7 14:37:42 2018 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Feb 7 14:37:42 2018 -0600
----------------------------------------------------------------------
.../main/java/org/apache/storm/kafka/spout/KafkaSpout.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/d6d1d48a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
index 9d133a7..abd6774 100644
--- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
+++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
@@ -233,7 +233,9 @@ public class KafkaSpout<K, V> extends BaseRichSpout {
if (committedOffset != null) {
// offset was previously committed for this consumer group and topic-partition, either by this or another topology.
- if (commitMetadataManager.isOffsetCommittedByThisTopology(newTp, committedOffset, Collections.unmodifiableMap(offsetManagers))) {
+ if (commitMetadataManager.isOffsetCommittedByThisTopology(newTp,
+ committedOffset,
+ Collections.unmodifiableMap(offsetManagers))) {
// Another KafkaSpout instance (of this topology) already committed, therefore FirstPollOffsetStrategy does not apply.
kafkaConsumer.seek(newTp, committedOffset.offset());
} else {
@@ -440,7 +442,9 @@ public class KafkaSpout<K, V> extends BaseRichSpout {
if (isAtLeastOnceProcessing()
&& committedOffset != null
&& committedOffset.offset() > record.offset()
- && commitMetadataManager.isOffsetCommittedByThisTopology(tp, committedOffset, Collections.unmodifiableMap(offsetManagers))) {
+ && commitMetadataManager.isOffsetCommittedByThisTopology(tp,
+ committedOffset,
+ Collections.unmodifiableMap(offsetManagers))) {
// Ensures that after a topology with this id is started, the consumer fetch
// position never falls behind the committed offset (STORM-2844)
throw new IllegalStateException("Attempting to emit a message that has already been committed."
[2/2] storm git commit: Merge branch 'STORM-2941' of
https://github.com/revans2/incubator-storm into STORM-2941
Posted by bo...@apache.org.
Merge branch 'STORM-2941' of https://github.com/revans2/incubator-storm into STORM-2941
STORM-2941: Fix checkstyle issues in KafkaSpout
This closes #2552
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ec537fdf
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ec537fdf
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ec537fdf
Branch: refs/heads/master
Commit: ec537fdf54c4139fc4779edbf77eb55067a09b43
Parents: 5f05739 d6d1d48
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Thu Feb 8 14:58:22 2018 -0600
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Thu Feb 8 14:58:22 2018 -0600
----------------------------------------------------------------------
.../main/java/org/apache/storm/kafka/spout/KafkaSpout.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------