You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by lo...@apache.org on 2016/03/30 09:17:21 UTC
[07/19] storm git commit: Merge branch 'master' into pacemaker
Merge branch 'master' into pacemaker
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/aad675be
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/aad675be
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/aad675be
Branch: refs/heads/master
Commit: aad675be9e7f8334cc3373b425831746a41ff1d1
Parents: 86ad800 d63167c
Author: xiaojian.fxj <xi...@alibaba-inc.com>
Authored: Thu Mar 17 09:30:36 2016 +0800
Committer: xiaojian.fxj <xi...@alibaba-inc.com>
Committed: Thu Mar 17 09:30:36 2016 +0800
----------------------------------------------------------------------
CHANGELOG.md | 9 +
README.markdown | 4 +-
.../storm/starter/spout/RandomIntegerSpout.java | 15 +-
.../src/jvm/storm/starter/StatefulTopology.java | 1 +
external/storm-kafka/README.md | 1 -
.../apache/storm/kafka/PartitionManager.java | 12 +-
external/storm-mongodb/README.md | 195 ++
external/storm-mongodb/pom.xml | 74 +
.../storm/mongodb/bolt/AbstractMongoBolt.java | 56 +
.../storm/mongodb/bolt/MongoInsertBolt.java | 62 +
.../storm/mongodb/bolt/MongoUpdateBolt.java | 75 +
.../storm/mongodb/common/MongoDBClient.java | 91 +
.../mongodb/common/QueryFilterCreator.java | 38 +
.../common/SimpleQueryFilterCreator.java | 39 +
.../mongodb/common/mapper/MongoMapper.java | 38 +
.../common/mapper/SimpleMongoMapper.java | 40 +
.../common/mapper/SimpleMongoUpdateMapper.java | 41 +
.../storm/mongodb/trident/state/MongoState.java | 97 +
.../trident/state/MongoStateFactory.java | 42 +
.../trident/state/MongoStateUpdater.java | 34 +
.../storm/mongodb/topology/InsertWordCount.java | 81 +
.../storm/mongodb/topology/UpdateWordCount.java | 91 +
.../storm/mongodb/topology/WordCounter.java | 67 +
.../storm/mongodb/topology/WordSpout.java | 88 +
.../storm/mongodb/trident/WordCountTrident.java | 85 +
pom.xml | 1 +
.../src/clj/org/apache/storm/clojure.clj | 3 +
.../clj/org/apache/storm/command/heartbeats.clj | 5 +-
.../src/clj/org/apache/storm/converter.clj | 46 +-
.../org/apache/storm/daemon/builtin_metrics.clj | 33 +-
.../clj/org/apache/storm/daemon/executor.clj | 33 +-
.../src/clj/org/apache/storm/daemon/nimbus.clj | 93 +-
.../src/clj/org/apache/storm/daemon/task.clj | 10 +-
.../src/clj/org/apache/storm/daemon/worker.clj | 18 +-
.../clj/org/apache/storm/internal/clojure.clj | 3 +
.../apache/storm/scheduler/DefaultScheduler.clj | 80 -
.../apache/storm/scheduler/EvenScheduler.clj | 98 -
.../storm/scheduler/IsolationScheduler.clj | 4 +-
storm-core/src/clj/org/apache/storm/stats.clj | 1568 -----------
storm-core/src/clj/org/apache/storm/testing.clj | 8 +-
storm-core/src/clj/org/apache/storm/ui/core.clj | 71 +-
storm-core/src/clj/org/apache/storm/util.clj | 11 -
.../storm/coordination/CoordinatedBolt.java | 4 +
.../src/jvm/org/apache/storm/daemon/Acker.java | 18 +-
.../org/apache/storm/daemon/StormCommon.java | 4 +
.../storm/scheduler/DefaultScheduler.java | 111 +
.../apache/storm/scheduler/EvenScheduler.java | 168 ++
.../apache/storm/scheduler/TopologyDetails.java | 3 +-
.../apache/storm/stats/BoltExecutorStats.java | 105 +
.../jvm/org/apache/storm/stats/CommonStats.java | 112 +
.../apache/storm/stats/SpoutExecutorStats.java | 79 +
.../jvm/org/apache/storm/stats/StatsUtil.java | 2441 ++++++++++++++++++
.../org/apache/storm/task/IOutputCollector.java | 1 +
.../org/apache/storm/task/OutputCollector.java | 11 +
.../storm/topology/BasicOutputCollector.java | 10 +
.../topology/CheckpointTupleForwarder.java | 22 +-
.../storm/topology/IBasicOutputCollector.java | 2 +
.../apache/storm/topology/IStatefulBolt.java | 7 +-
.../storm/topology/StatefulBoltExecutor.java | 46 +-
.../apache/storm/topology/TopologyBuilder.java | 5 +-
.../trident/topology/TridentBoltExecutor.java | 4 +
.../jvm/org/apache/storm/utils/ConfigUtils.java | 10 +-
.../src/jvm/org/apache/storm/utils/Utils.java | 38 +-
.../org/apache/storm/integration_test.clj | 53 +-
.../apache/storm/messaging/netty_unit_test.clj | 14 +-
.../test/clj/org/apache/storm/nimbus_test.clj | 19 +-
.../clj/org/apache/storm/scheduler_test.clj | 34 +-
.../apache/storm/security/auth/auth_test.clj | 15 +-
.../storm/security/auth/drpc_auth_test.clj | 15 +-
.../storm/security/auth/nimbus_auth_test.clj | 15 +-
.../topology/StatefulBoltExecutorTest.java | 1 +
storm-dist/binary/src/main/assembly/binary.xml | 14 +
72 files changed, 4802 insertions(+), 2040 deletions(-)
----------------------------------------------------------------------