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/03/16 15:36:56 UTC
[4/7] storm git commit: Merge branch 'master' of
https://github.com/apache/storm
Merge branch 'master' of https://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/e2d118af
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e2d118af
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e2d118af
Branch: refs/heads/master
Commit: e2d118af9071ab6bcdcbec18df055770b991ee79
Parents: f68b4c6 500ef20
Author: Stig Døssing <st...@gmail.com>
Authored: Tue Mar 15 20:49:51 2016 +0100
Committer: Stig Døssing <st...@gmail.com>
Committed: Tue Mar 15 20:49:51 2016 +0100
----------------------------------------------------------------------
.gitignore | 2 +
CHANGELOG.md | 26 +
bin/storm | 19 +-
bin/storm.py | 2 +-
conf/defaults.yaml | 3 +-
conf/log4j2.xml | 2 +-
.../travis/print-errors-from-test-reports.py | 4 +
.../org/apache/storm/starter/ManualDRPC.java | 53 +-
.../storm/starter/spout/RandomIntegerSpout.java | 15 +-
.../src/jvm/storm/starter/StatefulTopology.java | 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 | 26 +-
.../src/clj/org/apache/storm/LocalDRPC.clj | 56 -
.../src/clj/org/apache/storm/MockAutoCred.clj | 58 -
.../clj/org/apache/storm/command/heartbeats.clj | 5 +-
.../src/clj/org/apache/storm/converter.clj | 61 +-
.../org/apache/storm/daemon/builtin_metrics.clj | 33 +-
.../src/clj/org/apache/storm/daemon/common.clj | 369 +--
.../src/clj/org/apache/storm/daemon/drpc.clj | 221 +-
.../clj/org/apache/storm/daemon/executor.clj | 46 +-
.../clj/org/apache/storm/daemon/logviewer.clj | 29 +-
.../src/clj/org/apache/storm/daemon/nimbus.clj | 303 +--
.../clj/org/apache/storm/daemon/supervisor.clj | 34 +-
.../src/clj/org/apache/storm/daemon/task.clj | 15 +-
.../src/clj/org/apache/storm/daemon/worker.clj | 42 +-
storm-core/src/clj/org/apache/storm/stats.clj | 1568 -----------
storm-core/src/clj/org/apache/storm/testing.clj | 108 +-
.../clj/org/apache/storm/trident/testing.clj | 2 -
storm-core/src/clj/org/apache/storm/ui/core.clj | 165 +-
.../src/clj/org/apache/storm/ui/helpers.clj | 10 +-
storm-core/src/clj/org/apache/storm/util.clj | 11 -
.../src/jvm/org/apache/storm/LocalDRPC.java | 72 +
.../storm/cluster/StormClusterStateImpl.java | 7 +-
.../org/apache/storm/daemon/DaemonCommon.java | 22 +
.../jvm/org/apache/storm/daemon/DrpcServer.java | 357 +++
.../org/apache/storm/daemon/StormCommon.java | 537 ++++
.../storm/daemon/metrics/MetricsUtils.java | 2 +-
.../jvm/org/apache/storm/drpc/DRPCSpout.java | 2 +
.../apache/storm/messaging/netty/Client.java | 34 +
.../storm/metric/StormMetricsRegistry.java | 84 +
.../auth/AbstractSaslClientCallbackHandler.java | 76 +
.../auth/AbstractSaslServerCallbackHandler.java | 94 +
.../apache/storm/security/auth/AuthUtils.java | 40 +
.../auth/digest/ClientCallbackHandler.java | 60 +-
.../auth/digest/ServerCallbackHandler.java | 61 +-
.../storm/security/auth/kerberos/AutoTGT.java | 64 +-
.../auth/kerberos/AutoTGTKrb5LoginModule.java | 8 +-
.../auth/plain/PlainClientCallbackHandler.java | 31 +
.../auth/plain/PlainSaslTransportPlugin.java | 71 +
.../auth/plain/PlainServerCallbackHandler.java | 55 +
.../security/auth/plain/SaslPlainServer.java | 158 ++
.../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 ++++++++++++++++++
.../topology/CheckpointTupleForwarder.java | 22 +-
.../apache/storm/topology/IStatefulBolt.java | 7 +-
.../storm/topology/StatefulBoltExecutor.java | 46 +-
.../apache/storm/topology/TopologyBuilder.java | 5 +-
.../jvm/org/apache/storm/utils/ConfigUtils.java | 26 +-
.../storm/utils/StormCommonInstaller.java | 43 +
.../src/jvm/org/apache/storm/utils/Utils.java | 42 +-
.../org/apache/storm/integration_test.clj | 6 +-
.../test/clj/org/apache/storm/drpc_test.clj | 27 +-
.../apache/storm/messaging/netty_unit_test.clj | 14 +-
.../test/clj/org/apache/storm/nimbus_test.clj | 148 +-
.../apache/storm/security/auth/auth_test.clj | 18 +-
.../security/auth/auto_login_module_test.clj | 24 +-
.../storm/security/auth/drpc_auth_test.clj | 20 +-
.../storm/security/auth/nimbus_auth_test.clj | 15 +-
.../clj/org/apache/storm/serialization_test.clj | 85 +-
.../clj/org/apache/storm/supervisor_test.clj | 28 +-
.../test/jvm/org/apache/storm/MockAutoCred.java | 75 +
.../org/apache/storm/TestConfigValidate.java | 20 +
.../storm/serialization/SerializationTest.java | 115 +
.../topology/StatefulBoltExecutorTest.java | 1 +
storm-dist/binary/src/main/assembly/binary.xml | 14 +
96 files changed, 6867 insertions(+), 3141 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/e2d118af/storm-core/src/clj/org/apache/storm/daemon/executor.clj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/e2d118af/storm-core/test/clj/integration/org/apache/storm/integration_test.clj
----------------------------------------------------------------------