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:39 UTC
[3/5] git commit: Merge remote-tracking branch 'upstream/master' into
avoid-deprecated-encode
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
----------------------------------------------------------------------