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/02/23 18:03:26 UTC
[1/2] storm git commit: STORM-683: Make false in a conf really
evaluate to false in clojure.
Repository: storm
Updated Branches:
refs/heads/master 877e29d0d -> 348d480be
STORM-683: Make false in a conf really evaluate to false in clojure.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b60d0f18
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b60d0f18
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b60d0f18
Branch: refs/heads/master
Commit: b60d0f180d4ebeaae1f1af264f4c126f0f2f6043
Parents: 877e29d
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Feb 20 16:12:02 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon Feb 23 11:02:24 2015 -0600
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/config.clj | 3 +--
storm-core/src/clj/backtype/storm/daemon/worker.clj | 2 +-
storm-core/src/clj/backtype/storm/util.clj | 3 +++
3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/b60d0f18/storm-core/src/clj/backtype/storm/config.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/config.clj b/storm-core/src/clj/backtype/storm/config.clj
index 98b1da2..483c6ff 100644
--- a/storm-core/src/clj/backtype/storm/config.clj
+++ b/storm-core/src/clj/backtype/storm/config.clj
@@ -211,8 +211,7 @@
(let [stormroot (supervisor-stormdist-root conf storm-id)
conf-path (supervisor-stormconf-path stormroot)
topology-path (supervisor-stormcode-path stormroot)]
- (merge conf (Utils/deserialize (FileUtils/readFileToByteArray (File. conf-path))))
- ))
+ (merge conf (clojurify-structure (Utils/deserialize (FileUtils/readFileToByteArray (File. conf-path)))))))
(defn read-supervisor-topology
[conf storm-id]
http://git-wip-us.apache.org/repos/asf/storm/blob/b60d0f18/storm-core/src/clj/backtype/storm/daemon/worker.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/worker.clj b/storm-core/src/clj/backtype/storm/daemon/worker.clj
index 0a5d984..46ded42 100644
--- a/storm-core/src/clj/backtype/storm/daemon/worker.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/worker.clj
@@ -130,7 +130,7 @@
local-transfer (:transfer-local-fn worker)
^DisruptorQueue transfer-queue (:transfer-queue worker)
task->node+port (:cached-task->node+port worker)
- try-serialize-local ((:conf worker) TOPOLOGY-TESTING-ALWAYS-TRY-SERIALIZE)
+ try-serialize-local ((:storm-conf worker) TOPOLOGY-TESTING-ALWAYS-TRY-SERIALIZE)
transfer-fn
(fn [^KryoTupleSerializer serializer tuple-batch]
(let [local (ArrayList.)
http://git-wip-us.apache.org/repos/asf/storm/blob/b60d0f18/storm-core/src/clj/backtype/storm/util.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/util.clj b/storm-core/src/clj/backtype/storm/util.clj
index d67c264..36dc62c 100644
--- a/storm-core/src/clj/backtype/storm/util.clj
+++ b/storm-core/src/clj/backtype/storm/util.clj
@@ -247,6 +247,9 @@
(prewalk (fn [x]
(cond (instance? Map x) (into {} x)
(instance? List x) (vec x)
+ ;; (Boolean. false) does not evaluate to false in an if.
+ ;; This fixes that.
+ (instance? Boolean x) (boolean x)
true x))
s))
[2/2] storm git commit: Added STORM-683 to Changelog
Posted by bo...@apache.org.
Added STORM-683 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/348d480b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/348d480b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/348d480b
Branch: refs/heads/master
Commit: 348d480bed8d10f6a9ed5902a1b14fe3e8167029
Parents: b60d0f1
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Feb 23 11:01:01 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon Feb 23 11:02:55 2015 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/348d480b/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e0e944..3614b44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -55,6 +55,7 @@
* STORM-609: Add storm-redis to storm external
* STORM-130: Supervisor getting killed due to java.io.FileNotFoundException: File '../stormconf.ser' does not exist.
* STORM-684: In RichSpoutBatchExecutor: underlying spout is not closed when emitter is closed
+ * STORM-683: Make false in a conf really evaluate to false in clojure.
## 0.9.3-rc2
* STORM-558: change "swap!" to "reset!" to fix assignment-versions in supervisor