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 2016/03/25 05:50:29 UTC
[1/3] storm git commit: STORM-1537: Upgrade to kryo3 in master
Repository: storm
Updated Branches:
refs/heads/master 9f2ca7ef2 -> 26ab643a7
STORM-1537: Upgrade to kryo3 in master
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0c2b555b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0c2b555b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0c2b555b
Branch: refs/heads/master
Commit: 0c2b555bbac622a7731aacf26cfc6585b886c8c8
Parents: ab66003
Author: Abhishek Agarwal <ab...@inmobi.com>
Authored: Thu Mar 24 17:21:13 2016 +0530
Committer: Abhishek Agarwal <ab...@inmobi.com>
Committed: Thu Mar 24 17:21:13 2016 +0530
----------------------------------------------------------------------
pom.xml | 6 ++---
storm-core/pom.xml | 2 +-
.../serialization/BlowfishTupleSerializer.java | 24 ++++++++++----------
3 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/0c2b555b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 95d8472..12e5a9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -217,7 +217,7 @@
<jetty.version>7.6.13.v20130916</jetty.version>
<clojure.tools.logging.version>0.2.3</clojure.tools.logging.version>
<clojure.math.numeric-tower.version>0.0.1</clojure.math.numeric-tower.version>
- <carbonite.version>1.4.0</carbonite.version>
+ <carbonite.version>1.5.0</carbonite.version>
<snakeyaml.version>1.11</snakeyaml.version>
<httpclient.version>4.3.3</httpclient.version>
<clojure.tools.cli.version>0.2.4</clojure.tools.cli.version>
@@ -239,7 +239,7 @@
<clojure-contrib.version>1.2.0</clojure-contrib.version>
<hive.version>0.14.0</hive.version>
<hadoop.version>2.6.1</hadoop.version>
- <kryo.version>2.21</kryo.version>
+ <kryo.version>3.0.3</kryo.version>
<servlet.version>2.5</servlet.version>
<joda-time.version>2.3</joda-time.version>
<thrift.version>0.9.3</thrift.version>
@@ -501,7 +501,7 @@
<version>${clojure.version}</version>
</dependency>
<dependency>
- <groupId>com.esotericsoftware.kryo</groupId>
+ <groupId>com.esotericsoftware</groupId>
<artifactId>kryo</artifactId>
<version>${kryo.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/storm/blob/0c2b555b/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 624e340..ddc9b36 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -52,7 +52,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.esotericsoftware.kryo</groupId>
+ <groupId>com.esotericsoftware</groupId>
<artifactId>kryo</artifactId>
<exclusions>
<exclusion>
http://git-wip-us.apache.org/repos/asf/storm/blob/0c2b555b/storm-core/src/jvm/org/apache/storm/security/serialization/BlowfishTupleSerializer.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/security/serialization/BlowfishTupleSerializer.java b/storm-core/src/jvm/org/apache/storm/security/serialization/BlowfishTupleSerializer.java
index f459b35..8cc2f23 100644
--- a/storm-core/src/jvm/org/apache/storm/security/serialization/BlowfishTupleSerializer.java
+++ b/storm-core/src/jvm/org/apache/storm/security/serialization/BlowfishTupleSerializer.java
@@ -17,23 +17,23 @@
*/
package org.apache.storm.security.serialization;
-import java.util.Map;
-import org.apache.commons.codec.binary.Hex;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.crypto.KeyGenerator;
-import javax.crypto.SecretKey;
-
import com.esotericsoftware.kryo.Kryo;
+import com.esotericsoftware.kryo.Serializer;
import com.esotericsoftware.kryo.io.Input;
import com.esotericsoftware.kryo.io.Output;
-import com.esotericsoftware.kryo.Serializer;
import com.esotericsoftware.kryo.serializers.BlowfishSerializer;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.storm.Config;
import org.apache.storm.serialization.types.ListDelegateSerializer;
import org.apache.storm.utils.ListDelegate;
-import org.apache.storm.Config;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Map;
+
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
/**
* Apply Blowfish encryption for tuple communication to bolts
@@ -66,12 +66,12 @@ public class BlowfishTupleSerializer extends Serializer<ListDelegate> {
@Override
public void write(Kryo kryo, Output output, ListDelegate object) {
- _serializer.write(kryo, output, object);
+ kryo.writeObject(output, object, _serializer);
}
@Override
public ListDelegate read(Kryo kryo, Input input, Class<ListDelegate> type) {
- return (ListDelegate)_serializer.read(kryo, input, type);
+ return kryo.readObject(input, ListDelegate.class, _serializer);
}
/**
[3/3] storm git commit: Added STORM-1537 to CHANGELOG.
Posted by sr...@apache.org.
Added STORM-1537 to CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/26ab643a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/26ab643a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/26ab643a
Branch: refs/heads/master
Commit: 26ab643a783e79b9f1293e2b13a4cc4753dd4190
Parents: edf19fe
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Thu Mar 24 21:47:09 2016 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Thu Mar 24 21:47:09 2016 -0700
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/26ab643a/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f077d8..f7f3806 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 2.0.0
+ * STORM-1537: Upgrade to kryo3 in master
* STORM-1268: port builtin-metrics to java
* STORM-1648: drpc spout reconnect on failure
* STORM-1631: Storm CGroup bugs
[2/3] storm git commit: Merge branch 'kryo3-master' of
http://github.com/abhishekagarwal87/storm into STORM-1537
Posted by sr...@apache.org.
Merge branch 'kryo3-master' of http://github.com/abhishekagarwal87/storm into STORM-1537
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/edf19fe6
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/edf19fe6
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/edf19fe6
Branch: refs/heads/master
Commit: edf19fe611cc5113a1bd518e01c10ba5fd48a783
Parents: 9f2ca7e 0c2b555
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Thu Mar 24 21:45:32 2016 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Thu Mar 24 21:45:32 2016 -0700
----------------------------------------------------------------------
pom.xml | 6 ++---
storm-core/pom.xml | 2 +-
.../serialization/BlowfishTupleSerializer.java | 24 ++++++++++----------
3 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------