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 2016/01/11 18:22:11 UTC
[1/4] storm git commit: refactor multilang JsonSerializer
Repository: storm
Updated Branches:
refs/heads/master 8bb5f8292 -> a265c3207
refactor multilang JsonSerializer
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0cd69a13
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0cd69a13
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0cd69a13
Branch: refs/heads/master
Commit: 0cd69a13183d6d935925d0b49b23ae752e9aeac6
Parents: b41f450
Author: Xin Wang <be...@163.com>
Authored: Wed Dec 23 18:37:18 2015 +0800
Committer: Xin Wang <be...@163.com>
Committed: Wed Dec 23 18:37:18 2015 +0800
----------------------------------------------------------------------
.../storm/multilang/JsonSerializer.java | 22 +++++++++++---------
1 file changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/0cd69a13/storm-core/src/jvm/backtype/storm/multilang/JsonSerializer.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/multilang/JsonSerializer.java b/storm-core/src/jvm/backtype/storm/multilang/JsonSerializer.java
index 0e2e156..a5d5cd7 100644
--- a/storm-core/src/jvm/backtype/storm/multilang/JsonSerializer.java
+++ b/storm-core/src/jvm/backtype/storm/multilang/JsonSerializer.java
@@ -18,13 +18,13 @@
package backtype.storm.multilang;
import java.io.BufferedReader;
-import java.io.DataOutputStream;
+import java.io.BufferedWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
+import java.io.OutputStreamWriter;
import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -33,20 +33,24 @@ import org.json.simple.JSONObject;
import org.json.simple.JSONValue;
import backtype.storm.task.TopologyContext;
-import backtype.storm.tuple.Tuple;
import backtype.storm.utils.Utils;
/**
* JsonSerializer implements the JSON multilang protocol.
*/
public class JsonSerializer implements ISerializer {
- private DataOutputStream processIn;
+ //ANY CHANGE TO THIS CODE MUST BE SERIALIZABLE COMPATIBLE OR THERE WILL BE PROBLEMS
+ private static final long serialVersionUID = 8581179559440582569L;
+
+ public static final String DEFAULT_CHARSET = "UTF-8";
+
+ private BufferedWriter processIn;
private BufferedReader processOut;
public void initialize(OutputStream processIn, InputStream processOut) {
- this.processIn = new DataOutputStream(processIn);
try {
- this.processOut = new BufferedReader(new InputStreamReader(processOut, "UTF-8"));
+ this.processIn = new BufferedWriter(new OutputStreamWriter(processIn, DEFAULT_CHARSET));
+ this.processOut = new BufferedReader(new InputStreamReader(processOut, DEFAULT_CHARSET));
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
@@ -90,9 +94,8 @@ public class JsonSerializer implements ISerializer {
}
private void writeString(String str) throws IOException {
- byte[] strBytes = str.getBytes("UTF-8");
- processIn.write(strBytes, 0, strBytes.length);
- processIn.writeBytes("\nend\n");
+ processIn.write(str);
+ processIn.write("\nend\n");
processIn.flush();
}
@@ -130,7 +133,6 @@ public class JsonSerializer implements ISerializer {
shellMsg.setTuple((List) msg.get("tuple"));
- List<Tuple> anchors = new ArrayList<Tuple>();
Object anchorObj = msg.get("anchors");
if (anchorObj != null) {
if (anchorObj instanceof String) {
[2/4] storm git commit: mark processIn and processOut as transient
Posted by bo...@apache.org.
mark processIn and processOut as transient
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f6c3225d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f6c3225d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f6c3225d
Branch: refs/heads/master
Commit: f6c3225d9ed5367c2e0f132f9ea1d20c6a0bf4b4
Parents: 0cd69a1
Author: Xin Wang <be...@163.com>
Authored: Wed Jan 6 13:13:36 2016 +0800
Committer: Xin Wang <be...@163.com>
Committed: Wed Jan 6 13:13:36 2016 +0800
----------------------------------------------------------------------
.../src/jvm/backtype/storm/multilang/JsonSerializer.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f6c3225d/storm-core/src/jvm/backtype/storm/multilang/JsonSerializer.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/multilang/JsonSerializer.java b/storm-core/src/jvm/backtype/storm/multilang/JsonSerializer.java
index a5d5cd7..abd693c 100644
--- a/storm-core/src/jvm/backtype/storm/multilang/JsonSerializer.java
+++ b/storm-core/src/jvm/backtype/storm/multilang/JsonSerializer.java
@@ -40,12 +40,12 @@ import backtype.storm.utils.Utils;
*/
public class JsonSerializer implements ISerializer {
//ANY CHANGE TO THIS CODE MUST BE SERIALIZABLE COMPATIBLE OR THERE WILL BE PROBLEMS
- private static final long serialVersionUID = 8581179559440582569L;
+ private static final long serialVersionUID = 2548814660410474022L;
public static final String DEFAULT_CHARSET = "UTF-8";
- private BufferedWriter processIn;
- private BufferedReader processOut;
+ private transient BufferedWriter processIn;
+ private transient BufferedReader processOut;
public void initialize(OutputStream processIn, InputStream processOut) {
try {
[3/4] storm git commit: Merge branch 'patch-19' of
https://github.com/vesense/storm into STORM-1414
Posted by bo...@apache.org.
Merge branch 'patch-19' of https://github.com/vesense/storm into STORM-1414
STORM-1414: Some improvements for multilang JsonSerializer
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b119a3e5
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b119a3e5
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b119a3e5
Branch: refs/heads/master
Commit: b119a3e5d76ec300f88214808a682672c355f21f
Parents: 8bb5f82 f6c3225
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Jan 11 11:19:40 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon Jan 11 11:19:40 2016 -0600
----------------------------------------------------------------------
.../storm/multilang/JsonSerializer.java | 24 +++++++++++---------
1 file changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
[4/4] storm git commit: Added STORM-1414 to Changelog
Posted by bo...@apache.org.
Added STORM-1414 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a265c320
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a265c320
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a265c320
Branch: refs/heads/master
Commit: a265c3207b92e7398ec842c6e7e91f0f2ac344e4
Parents: b119a3e
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Jan 11 11:20:05 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon Jan 11 11:20:05 2016 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/a265c320/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c1e053..9849b79 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-1414: Some improvements for multilang JsonSerializer
* STORM-1408: clean up the build directory created by tests
* STORM-1425: Tick tuples should be acked like normal tuples
* STORM-1432: Spurious failure in storm-kafka test