You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by da...@apache.org on 2015/03/05 16:51:55 UTC
[1/4] storm git commit: Update "get-task-object" function in task.clj
Repository: storm
Updated Branches:
refs/heads/master 2dbeb98ad -> 5eff2e761
Update "get-task-object" function in task.clj
Update "get-task-object" function, change the type of first param "topology" from ^TopologyContext to ^StormTopology. the "get-task-object" function in task.clj,the type of first param "topology" should be ^StormTopology not ^TopologyContext.
the "get-task-object" is called by "mk-task-data" function in task.clj, "mk-task-data" is defined as following:
(defn mk-task-data [executor-data task-id]
(recursive-map
:executor-data executor-data
:task-id task-id
:system-context (system-topology-context (:worker executor-data) executor-data task-id)
:user-context (user-topology-context (:worker executor-data) executor-data task-id)
:builtin-metrics (builtin-metrics/make-data (:type executor-data))
:tasks-fn (mk-tasks-fn <>)
:object (get-task-object (.getRawTopology ^TopologyContext (:system-context <>)) (:component-id executor-data))))
(:system-context <>) return TopologyContext instance, TopologyContext extends GeneralTopologyContext, the TopologyContext instance has StormTopology _topology. “getRawTopology” method of TopologyContext must return StormTopology _topology. (.getRawTopology ^TopologyContext (:system-context <>) return StormTopology instance not TopologyContext instance. so the type of param topology is StormTopology not TopologyContext.
at the same time, "get-task-object" call "get_spouts" and "get_bolts" of the param topology. you can find the "get_spouts" and "get_bolts" function are only defined in StormTopology, and StormTopology is not a subclass of TopologyContext. so i think the type of param topology is StormTopology not TopologyContext.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0ee86575
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0ee86575
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0ee86575
Branch: refs/heads/master
Commit: 0ee865750e8d54c00d2abac81c20c429483bc646
Parents: 8036109
Author: zhangjinlong <zh...@126.com>
Authored: Mon Feb 16 13:49:06 2015 +0800
Committer: zhangjinlong <zh...@126.com>
Committed: Mon Feb 16 13:49:06 2015 +0800
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/task.clj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/0ee86575/storm-core/src/clj/backtype/storm/daemon/task.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/task.clj b/storm-core/src/clj/backtype/storm/daemon/task.clj
index 6a61cea..a08ba3c 100644
--- a/storm-core/src/clj/backtype/storm/daemon/task.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/task.clj
@@ -61,7 +61,7 @@
(:topology worker))
tid))
-(defn- get-task-object [^TopologyContext topology component-id]
+(defn- get-task-object [^StormTopology topology component-id]
(let [spouts (.get_spouts topology)
bolts (.get_bolts topology)
state-spouts (.get_state_spouts topology)
[4/4] storm git commit: Updating CHANGELOG for STORM-554
Posted by da...@apache.org.
Updating CHANGELOG for STORM-554
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5eff2e76
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5eff2e76
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5eff2e76
Branch: refs/heads/master
Commit: 5eff2e761cc8c981a82e46333b72810d2ed5c5c6
Parents: d589f03
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Thu Mar 5 09:39:49 2015 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Thu Mar 5 09:39:49 2015 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/5eff2e76/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12973a4..d93d56d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,6 +64,7 @@
* STORM-688: update Util to compile under JDK8
* STORM-687: Storm UI does not display up to date information despite refreshes in IE
* STORM-557: High Quality Images for presentations
+ * STORM-554: the type of first param "topology" should be ^StormTopology not ^TopologyContext
## 0.9.3-rc2
* STORM-558: change "swap!" to "reset!" to fix assignment-versions in supervisor
[3/4] storm git commit: Merge branch 'master' of
https://github.com/BuDongDong/storm into STORM-554
Posted by da...@apache.org.
Merge branch 'master' of https://github.com/BuDongDong/storm into STORM-554
STORM-554: the "get-task-object" function in task.clj,the type of first
param "topology" should be ^StormTopology not ^TopologyContext
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d589f031
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d589f031
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d589f031
Branch: refs/heads/master
Commit: d589f0316b71f63e85e0360007b66b2df962e02c
Parents: 2dbeb98 f0cef2b
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Thu Mar 5 09:38:05 2015 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Thu Mar 5 09:38:05 2015 -0600
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/task.clj | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/d589f031/storm-core/src/clj/backtype/storm/daemon/task.clj
----------------------------------------------------------------------
diff --cc storm-core/src/clj/backtype/storm/daemon/task.clj
index b037d21,9492075..f46e6ae
--- a/storm-core/src/clj/backtype/storm/daemon/task.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/task.clj
@@@ -15,23 -15,17 +15,23 @@@
;; limitations under the License.
(ns backtype.storm.daemon.task
(:use [backtype.storm.daemon common])
- (:use [backtype.storm bootstrap])
+ (:use [backtype.storm config util log])
(:import [backtype.storm.hooks ITaskHook])
- (:import [backtype.storm.tuple Tuple])
+ (:import [backtype.storm.tuple Tuple TupleImpl])
- (:import [backtype.storm.generated SpoutSpec Bolt StateSpoutSpec])
+ (:import [backtype.storm.generated SpoutSpec Bolt StateSpoutSpec StormTopology])
(:import [backtype.storm.hooks.info SpoutAckInfo SpoutFailInfo
EmitInfo BoltFailInfo BoltAckInfo])
- (:require [backtype.storm [tuple :as tuple]])
+ (:import [backtype.storm.task TopologyContext ShellBolt WorkerTopologyContext])
+ (:import [backtype.storm.utils Utils])
+ (:import [backtype.storm.generated ShellComponent JavaObject])
+ (:import [backtype.storm.spout ShellSpout])
+ (:import [java.util Collection List ArrayList])
+ (:require [backtype.storm
+ [tuple :as tuple]
+ [thrift :as thrift]
+ [stats :as stats]])
(:require [backtype.storm.daemon.builtin-metrics :as builtin-metrics]))
-(bootstrap)
-
(defn mk-topology-context-builder [worker executor-data topology]
(let [conf (:conf worker)]
#(TopologyContext.
[2/4] storm git commit: Update task.clj
Posted by da...@apache.org.
Update task.clj
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f0cef2b0
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f0cef2b0
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f0cef2b0
Branch: refs/heads/master
Commit: f0cef2b0d8618254f02bf73db4263c96241dfbdc
Parents: 0ee8657
Author: zhangjinlong <zh...@126.com>
Authored: Tue Mar 3 23:04:38 2015 +0800
Committer: zhangjinlong <zh...@126.com>
Committed: Tue Mar 3 23:04:38 2015 +0800
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/task.clj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f0cef2b0/storm-core/src/clj/backtype/storm/daemon/task.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/task.clj b/storm-core/src/clj/backtype/storm/daemon/task.clj
index a08ba3c..9492075 100644
--- a/storm-core/src/clj/backtype/storm/daemon/task.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/task.clj
@@ -18,7 +18,7 @@
(:use [backtype.storm bootstrap])
(:import [backtype.storm.hooks ITaskHook])
(:import [backtype.storm.tuple Tuple])
- (:import [backtype.storm.generated SpoutSpec Bolt StateSpoutSpec])
+ (:import [backtype.storm.generated SpoutSpec Bolt StateSpoutSpec StormTopology])
(:import [backtype.storm.hooks.info SpoutAckInfo SpoutFailInfo
EmitInfo BoltFailInfo BoltAckInfo])
(:require [backtype.storm [tuple :as tuple]])