storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From da...@apache.org
Subject [3/4] storm git commit: Merge branch 'master' of https://github.com/BuDongDong/storm into STORM-554
Date Thu, 05 Mar 2015 15:51:57 GMT
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 <derekd@yahoo-inc.com>
Authored: Thu Mar 5 09:38:05 2015 -0600
Committer: Derek Dagit <derekd@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.


Mime
View raw message