storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [04/11] git commit: Merge pull request #4 from apache/master
Date Wed, 16 Jul 2014 14:48:09 GMT
Merge pull request #4 from apache/master

update from apache/incubator-storm

Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/a45b53a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/a45b53a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/a45b53a1

Branch: refs/heads/master
Commit: a45b53a167cd48a275bbb21279bcaa9e9437b97b
Parents: b2a5102 5b4bb31
Author: Li Jiahong <Gvain@users.noreply.github.com>
Authored: Wed May 7 20:09:34 2014 +0800
Committer: Li Jiahong <Gvain@users.noreply.github.com>
Committed: Wed May 7 20:09:34 2014 +0800

----------------------------------------------------------------------
 CHANGELOG.md                                    |  19 ++
 README.markdown                                 |   2 +-
 bin/storm                                       |   3 +-
 bin/storm-config.cmd                            |  11 +-
 bin/storm.cmd                                   |   9 +-
 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   |  75 ++++++
 .../src/test/storm/kafka/KafkaUtilsTest.java    | 225 ++++++++++++++++
 .../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                                         |  18 +-
 storm-core/pom.xml                              |  42 ++-
 storm-core/src/clj/backtype/storm/config.clj    |   2 +-
 .../src/clj/backtype/storm/daemon/common.clj    |   6 +-
 .../src/clj/backtype/storm/daemon/logviewer.clj |  29 +-
 .../clj/backtype/storm/daemon/supervisor.clj    |  48 ++--
 .../src/clj/backtype/storm/daemon/worker.clj    |   2 +-
 storm-core/src/clj/backtype/storm/ui/core.clj   |  16 +-
 .../src/clj/backtype/storm/ui/helpers.clj       |   4 +-
 storm-core/src/clj/backtype/storm/util.clj      |   9 +-
 storm-core/src/clj/backtype/storm/zookeeper.clj |   6 +-
 storm-core/src/jvm/backtype/storm/Config.java   |   5 +-
 .../jvm/backtype/storm/ConfigValidation.java    |  17 ++
 .../src/jvm/backtype/storm/StormSubmitter.java  |  20 +-
 .../backtype/storm/task/TopologyContext.java    |   6 +-
 .../transactional/state/TransactionalState.java |   2 +-
 .../src/jvm/backtype/storm/utils/Utils.java     |  36 ++-
 .../trident/spout/RichSpoutBatchTriggerer.java  |   1 +
 .../topology/state/TransactionalState.java      |   2 +-
 .../jvm/storm/trident/util/TridentUtils.java    |  14 +-
 .../test/clj/backtype/storm/config_test.clj     |  20 ++
 .../test/clj/backtype/storm/supervisor_test.clj |  64 ++++-
 .../test/clj/backtype/storm/utils_test.clj      |   2 +-
 storm-dist/binary/pom.xml                       |  40 +--
 storm-dist/binary/src/main/assembly/binary.xml  |  19 ++
 storm-dist/source/pom.xml                       |  38 +--
 78 files changed, 4088 insertions(+), 141 deletions(-)
----------------------------------------------------------------------



Mime
View raw message