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 2014/06/30 21:31:23 UTC
[1/3] git commit: Add a no args constructor to storm-kafka's Broker
and Partition classes to enable Kryo serialization when using the storm-kafka
spout (STORM-332)
Repository: incubator-storm
Updated Branches:
refs/heads/master b659979a1 -> 66b30112d
Add a no args constructor to storm-kafka's Broker and Partition classes
to enable Kryo serialization when using the storm-kafka spout
(STORM-332)
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/52d2f2f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/52d2f2f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/52d2f2f9
Branch: refs/heads/master
Commit: 52d2f2f9160f90a97de2d49a3827bd8c103fb14e
Parents: 021f5d5
Author: Danijel Schiavuzzi <da...@infobip.com>
Authored: Fri May 23 17:52:56 2014 +0200
Committer: Danijel Schiavuzzi <da...@infobip.com>
Committed: Fri May 23 17:52:56 2014 +0200
----------------------------------------------------------------------
external/storm-kafka/src/jvm/storm/kafka/Broker.java | 9 +++++++--
external/storm-kafka/src/jvm/storm/kafka/Partition.java | 9 +++++++--
2 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/52d2f2f9/external/storm-kafka/src/jvm/storm/kafka/Broker.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/storm/kafka/Broker.java b/external/storm-kafka/src/jvm/storm/kafka/Broker.java
index 866f84f..513ab22 100644
--- a/external/storm-kafka/src/jvm/storm/kafka/Broker.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/Broker.java
@@ -22,9 +22,14 @@ import com.google.common.base.Objects;
import java.io.Serializable;
public class Broker implements Serializable, Comparable<Broker> {
- public final String host;
- public final int port;
+ public String host;
+ public int port;
+ // for kryo compatibility
+ private Broker() {
+
+ }
+
public Broker(String host, int port) {
this.host = host;
this.port = port;
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/52d2f2f9/external/storm-kafka/src/jvm/storm/kafka/Partition.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/storm/kafka/Partition.java b/external/storm-kafka/src/jvm/storm/kafka/Partition.java
index fe6ab4f..24d6a41 100644
--- a/external/storm-kafka/src/jvm/storm/kafka/Partition.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/Partition.java
@@ -23,9 +23,14 @@ import storm.trident.spout.ISpoutPartition;
public class Partition implements ISpoutPartition {
- public final Broker host;
- public final int partition;
+ public Broker host;
+ public int partition;
+ // for kryo compatibility
+ private Partition() {
+
+ }
+
public Partition(Broker host, int partition) {
this.host = host;
this.partition = partition;
[3/3] git commit: Added STORM-332 to Changelog
Posted by bo...@apache.org.
Added STORM-332 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/66b30112
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/66b30112
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/66b30112
Branch: refs/heads/master
Commit: 66b30112d0be4b91f1e7bcc8289fb8ed5115e60a
Parents: 6a75fbb
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Mon Jun 30 14:26:34 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Mon Jun 30 14:26:34 2014 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/66b30112/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2506a97..76400d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
* STORM-183: Replacing RunTime.halt() with RunTime.exit()
* STORM-213: Decouple In-Process ZooKeeper from LocalCluster.
* STORM-365: Add support for Python 3 to storm command.
+ * STORM-332: Enable Kryo serialization in storm-kafka
## 0.9.2-incubating
* STORM-66: send taskid on initial handshake
[2/3] git commit: Merge branch
'STORM-332-kafka-spout-kryo-compatibility' of
https://github.com/dschiavu/incubator-storm into STORM-332
Posted by bo...@apache.org.
Merge branch 'STORM-332-kafka-spout-kryo-compatibility' of https://github.com/dschiavu/incubator-storm into STORM-332
STORM-332: Enable Kryo serialization in storm-kafka
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/6a75fbb5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/6a75fbb5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/6a75fbb5
Branch: refs/heads/master
Commit: 6a75fbb5580592b158086e40bac153402495ceaa
Parents: b659979 52d2f2f
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Mon Jun 30 14:25:22 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Mon Jun 30 14:25:22 2014 -0500
----------------------------------------------------------------------
external/storm-kafka/src/jvm/storm/kafka/Broker.java | 9 +++++++--
external/storm-kafka/src/jvm/storm/kafka/Partition.java | 9 +++++++--
2 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------