You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2016/03/23 21:07:23 UTC
[1/3] storm git commit: STORM-1537: Upgrade to kryo 3
Repository: storm
Updated Branches:
refs/heads/1.x-branch 732982d6f -> dee9aee3d
STORM-1537: Upgrade to kryo 3
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/514ba4e2
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/514ba4e2
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/514ba4e2
Branch: refs/heads/1.x-branch
Commit: 514ba4e2a3aa8b13b46b9426d3619922428c93db
Parents: 23a5392
Author: Abhishek Agarwal <ab...@inmobi.com>
Authored: Wed Mar 9 01:43:23 2016 +0530
Committer: Abhishek Agarwal <ab...@inmobi.com>
Committed: Wed Mar 9 01:43:23 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/514ba4e2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f507265..f7ebcbe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,7 +216,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>
@@ -237,7 +237,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>
@@ -495,7 +495,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/514ba4e2/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 5386d85..21a3857 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -48,7 +48,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/514ba4e2/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);
}
/**
[2/3] storm git commit: Merge branch 'kryo3-1.x' of
github.com:abhishekagarwal87/storm into 1.x-branch
Posted by pt...@apache.org.
Merge branch 'kryo3-1.x' of github.com:abhishekagarwal87/storm into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ed0722e3
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ed0722e3
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ed0722e3
Branch: refs/heads/1.x-branch
Commit: ed0722e3d60cec304cf2725df632834e1a1c3c25
Parents: 732982d 514ba4e
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Mar 23 16:05:07 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Mar 23 16:05:07 2016 -0400
----------------------------------------------------------------------
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/ed0722e3/pom.xml
----------------------------------------------------------------------
[3/3] storm git commit: add STORM-1537 to changelog
Posted by pt...@apache.org.
add 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/dee9aee3
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/dee9aee3
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/dee9aee3
Branch: refs/heads/1.x-branch
Commit: dee9aee3dc93f42b2d7806b8f6bc0ac60a29d5ab
Parents: ed0722e
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Mar 23 16:06:43 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Mar 23 16:06:43 2016 -0400
----------------------------------------------------------------------
CHANGELOG.md | 1 +
storm-core/pom.xml | 6 ------
2 files changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/dee9aee3/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d0fce8..79824da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.0.0
+ * STORM-1537: Upgrade to kryo 3
* STORM-1556: nimbus.clj/wait-for-desired-code-replication wrong reset for current-replication-count-jar in local mode
* STORM-1636: Supervisor shutdown with worker id pass in being nil
* STORM-1641: make subtree node creation consistent
http://git-wip-us.apache.org/repos/asf/storm/blob/dee9aee3/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 21a3857..c64f79b 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -50,12 +50,6 @@
<dependency>
<groupId>com.esotericsoftware</groupId>
<artifactId>kryo</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.objenesis</groupId>
- <artifactId>objenesis</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!--clojure-->
<dependency>