You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2016/08/23 00:40:40 UTC
[2/4] storm git commit: Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b53753d3
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b53753d3
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b53753d3
Branch: refs/heads/master
Commit: b53753d30d225d15aafae5e9627e82840adb5a7f
Parents: f155d95 318c9e2
Author: Juan Paulo Gutierrez <ju...@gmail.com>
Authored: Fri Aug 19 17:06:16 2016 +0900
Committer: Juan Paulo Gutierrez <ju...@gmail.com>
Committed: Fri Aug 19 17:06:16 2016 +0900
----------------------------------------------------------------------
.travis.yml | 1 -
CHANGELOG.md | 20 +-
README.markdown | 3 +-
docs/Troubleshooting.md | 68 --
external/sql/storm-sql-core/pom.xml | 1 +
external/sql/storm-sql-runtime/pom.xml | 78 +-
external/storm-druid/README.md | 143 ++++
external/storm-druid/pom.xml | 83 ++
.../apache/storm/druid/bolt/DruidBeamBolt.java | 110 +++
.../storm/druid/bolt/DruidBeamFactory.java | 29 +
.../apache/storm/druid/bolt/DruidConfig.java | 104 +++
.../druid/bolt/ITupleDruidEventMapper.java | 38 +
.../storm/druid/bolt/TupleDruidEventMapper.java | 44 +
.../storm/druid/trident/DruidBeamState.java | 96 +++
.../druid/trident/DruidBeamStateFactory.java | 42 +
.../druid/trident/DruidBeamStateUpdater.java | 48 ++
.../storm/druid/SampleDruidBeamFactoryImpl.java | 122 +++
.../storm/druid/SampleDruidBoltTopology.java | 95 +++
.../druid/SampleDruidBoltTridentTopology.java | 91 ++
.../apache/storm/druid/SimpleBatchSpout.java | 95 +++
.../org/apache/storm/druid/SimpleSpout.java | 68 ++
.../apache/storm/hdfs/spout/TestHdfsSpout.java | 5 +-
.../storm/kafka/monitor/KafkaOffsetLagUtil.java | 4 +-
external/storm-kinesis/README.md | 140 ++++
external/storm-kinesis/pom.xml | 69 ++
.../kinesis/spout/CredentialsProviderChain.java | 39 +
.../spout/ExponentialBackoffRetrier.java | 164 ++++
.../spout/FailedMessageRetryHandler.java | 48 ++
.../storm/kinesis/spout/KinesisConfig.java | 133 +++
.../storm/kinesis/spout/KinesisConnection.java | 108 +++
.../kinesis/spout/KinesisConnectionInfo.java | 111 +++
.../storm/kinesis/spout/KinesisMessageId.java | 73 ++
.../kinesis/spout/KinesisRecordsManager.java | 449 ++++++++++
.../storm/kinesis/spout/KinesisSpout.java | 86 ++
.../kinesis/spout/RecordToTupleMapper.java | 38 +
.../storm/kinesis/spout/ZKConnection.java | 95 +++
.../org/apache/storm/kinesis/spout/ZkInfo.java | 118 +++
.../kinesis/spout/test/KinesisBoltTest.java | 48 ++
.../spout/test/KinesisSpoutTopology.java | 57 ++
.../spout/test/TestRecordToTupleMapper.java | 58 ++
external/storm-redis/pom.xml | 4 +
.../storm/redis/state/RedisKeyValueState.java | 18 +-
pom.xml | 19 +-
.../src/clj/org/apache/storm/daemon/common.clj | 18 +-
.../clj/org/apache/storm/daemon/executor.clj | 839 -------------------
.../org/apache/storm/daemon/local_executor.clj | 42 +
.../src/clj/org/apache/storm/daemon/worker.clj | 70 +-
storm-core/src/clj/org/apache/storm/testing.clj | 16 +-
.../src/jvm/org/apache/storm/Constants.java | 24 +-
.../jvm/org/apache/storm/StormSubmitter.java | 10 +-
.../apache/storm/blobstore/NimbusBlobStore.java | 3 +
.../org/apache/storm/daemon/StormCommon.java | 175 ++--
.../src/jvm/org/apache/storm/daemon/Task.java | 76 +-
.../jvm/org/apache/storm/executor/Executor.java | 574 +++++++++++++
.../apache/storm/executor/ExecutorShutdown.java | 111 +++
.../apache/storm/executor/ExecutorTransfer.java | 87 ++
.../apache/storm/executor/IRunningExecutor.java | 31 +
.../org/apache/storm/executor/TupleInfo.java | 90 ++
.../storm/executor/bolt/BoltExecutor.java | 139 +++
.../executor/bolt/BoltOutputCollectorImpl.java | 171 ++++
.../storm/executor/error/IReportError.java | 22 +
.../storm/executor/error/ReportError.java | 76 ++
.../storm/executor/error/ReportErrorAndDie.java | 47 ++
.../storm/executor/spout/SpoutExecutor.java | 256 ++++++
.../spout/SpoutOutputCollectorImpl.java | 147 ++++
.../messaging/netty/StormClientHandler.java | 2 +-
.../storm/security/auth/ThriftClient.java | 3 +-
.../auth/authorizer/SimpleACLAuthorizer.java | 1 +
.../apache/storm/stats/BoltExecutorStats.java | 1 +
.../jvm/org/apache/storm/stats/CommonStats.java | 5 +-
.../apache/storm/stats/SpoutExecutorStats.java | 1 +
.../org/apache/storm/task/TopologyContext.java | 32 +-
.../org/apache/storm/utils/NimbusClient.java | 5 +-
.../src/jvm/org/apache/storm/utils/Utils.java | 29 +
.../storm/utils/WorkerBackpressureThread.java | 11 +-
.../org/apache/storm/integration_test.clj | 11 +-
.../test/clj/org/apache/storm/grouping_test.clj | 2 +-
.../auth/DefaultHttpCredentialsPlugin_test.clj | 75 --
.../authorizer/DRPCSimpleACLAuthorizer_test.clj | 241 ------
.../serialization/SerializationFactory_test.clj | 54 --
.../utils/ZookeeperServerCnxnFactory_test.clj | 35 -
.../auth/DefaultHttpCredentialsPluginTest.java | 90 ++
.../authorizer/DRPCSimpleACLAuthorizerTest.java | 163 ++++
.../serialization/SerializationFactoryTest.java | 61 ++
.../jvm/org/apache/storm/tuple/FieldsTest.java | 2 +-
.../utils/ZookeeperServerCnxnFactoryTest.java | 39 +
storm-dist/binary/src/main/assembly/binary.xml | 36 +-
87 files changed, 5629 insertions(+), 1557 deletions(-)
----------------------------------------------------------------------