You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2015/10/09 08:58:29 UTC
[1/5] storm git commit: advance kafka offset when deserializer yields
no object
Repository: storm
Updated Branches:
refs/heads/master 1822491bc -> 1af33c7c7
advance kafka offset when deserializer yields no object
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5d499854
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5d499854
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5d499854
Branch: refs/heads/master
Commit: 5d499854bf4b236b2d5fc7078d7fc5343d89dbeb
Parents: 4523e54
Author: Pete Prokopowicz <pp...@groupon.com>
Authored: Wed Sep 23 10:09:23 2015 -0500
Committer: Pete Prokopowicz <pp...@groupon.com>
Committed: Wed Sep 23 10:09:23 2015 -0500
----------------------------------------------------------------------
.../src/jvm/storm/kafka/PartitionManager.java | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/5d499854/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java b/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
index 052d525..fc757aa 100644
--- a/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
@@ -136,15 +136,15 @@ public class PartitionManager {
return EmitState.NO_EMITTED;
}
Iterable<List<Object>> tups = KafkaUtils.generateTuples(_spoutConfig, toEmit.msg);
- if (tups != null) {
- if(_spoutConfig.topicAsStreamId) {
- for (List<Object> tup : tups) {
- collector.emit(_spoutConfig.topic, tup, new KafkaMessageId(_partition, toEmit.offset));
- }
- } else {
- for (List<Object> tup : tups) {
- collector.emit(tup, new KafkaMessageId(_partition, toEmit.offset));
- }
+ if ((tups != null) && (tups.size() > 0)) {
+ if(_spoutConfig.topicAsStreamId) {
+ for (List<Object> tup : tups) {
+ collector.emit(_spoutConfig.topic, tup, new KafkaMessageId(_partition, toEmit.offset));
+ }
+ } else {
+ for (List<Object> tup : tups) {
+ collector.emit(tup, new KafkaMessageId(_partition, toEmit.offset));
+ }
}
break;
} else {
[2/5] storm git commit: fixes incorrect use of iterator in earlier
commit 5d499854bf4b236b2d5fc7078d7fc5343d89dbeb
Posted by ka...@apache.org.
fixes incorrect use of iterator in earlier commit
5d499854bf4b236b2d5fc7078d7fc5343d89dbeb
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8c0dcb1f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8c0dcb1f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8c0dcb1f
Branch: refs/heads/master
Commit: 8c0dcb1fede52512f2599ae4732372346bb36ba3
Parents: 5d49985
Author: Pete Prokopowicz <pp...@groupon.com>
Authored: Wed Sep 23 12:30:06 2015 -0500
Committer: Pete Prokopowicz <pp...@groupon.com>
Committed: Wed Sep 23 12:30:06 2015 -0500
----------------------------------------------------------------------
external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/8c0dcb1f/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java b/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
index fc757aa..afff87c 100644
--- a/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
@@ -136,7 +136,7 @@ public class PartitionManager {
return EmitState.NO_EMITTED;
}
Iterable<List<Object>> tups = KafkaUtils.generateTuples(_spoutConfig, toEmit.msg);
- if ((tups != null) && (tups.size() > 0)) {
+ if ((tups != null) && tups.iterator.hasNext()) {
if(_spoutConfig.topicAsStreamId) {
for (List<Object> tup : tups) {
collector.emit(_spoutConfig.topic, tup, new KafkaMessageId(_partition, toEmit.offset));
[3/5] storm git commit: fixed typo in PartitionManager
Posted by ka...@apache.org.
fixed typo in PartitionManager
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/77b17110
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/77b17110
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/77b17110
Branch: refs/heads/master
Commit: 77b171107ba52daac34ebf3d8c59d7643ecb6408
Parents: 8c0dcb1
Author: Pete Prokopowicz <pp...@groupon.com>
Authored: Thu Oct 1 16:48:14 2015 -0500
Committer: Pete Prokopowicz <pp...@groupon.com>
Committed: Thu Oct 1 16:48:14 2015 -0500
----------------------------------------------------------------------
external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/77b17110/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java b/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
index afff87c..10405fa 100644
--- a/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
@@ -136,7 +136,7 @@ public class PartitionManager {
return EmitState.NO_EMITTED;
}
Iterable<List<Object>> tups = KafkaUtils.generateTuples(_spoutConfig, toEmit.msg);
- if ((tups != null) && tups.iterator.hasNext()) {
+ if ((tups != null) && tups.iterator().hasNext()) {
if(_spoutConfig.topicAsStreamId) {
for (List<Object> tup : tups) {
collector.emit(_spoutConfig.topic, tup, new KafkaMessageId(_partition, toEmit.offset));
[5/5] storm git commit: add STORM-1094 to CHANGELOG.md
Posted by ka...@apache.org.
add STORM-1094 to CHANGELOG.md
* also add Pete Prokopowicz to contributor list
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1af33c7c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1af33c7c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1af33c7c
Branch: refs/heads/master
Commit: 1af33c7c791ce314993a385f34a36abf874c6872
Parents: 181f84d
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Oct 9 15:41:43 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Oct 9 15:41:43 2015 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
README.markdown | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/1af33c7c/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22f31a9..ca5b527 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -72,6 +72,7 @@
* STORM-949: On the topology summary UI page, last shown error should have the time and date
## 0.10.0-beta2
+ * STORM-1094: advance kafka offset when deserializer yields no object
* STORM-1066: Specify current directory when supervisor launches a worker
* STORM-1012: Shaded everything that was not already shaded
* STORM-967: Shaded everything that was not already shaded
http://git-wip-us.apache.org/repos/asf/storm/blob/1af33c7c/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index 7077de5..559faac 100644
--- a/README.markdown
+++ b/README.markdown
@@ -234,6 +234,7 @@ under the License.
* Bryan Shell ([@shellbj](https://github.com/shellbj))
* Dmytro Dragan ([@3Dragan](https://github.com/3Dragan))
* Ningyu An ([@jetan9](https://github.com/jetan9))
+* Pete Prokopowicz ([@prokopowicz](https://github.com/prokopowicz))
## Acknowledgements
[4/5] storm git commit: Merge branch 'master' of
https://github.com/prokopowicz/storm into STORM-1094
Posted by ka...@apache.org.
Merge branch 'master' of https://github.com/prokopowicz/storm into STORM-1094
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/181f84d2
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/181f84d2
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/181f84d2
Branch: refs/heads/master
Commit: 181f84d2cb717e331f254223f1ea9de306842db6
Parents: 1822491 77b1711
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Oct 9 15:39:59 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Oct 9 15:39:59 2015 +0900
----------------------------------------------------------------------
.../src/jvm/storm/kafka/PartitionManager.java | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------