[1/3] storm git commit: Emit to _spoutConfig.outputStreamId

[kabhwan]

Repository: storm
Updated Branches:
  refs/heads/1.x-branch 43653ac8d -> 8cb227445


Emit to _spoutConfig.outputStreamId

Even though KafkaSpout.declareOutputFields declaresStream using outputStreamId 
(if present), the message gets emitted to a stream matching the Kafka topic it 
was read from. Looks like it may have been a merge conflict between the fix for 
STORM-1210 and STORM-1379.

Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/98cd74e0
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/98cd74e0
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/98cd74e0

Branch: refs/heads/1.x-branch
Commit: 98cd74e06d9ccacc624bb3db84f817d4b0545a9b
Parents: 43653ac
Author: aichow 
Authored: Wed Sep 21 14:51:50 2016 -0500
Committer: Jungtaek Lim 
Committed: Fri Sep 23 10:49:19 2016 +0900

--
 .../src/jvm/org/apache/storm/kafka/PartitionManager.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/98cd74e0/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java
--
diff --git 
a/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java 
b/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java
index e04b4f2..79e7c3d 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java
@@ -164,7 +164,7 @@ public class PartitionManager {
 if ((tups != null) && tups.iterator().hasNext()) {
if (!Strings.isNullOrEmpty(_spoutConfig.outputStreamId)) {
 for (List tup : tups) {
-collector.emit(_spoutConfig.topic, tup, new 
KafkaMessageId(_partition, toEmit.offset()));
+collector.emit(_spoutConfig.outputStreamId, tup, new 
KafkaMessageId(_partition, toEmit.offset()));
 }
 } else {
 for (List tup : tups) {

[1/3] storm git commit: Emit to _spoutConfig.outputStreamId

[kabhwan]

Repository: storm
Updated Branches:
  refs/heads/1.0.x-branch f2ad7fa71 -> ffd241c33


Emit to _spoutConfig.outputStreamId

Even though KafkaSpout.declareOutputFields declaresStream using outputStreamId 
(if present), the message gets emitted to a stream matching the Kafka topic it 
was read from. Looks like it may have been a merge conflict between the fix for 
STORM-1210 and STORM-1379.

Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0497d130
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0497d130
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0497d130

Branch: refs/heads/1.0.x-branch
Commit: 0497d1300bfff56dbec6012d641efb364b5a3f35
Parents: f2ad7fa
Author: aichow 
Authored: Wed Sep 21 14:51:50 2016 -0500
Committer: Jungtaek Lim 
Committed: Fri Sep 23 10:50:04 2016 +0900

--
 .../src/jvm/org/apache/storm/kafka/PartitionManager.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/0497d130/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java
--
diff --git 
a/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java 
b/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java
index e04b4f2..79e7c3d 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java
@@ -164,7 +164,7 @@ public class PartitionManager {
 if ((tups != null) && tups.iterator().hasNext()) {
if (!Strings.isNullOrEmpty(_spoutConfig.outputStreamId)) {
 for (List tup : tups) {
-collector.emit(_spoutConfig.topic, tup, new 
KafkaMessageId(_partition, toEmit.offset()));
+collector.emit(_spoutConfig.outputStreamId, tup, new 
KafkaMessageId(_partition, toEmit.offset()));
 }
 } else {
 for (List tup : tups) {

[1/3] storm git commit: Emit to _spoutConfig.outputStreamId

[kabhwan]

Repository: storm
Updated Branches:
  refs/heads/master 1bdc922e2 -> 5e5e83cab


Emit to _spoutConfig.outputStreamId

Even though KafkaSpout.declareOutputFields declaresStream using outputStreamId 
(if present), the message gets emitted to a stream matching the Kafka topic it 
was read from. Looks like it may have been a merge conflict between the fix for 
STORM-1210 and STORM-1379.

Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/09d9ea10
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/09d9ea10
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/09d9ea10

Branch: refs/heads/master
Commit: 09d9ea101b4dbaf49335907aaaf3167d29140c59
Parents: 84641f6
Author: aichow 
Authored: Wed Sep 21 14:51:50 2016 -0500
Committer: GitHub 
Committed: Wed Sep 21 14:51:50 2016 -0500

--
 .../src/jvm/org/apache/storm/kafka/PartitionManager.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/09d9ea10/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java
--
diff --git 
a/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java 
b/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java
index c51f36e..793d227 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java
@@ -164,7 +164,7 @@ public class PartitionManager {
 if ((tups != null) && tups.iterator().hasNext()) {
if (!Strings.isNullOrEmpty(_spoutConfig.outputStreamId)) {
 for (List tup : tups) {
-collector.emit(_spoutConfig.topic, tup, new 
KafkaMessageId(_partition, toEmit.offset()));
+collector.emit(_spoutConfig.outputStreamId, tup, new 
KafkaMessageId(_partition, toEmit.offset()));
 }
 } else {
 for (List tup : tups) {