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/05/19 23:52:48 UTC
[23/24] git commit: Merge branch 'master' of
https://github.com/jsgilmore/incubator-storm into STORM-138
Merge branch 'master' of https://github.com/jsgilmore/incubator-storm into STORM-138
Conflicts:
storm-core/src/jvm/backtype/storm/Config.java
STORM-138: Pluggable serialization for multilang
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/d3c6a1b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/d3c6a1b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/d3c6a1b1
Branch: refs/heads/master
Commit: d3c6a1b1e8d03297cdca95f9244d7c49a590e3fa
Parents: 1311a1d bcbd22b
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Mon May 19 21:39:19 2014 +0000
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Mon May 19 21:39:19 2014 +0000
----------------------------------------------------------------------
conf/defaults.yaml | 1 +
storm-core/src/jvm/backtype/storm/Config.java | 7 +
.../jvm/backtype/storm/multilang/BoltMsg.java | 63 +++++++
.../backtype/storm/multilang/ISerializer.java | 65 +++++++
.../storm/multilang/JsonSerializer.java | 162 ++++++++++++++++++
.../storm/multilang/NoOutputException.java | 23 +++
.../jvm/backtype/storm/multilang/ShellMsg.java | 105 ++++++++++++
.../jvm/backtype/storm/multilang/SpoutMsg.java | 34 ++++
.../jvm/backtype/storm/spout/ShellSpout.java | 85 +++++-----
.../src/jvm/backtype/storm/task/ShellBolt.java | 109 ++++++------
.../jvm/backtype/storm/utils/ShellProcess.java | 169 +++++++++----------
11 files changed, 628 insertions(+), 195 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/d3c6a1b1/conf/defaults.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/d3c6a1b1/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/Config.java
index 9b91e07,593898f..83ee232
--- a/storm-core/src/jvm/backtype/storm/Config.java
+++ b/storm-core/src/jvm/backtype/storm/Config.java
@@@ -500,6 -500,20 +500,13 @@@ public class Config extends HashMap<Str
public static final Object TOPOLOGY_DEBUG_SCHEMA = Boolean.class;
/**
+ * The serializer for communication between shell components and non-JVM
+ * processes
+ */
+ public static final String TOPOLOGY_MULTILANG_SERIALIZER = "topology.multilang.serializer";
+ public static final Object TOPOLOGY_MULTILANG_SERIALIZER_SCHEMA = String.class;
+
+ /**
- * Whether or not the master should optimize topologies by running multiple
- * tasks in a single thread where appropriate.
- */
- public static final String TOPOLOGY_OPTIMIZE = "topology.optimize";
- public static final Object TOPOLOGY_OPTIMIZE_SCHEMA = Boolean.class;
-
- /**
* How many processes should be spawned around the cluster to execute this
* topology. Each process will execute some number of tasks as threads within
* them. This parameter should be used in conjunction with the parallelism hints