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 2016/04/01 16:07:55 UTC
[32/35] storm git commit: Merge branch 'master' of
github.com:apache/storm
Merge branch 'master' of github.com:apache/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1b4edf42
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1b4edf42
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1b4edf42
Branch: refs/heads/master
Commit: 1b4edf4225cadae99d0a88d51d1b74dc7a9347ce
Parents: 8be5417 33e4994
Author: xiaojian.fxj <xi...@alibaba-inc.com>
Authored: Fri Apr 1 09:03:01 2016 +0800
Committer: xiaojian.fxj <xi...@alibaba-inc.com>
Committed: Fri Apr 1 09:03:01 2016 +0800
----------------------------------------------------------------------
CHANGELOG.md | 6 +
docs/Trident-API-Overview.md | 100 ++++
examples/storm-starter/pom.xml | 16 +-
external/flux/flux-examples/pom.xml | 13 +-
external/flux/pom.xml | 13 +-
external/sql/storm-sql-kafka/pom.xml | 16 +-
external/storm-kafka-client/README.md | 9 +
external/storm-kafka-client/pom.xml | 86 +++
.../apache/storm/kafka/spout/KafkaSpout.java | 547 +++++++++++++++++++
.../storm/kafka/spout/KafkaSpoutConfig.java | 309 +++++++++++
.../storm/kafka/spout/KafkaSpoutMessageId.java | 101 ++++
.../KafkaSpoutRetryExponentialBackoff.java | 281 ++++++++++
.../kafka/spout/KafkaSpoutRetryService.java | 72 +++
.../storm/kafka/spout/KafkaSpoutStream.java | 70 +++
.../storm/kafka/spout/KafkaSpoutStreams.java | 158 ++++++
.../kafka/spout/KafkaSpoutTupleBuilder.java | 58 ++
.../kafka/spout/KafkaSpoutTuplesBuilder.java | 82 +++
.../kafka/spout/test/KafkaSpoutTestBolt.java | 50 ++
.../spout/test/KafkaSpoutTopologyMain.java | 133 +++++
.../spout/test/TopicTest2TupleBuilder.java | 40 ++
.../test/TopicsTest0Test1TupleBuilder.java | 42 ++
external/storm-kafka/pom.xml | 16 +-
.../storm/mongodb/bolt/MongoInsertBolt.java | 74 ++-
.../storm/mongodb/bolt/MongoUpdateBolt.java | 3 +-
.../storm/mongodb/common/MongoDBClient.java | 20 +-
.../storm/mongodb/trident/state/MongoState.java | 2 +-
external/storm-solr/pom.xml | 8 +-
pom.xml | 57 +-
storm-core/pom.xml | 6 -
storm-core/src/clj/org/apache/storm/config.clj | 27 -
.../clj/org/apache/storm/daemon/executor.clj | 222 +++-----
.../src/clj/org/apache/storm/daemon/nimbus.clj | 3 +-
.../src/clj/org/apache/storm/daemon/task.clj | 190 -------
.../org/apache/storm/daemon/GrouperFactory.java | 243 ++++++++
.../src/jvm/org/apache/storm/daemon/Task.java | 247 +++++++++
.../daemon/metrics/BuiltinMetricsUtil.java | 8 +-
.../apache/storm/hooks/info/BoltAckInfo.java | 8 +
.../storm/hooks/info/BoltExecuteInfo.java | 8 +
.../apache/storm/hooks/info/BoltFailInfo.java | 8 +
.../org/apache/storm/hooks/info/EmitInfo.java | 9 +
.../apache/storm/hooks/info/SpoutAckInfo.java | 9 +
.../apache/storm/hooks/info/SpoutFailInfo.java | 9 +
.../jvm/org/apache/storm/stats/StatsUtil.java | 23 +-
.../jvm/org/apache/storm/utils/ConfigUtils.java | 35 +-
.../test/clj/org/apache/storm/grouping_test.clj | 19 +-
storm-dist/binary/src/main/assembly/binary.xml | 14 +
46 files changed, 2979 insertions(+), 491 deletions(-)
----------------------------------------------------------------------