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/06/12 21:55:09 UTC
[12/13] git commit: Merge branch 'idiomatic-clojure-01' of
https://github.com/bluemont/incubator-storm into STORM-338
Merge branch 'idiomatic-clojure-01' of https://github.com/bluemont/incubator-storm into STORM-338
STORM-338: Move towards idiomatic Clojure style
Conflicts:
CHANGELOG.md
storm-core/src/clj/backtype/storm/daemon/drpc.clj
storm-core/src/clj/backtype/storm/disruptor.clj
storm-core/src/clj/backtype/storm/timer.clj
storm-core/src/clj/backtype/storm/ui/core.clj
storm-core/src/jvm/backtype/storm/messaging/netty/NettyRenameThreadFactory.java
storm-core/src/ui/public/component.html
storm-core/src/ui/public/index.html
storm-core/src/ui/public/js/visualization.js
storm-core/src/ui/public/templates/component-page-template.html
storm-core/src/ui/public/templates/index-page-template.html
storm-core/src/ui/public/templates/json-error-template.html
storm-core/src/ui/public/templates/topology-page-template.html
storm-core/src/ui/public/topology.html
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/862f6735
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/862f6735
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/862f6735
Branch: refs/heads/master
Commit: 862f6735f2e4cf9734b395385609bec8f0b6041f
Parents: 2a60e99 2456f0a
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Thu Jun 12 14:53:13 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Thu Jun 12 14:53:13 2014 -0500
----------------------------------------------------------------------
CHANGELOG.md | 3 +
DEVELOPER.md | 8 +
.../src/clj/backtype/storm/LocalCluster.clj | 71 +-
storm-core/src/clj/backtype/storm/LocalDRPC.clj | 5 +-
storm-core/src/clj/backtype/storm/bootstrap.clj | 9 +-
storm-core/src/clj/backtype/storm/clojure.clj | 10 +-
storm-core/src/clj/backtype/storm/cluster.clj | 427 +++++------
storm-core/src/clj/backtype/storm/config.clj | 145 ++--
.../src/clj/backtype/storm/daemon/drpc.clj | 135 ++--
storm-core/src/clj/backtype/storm/disruptor.clj | 80 +--
storm-core/src/clj/backtype/storm/event.clj | 49 +-
storm-core/src/clj/backtype/storm/log.clj | 22 +-
.../clj/backtype/storm/process_simulator.clj | 27 +-
storm-core/src/clj/backtype/storm/stats.clj | 289 ++++----
storm-core/src/clj/backtype/storm/testing.clj | 523 +++++++-------
storm-core/src/clj/backtype/storm/testing4j.clj | 58 +-
storm-core/src/clj/backtype/storm/thrift.clj | 255 ++++---
storm-core/src/clj/backtype/storm/timer.clj | 106 +--
storm-core/src/clj/backtype/storm/tuple.clj | 7 +-
storm-core/src/clj/backtype/storm/ui/core.clj | 559 ++++++++-------
storm-core/src/clj/backtype/storm/util.clj | 717 ++++++++++---------
storm-core/src/clj/backtype/storm/zookeeper.clj | 158 ++--
.../netty/NettyRenameThreadFactory.java | 2 +-
23 files changed, 1947 insertions(+), 1718 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/862f6735/CHANGELOG.md
----------------------------------------------------------------------
diff --cc CHANGELOG.md
index 1666729,0fa35e7..fb1062c
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -1,4 -1,4 +1,7 @@@
-## 0.9.2-incubating (unreleased)
++## 0.9.3-incubating (unreleased)
++ * STORM-338 Move towards idiomatic Clojure style
++
+## 0.9.2-incubating
* STORM-335: add drpc test for removing timed out requests from queue
* STORM-69: Storm UI Visualizations for Topologies
* STORM-297: Performance scaling with CPU
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/862f6735/storm-core/src/clj/backtype/storm/ui/core.clj
----------------------------------------------------------------------
diff --cc storm-core/src/clj/backtype/storm/ui/core.clj
index 5f2bcba,d8ad29a..68bc4c0
--- a/storm-core/src/clj/backtype/storm/ui/core.clj
+++ b/storm-core/src/clj/backtype/storm/ui/core.clj
@@@ -57,7 -62,13 +62,10 @@@
(trim (slurp release-path))
"Unknown")))
- (defn component-type [^StormTopology topology id]
-;; TODO: What is the desired behavior if a particular component id
-;; corresponded to both a bolt and spout. Where should the error
-;; occur? -DCJ
+ (defn component-type
+ "Returns the component type (either :bolt or :spout) for a given
+ topology and component id. Returns nil if not found."
+ [^StormTopology topology id]
(let [bolts (.get_bolts topology)
spouts (.get_spouts topology)]
(cond
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/862f6735/storm-core/src/jvm/backtype/storm/messaging/netty/NettyRenameThreadFactory.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/messaging/netty/NettyRenameThreadFactory.java
index 148bcfa,ea3f249..3a91a58
--- a/storm-core/src/jvm/backtype/storm/messaging/netty/NettyRenameThreadFactory.java
+++ b/storm-core/src/jvm/backtype/storm/messaging/netty/NettyRenameThreadFactory.java
@@@ -49,4 -32,4 +49,4 @@@ public class NettyRenameThreadFactory
t.setPriority(Thread.NORM_PRIORITY);
return t;
}
--}
++}