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 2015/08/05 23:03:59 UTC
[1/3] storm git commit: [STORM-968] Adding support to generate the id
based on names in Trident
Repository: storm
Updated Branches:
refs/heads/master 2a7bbfa74 -> 827ddbd8c
[STORM-968] Adding support to generate the id based on names in Trident
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4555c56f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4555c56f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4555c56f
Branch: refs/heads/master
Commit: 4555c56f9a05476f0e96fb97aa1da9adbc90037a
Parents: 285d943
Author: nsingh1 <ns...@yahoo-inc.com>
Authored: Fri Jul 31 11:05:12 2015 -0500
Committer: nsingh1 <ns...@yahoo-inc.com>
Committed: Fri Jul 31 11:17:59 2015 -0500
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/drpc/DRPCSpout.java | 6 +++++-
storm-core/src/jvm/storm/trident/TridentTopology.java | 13 ++++++++++---
2 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/4555c56f/storm-core/src/jvm/backtype/storm/drpc/DRPCSpout.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/drpc/DRPCSpout.java b/storm-core/src/jvm/backtype/storm/drpc/DRPCSpout.java
index c4a2275..ce233ed 100644
--- a/storm-core/src/jvm/backtype/storm/drpc/DRPCSpout.java
+++ b/storm-core/src/jvm/backtype/storm/drpc/DRPCSpout.java
@@ -82,7 +82,11 @@ public class DRPCSpout extends BaseRichSpout {
_function = function;
_local_drpc_id = drpc.getServiceId();
}
-
+
+ public String get_function() {
+ return _function;
+ }
+
private class Adder implements Callable<Void> {
private String server;
private int port;
http://git-wip-us.apache.org/repos/asf/storm/blob/4555c56f/storm-core/src/jvm/storm/trident/TridentTopology.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/storm/trident/TridentTopology.java b/storm-core/src/jvm/storm/trident/TridentTopology.java
index 3ed2386..8164717 100644
--- a/storm-core/src/jvm/storm/trident/TridentTopology.java
+++ b/storm-core/src/jvm/storm/trident/TridentTopology.java
@@ -506,13 +506,20 @@ public class TridentTopology {
}
return ret.values();
}
-
+
private static Map<Node, String> genSpoutIds(Collection<SpoutNode> spoutNodes) {
Map<Node, String> ret = new HashMap();
int ctr = 0;
for(SpoutNode n: spoutNodes) {
- ret.put(n, "spout" + ctr);
- ctr++;
+ if (n.type == SpoutNode.SpoutType.BATCH) { // if Batch spout then id contains txId
+ ret.put(n, "spout-" + n.txId);
+ } else if (n.type == SpoutNode.SpoutType.DRPC){ //if DRPC spout then id contains function
+ ret.put(n, "spout-" + ((DRPCSpout) n.spout).get_function() + ctr);
+ ctr++;
+ } else {
+ ret.put(n, "spout" + ctr);
+ ctr++;
+ }
}
return ret;
}
[2/3] storm git commit: Merge branch 'STORM-968' of
https://github.com/snikhil5/incubator-storm into STORM-968
Posted by bo...@apache.org.
Merge branch 'STORM-968' of https://github.com/snikhil5/incubator-storm into STORM-968
STORM-968: Adding support to generate the id based on names in Trident
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/524eee6f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/524eee6f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/524eee6f
Branch: refs/heads/master
Commit: 524eee6f4d454d40fbc2fcee69499ee07b14208c
Parents: 2a7bbfa 4555c56
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Aug 5 15:53:04 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Aug 5 15:53:04 2015 -0500
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/drpc/DRPCSpout.java | 6 +++++-
storm-core/src/jvm/storm/trident/TridentTopology.java | 13 ++++++++++---
2 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[3/3] storm git commit: Added STORM-968 to Changelog
Posted by bo...@apache.org.
Added STORM-968 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/827ddbd8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/827ddbd8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/827ddbd8
Branch: refs/heads/master
Commit: 827ddbd8c900d6e8341b487303f72f55b483782f
Parents: 524eee6
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Aug 5 16:01:35 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Aug 5 16:03:17 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/827ddbd8/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5aafef..c21d8dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
* STORM-918: Storm CLI could validate arguments/print usage
* STORM-859: Add regression test of STORM-856
* STORM-913: Use Curator's delete().deletingChildrenIfNeeded() instead of zk/delete-recursive
+ * STORM-968: Adding support to generate the id based on names in Trident
## 0.10.0-beta2
* STORM-843: [storm-redis] Add Javadoc to storm-redis