You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2014/04/24 21:06:37 UTC
[1/5] git commit: Use URLEncoder#encode with the encoding specified.
Repository: incubator-storm
Updated Branches:
refs/heads/master d2315e90b -> 8c90f176f
Use URLEncoder#encode with the encoding specified.
We should set the name of character encoding to UTF-8 explicitly
because URLEncoder#encode without the encoding parameter is deprecated
and the W3C states that UTF-8 should be used according to Java API docs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/a1871e55
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/a1871e55
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/a1871e55
Branch: refs/heads/master
Commit: a1871e5557e8770d5be73691ebdca75a83cb993d
Parents: 6cc9bfe
Author: Muneyuki Noguchi <no...@gmail.com>
Authored: Fri Apr 18 21:13:15 2014 -0700
Committer: Muneyuki Noguchi <no...@gmail.com>
Committed: Fri Apr 18 22:52:18 2014 -0700
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/config.clj | 2 +-
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 2 +-
storm-core/src/clj/backtype/storm/ui/helpers.clj | 4 ++--
storm-core/src/clj/backtype/storm/util.clj | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/a1871e55/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 955fdfe..15be94d 100644
--- a/storm-core/src/clj/backtype/storm/config.clj
+++ b/storm-core/src/clj/backtype/storm/config.clj
@@ -163,7 +163,7 @@
(defn supervisor-stormdist-root
([conf] (str (supervisor-local-dir conf) file-path-separator "stormdist"))
([conf storm-id]
- (str (supervisor-stormdist-root conf) file-path-separator (java.net.URLEncoder/encode storm-id))))
+ (str (supervisor-stormdist-root conf) file-path-separator (url-encode storm-id))))
(defn supervisor-stormjar-path [stormroot]
(str stormroot file-path-separator "stormjar.jar"))
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/a1871e55/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
index 43cb6fe..e2e246f 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -460,7 +460,7 @@
" -Dworker.id=" worker-id
" -Dworker.port=" port
" -cp " classpath " backtype.storm.daemon.worker "
- (java.net.URLEncoder/encode storm-id) " " (:assignment-id supervisor)
+ (url-encode storm-id) " " (:assignment-id supervisor)
" " port " " worker-id)]
(log-message "Launching worker with command: " command)
(launch-process command :environment {"LD_LIBRARY_PATH" (conf JAVA-LIBRARY-PATH)})
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/a1871e55/storm-core/src/clj/backtype/storm/ui/helpers.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/ui/helpers.clj b/storm-core/src/clj/backtype/storm/ui/helpers.clj
index 45e051c..dcd4a21 100644
--- a/storm-core/src/clj/backtype/storm/ui/helpers.clj
+++ b/storm-core/src/clj/backtype/storm/ui/helpers.clj
@@ -17,7 +17,7 @@
(:use compojure.core)
(:use [hiccup core page-helpers])
(:use [clojure [string :only [join]]])
- (:use [backtype.storm.util :only [uuid defnk]])
+ (:use [backtype.storm.util :only [uuid defnk url-encode]])
(:use [clj-time coerce format])
(:import [backtype.storm.generated ExecutorInfo ExecutorSummary])
(:require [compojure.route :as route]
@@ -130,7 +130,7 @@ $(\"table#%s\").each(function(i) { $(this).tablesorter({ sortList: %s, headers:
(defn url-format [fmt & args]
(String/format fmt
- (to-array (map #(java.net.URLEncoder/encode (str %)) args))))
+ (to-array (map #(url-encode (str %)) args))))
(defn to-tasks [^ExecutorInfo e]
(let [start (.get_task_start e)
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/a1871e55/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 8bfacd3..dde8b85 100644
--- a/storm-core/src/clj/backtype/storm/util.clj
+++ b/storm-core/src/clj/backtype/storm/util.clj
@@ -763,7 +763,7 @@
))
(defn url-encode [s]
- (java.net.URLEncoder/encode s))
+ (java.net.URLEncoder/encode s "UTF-8"))
(defn join-maps [& maps]
(let [all-keys (apply set/union (for [m maps] (-> m keys set)))]
[2/5] git commit: Use decode with the encoding specified.
Posted by pt...@apache.org.
Use decode with the encoding specified.
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/0877e153
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/0877e153
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/0877e153
Branch: refs/heads/master
Commit: 0877e1530eedf4f2cbf03142e32ed773b52ed4bd
Parents: a1871e5
Author: Muneyuki Noguchi <no...@gmail.com>
Authored: Mon Apr 21 08:04:20 2014 +0900
Committer: Muneyuki Noguchi <no...@gmail.com>
Committed: Mon Apr 21 08:06:44 2014 +0900
----------------------------------------------------------------------
.../src/clj/backtype/storm/daemon/supervisor.clj | 2 +-
storm-core/src/clj/backtype/storm/daemon/worker.clj | 2 +-
storm-core/src/clj/backtype/storm/ui/core.clj | 14 +++++++-------
storm-core/src/clj/backtype/storm/util.clj | 3 +++
4 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/0877e153/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
index e2e246f..66e6581 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -69,7 +69,7 @@
(map-val :master-code-dir assignments-snapshot))
(defn- read-downloaded-storm-ids [conf]
- (map #(java.net.URLDecoder/decode %) (read-dir-contents (supervisor-stormdist-root conf)))
+ (map #(url-decode %) (read-dir-contents (supervisor-stormdist-root conf)))
)
(defn read-worker-heartbeat [conf id]
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/0877e153/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 3055b66..faff7a0 100644
--- a/storm-core/src/clj/backtype/storm/daemon/worker.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/worker.clj
@@ -451,4 +451,4 @@
(defn -main [storm-id assignment-id port-str worker-id]
(let [conf (read-storm-config)]
(validate-distributed-mode! conf)
- (mk-worker conf nil (java.net.URLDecoder/decode storm-id) assignment-id (Integer/parseInt port-str) worker-id)))
+ (mk-worker conf nil (url-decode storm-id) assignment-id (Integer/parseInt port-str) worker-id)))
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/0877e153/storm-core/src/clj/backtype/storm/ui/core.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/ui/core.clj b/storm-core/src/clj/backtype/storm/ui/core.clj
index ad4b97f..e108690 100644
--- a/storm-core/src/clj/backtype/storm/ui/core.clj
+++ b/storm-core/src/clj/backtype/storm/ui/core.clj
@@ -1017,7 +1017,7 @@
ui-template))
(GET "/topology/:id" [:as {cookies :cookies} id & m]
(let [include-sys? (get-include-sys? cookies)
- id (java.net.URLDecoder/decode id)]
+ id (url-decode id)]
(try
(-> (topology-page id (:window m) include-sys?)
(concat [(mk-system-toggle-button include-sys?)])
@@ -1025,14 +1025,14 @@
(catch Exception e (resp/redirect "/")))))
(GET "/topology/:id/component/:component" [:as {cookies :cookies} id component & m]
(let [include-sys? (get-include-sys? cookies)
- id (java.net.URLDecoder/decode id)
- component (java.net.URLDecoder/decode component)]
+ id (url-decode id)
+ component (url-decode component)]
(-> (component-page id component (:window m) include-sys?)
(concat [(mk-system-toggle-button include-sys?)])
ui-template)))
(POST "/topology/:id/activate" [id]
(with-nimbus nimbus
- (let [id (java.net.URLDecoder/decode id)
+ (let [id (url-decode id)
tplg (.getTopologyInfo ^Nimbus$Client nimbus id)
name (.get_name tplg)]
(.activate nimbus name)
@@ -1040,7 +1040,7 @@
(resp/redirect (str "/topology/" id)))
(POST "/topology/:id/deactivate" [id]
(with-nimbus nimbus
- (let [id (java.net.URLDecoder/decode id)
+ (let [id (url-decode id)
tplg (.getTopologyInfo ^Nimbus$Client nimbus id)
name (.get_name tplg)]
(.deactivate nimbus name)
@@ -1048,7 +1048,7 @@
(resp/redirect (str "/topology/" id)))
(POST "/topology/:id/rebalance/:wait-time" [id wait-time]
(with-nimbus nimbus
- (let [id (java.net.URLDecoder/decode id)
+ (let [id (url-decode id)
tplg (.getTopologyInfo ^Nimbus$Client nimbus id)
name (.get_name tplg)
options (RebalanceOptions.)]
@@ -1058,7 +1058,7 @@
(resp/redirect (str "/topology/" id)))
(POST "/topology/:id/kill/:wait-time" [id wait-time]
(with-nimbus nimbus
- (let [id (java.net.URLDecoder/decode id)
+ (let [id (url-decode id)
tplg (.getTopologyInfo ^Nimbus$Client nimbus id)
name (.get_name tplg)
options (KillOptions.)]
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/0877e153/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 dde8b85..fc36b4e 100644
--- a/storm-core/src/clj/backtype/storm/util.clj
+++ b/storm-core/src/clj/backtype/storm/util.clj
@@ -765,6 +765,9 @@
(defn url-encode [s]
(java.net.URLEncoder/encode s "UTF-8"))
+(defn url-decode [s]
+ (java.net.URLDecoder/decode s "UTF-8"))
+
(defn join-maps [& maps]
(let [all-keys (apply set/union (for [m maps] (-> m keys set)))]
(into {}
[3/5] git commit: Merge remote-tracking branch 'upstream/master' into
avoid-deprecated-encode
Posted by pt...@apache.org.
Merge remote-tracking branch 'upstream/master' into avoid-deprecated-encode
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/7ff8dbf4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/7ff8dbf4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/7ff8dbf4
Branch: refs/heads/master
Commit: 7ff8dbf412e825165b38a0ec7c784aee54656346
Parents: 0877e15 d2315e9
Author: Muneyuki Noguchi <no...@gmail.com>
Authored: Fri Apr 25 01:46:30 2014 +0900
Committer: Muneyuki Noguchi <no...@gmail.com>
Committed: Fri Apr 25 01:46:30 2014 +0900
----------------------------------------------------------------------
CHANGELOG.md | 4 +
external/storm-kafka/CHANGELOG.md | 13 +
external/storm-kafka/README.md | 25 ++
external/storm-kafka/pom.xml | 138 ++++++++++
.../storm-kafka/src/jvm/storm/kafka/Broker.java | 80 ++++++
.../src/jvm/storm/kafka/BrokerHosts.java | 25 ++
.../jvm/storm/kafka/DynamicBrokersReader.java | 145 ++++++++++
.../kafka/DynamicPartitionConnections.java | 94 +++++++
.../jvm/storm/kafka/FailedFetchException.java | 29 ++
.../src/jvm/storm/kafka/KafkaConfig.java | 50 ++++
.../src/jvm/storm/kafka/KafkaError.java | 43 +++
.../src/jvm/storm/kafka/KafkaSpout.java | 190 +++++++++++++
.../src/jvm/storm/kafka/KafkaUtils.java | 235 ++++++++++++++++
.../src/jvm/storm/kafka/KeyValueScheme.java | 28 ++
.../kafka/KeyValueSchemeAsMultiScheme.java | 36 +++
.../src/jvm/storm/kafka/Partition.java | 64 +++++
.../jvm/storm/kafka/PartitionCoordinator.java | 26 ++
.../src/jvm/storm/kafka/PartitionManager.java | 241 +++++++++++++++++
.../src/jvm/storm/kafka/SpoutConfig.java | 36 +++
.../src/jvm/storm/kafka/StaticCoordinator.java | 48 ++++
.../src/jvm/storm/kafka/StaticHosts.java | 38 +++
.../storm/kafka/StaticPartitionConnections.java | 52 ++++
.../jvm/storm/kafka/StringKeyValueScheme.java | 37 +++
.../src/jvm/storm/kafka/StringScheme.java | 46 ++++
.../src/jvm/storm/kafka/ZkCoordinator.java | 112 ++++++++
.../src/jvm/storm/kafka/ZkHosts.java | 36 +++
.../src/jvm/storm/kafka/ZkState.java | 116 ++++++++
.../src/jvm/storm/kafka/bolt/KafkaBolt.java | 89 ++++++
.../jvm/storm/kafka/trident/Coordinator.java | 50 ++++
.../storm/kafka/trident/DefaultCoordinator.java | 31 +++
.../trident/GlobalPartitionInformation.java | 99 +++++++
.../storm/kafka/trident/IBatchCoordinator.java | 26 ++
.../jvm/storm/kafka/trident/IBrokerReader.java | 25 ++
.../src/jvm/storm/kafka/trident/MaxMetric.java | 40 +++
.../kafka/trident/OpaqueTridentKafkaSpout.java | 59 ++++
.../storm/kafka/trident/StaticBrokerReader.java | 36 +++
.../trident/TransactionalTridentKafkaSpout.java | 58 ++++
.../storm/kafka/trident/TridentKafkaConfig.java | 37 +++
.../kafka/trident/TridentKafkaEmitter.java | 269 +++++++++++++++++++
.../jvm/storm/kafka/trident/ZkBrokerReader.java | 62 +++++
.../storm/kafka/DynamicBrokersReaderTest.java | 155 +++++++++++
.../src/test/storm/kafka/KafkaErrorTest.java | 39 +++
.../src/test/storm/kafka/KafkaTestBroker.java | 58 ++++
.../src/test/storm/kafka/KafkaUtilsTest.java | 221 +++++++++++++++
.../storm/kafka/StringKeyValueSchemeTest.java | 38 +++
.../src/test/storm/kafka/TestUtils.java | 20 ++
.../src/test/storm/kafka/ZkCoordinatorTest.java | 130 +++++++++
.../test/storm/kafka/bolt/KafkaBoltTest.java | 171 ++++++++++++
pom.xml | 12 +-
storm-core/pom.xml | 15 ++
.../src/clj/backtype/storm/daemon/common.clj | 6 +-
.../clj/backtype/storm/daemon/supervisor.clj | 46 ++--
.../src/clj/backtype/storm/daemon/worker.clj | 2 +-
storm-core/src/clj/backtype/storm/ui/core.clj | 3 +-
storm-core/src/clj/backtype/storm/util.clj | 4 +-
storm-core/src/jvm/backtype/storm/Config.java | 5 +-
.../jvm/backtype/storm/ConfigValidation.java | 17 ++
.../src/jvm/backtype/storm/StormSubmitter.java | 20 +-
.../src/jvm/backtype/storm/utils/Utils.java | 31 ++-
.../trident/spout/RichSpoutBatchTriggerer.java | 1 +
.../test/clj/backtype/storm/config_test.clj | 20 ++
.../test/clj/backtype/storm/supervisor_test.clj | 64 ++++-
storm-dist/binary/src/main/assembly/binary.xml | 19 ++
63 files changed, 3919 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/7ff8dbf4/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/7ff8dbf4/storm-core/src/clj/backtype/storm/ui/core.clj
----------------------------------------------------------------------
diff --cc storm-core/src/clj/backtype/storm/ui/core.clj
index e108690,87e79fa..d5e7523
--- a/storm-core/src/clj/backtype/storm/ui/core.clj
+++ b/storm-core/src/clj/backtype/storm/ui/core.clj
@@@ -1017,9 -1018,9 +1018,9 @@@
ui-template))
(GET "/topology/:id" [:as {cookies :cookies} id & m]
(let [include-sys? (get-include-sys? cookies)
- id (java.net.URLDecoder/decode id)]
+ id (url-decode id)]
(try
- (-> (topology-page id (:window m) include-sys?)
+ (-> (topology-page (URLDecoder/decode id) (:window m) include-sys?)
(concat [(mk-system-toggle-button include-sys?)])
ui-template)
(catch Exception e (resp/redirect "/")))))
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/7ff8dbf4/storm-core/src/clj/backtype/storm/util.clj
----------------------------------------------------------------------
[5/5] git commit: update changelog with closed JIRAs
Posted by pt...@apache.org.
update changelog with closed JIRAs
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/8c90f176
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/8c90f176
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/8c90f176
Branch: refs/heads/master
Commit: 8c90f176f921658fe120422628229e01d98d8f68
Parents: 351895a
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Apr 24 15:06:22 2014 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Apr 24 15:06:22 2014 -0400
----------------------------------------------------------------------
CHANGELOG.md | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/8c90f176/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79b08eb..68e26dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
## 0.9.2-incubating (unreleased)
+ * STORM-287: Fix the positioning of documentation strings in clojure code
+ * STORM-290: Fix a log binding conflict caused by curator dependencies
+ * STORM-289: Fix Trident DRPC memory leak
* STORM-173: Treat command line "-c" option number config values as such
* STORM-194: Support list of strings in *.worker.childopts, handle spaces
* STORM-288: Fixes version spelling in pom.xml
[4/5] git commit: Replace another URLDecoder#decode.
Posted by pt...@apache.org.
Replace another URLDecoder#decode.
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/351895a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/351895a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/351895a9
Branch: refs/heads/master
Commit: 351895a9b1c02738e64bc04812759b1a6f8c0bd6
Parents: 7ff8dbf
Author: Muneyuki Noguchi <no...@gmail.com>
Authored: Fri Apr 25 01:52:57 2014 +0900
Committer: Muneyuki Noguchi <no...@gmail.com>
Committed: Fri Apr 25 01:53:49 2014 +0900
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/ui/core.clj | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/351895a9/storm-core/src/clj/backtype/storm/ui/core.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/ui/core.clj b/storm-core/src/clj/backtype/storm/ui/core.clj
index d5e7523..ad1a038 100644
--- a/storm-core/src/clj/backtype/storm/ui/core.clj
+++ b/storm-core/src/clj/backtype/storm/ui/core.clj
@@ -29,7 +29,6 @@
Nimbus$Client StormTopology GlobalStreamId RebalanceOptions
KillOptions])
(:import [java.io File])
- (:import [java.net URLDecoder])
(:require [compojure.route :as route]
[compojure.handler :as handler]
[ring.util.response :as resp]
@@ -1020,7 +1019,7 @@
(let [include-sys? (get-include-sys? cookies)
id (url-decode id)]
(try
- (-> (topology-page (URLDecoder/decode id) (:window m) include-sys?)
+ (-> (topology-page (url-decode id) (:window m) include-sys?)
(concat [(mk-system-toggle-button include-sys?)])
ui-template)
(catch Exception e (resp/redirect "/")))))