Merge branch 'master' of https://github.com/apache/storm into STORM-1837-2
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5be13404 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5be13404 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5be13404 Branch: refs/heads/master Commit: 5be13404fce05f313e050ad2b082b36a47c430e4 Parents: e7b1284 f325feb Author: Stig Rohde Døssing <stigdoess...@gmail.com> Authored: Tue Jun 14 19:40:55 2016 +0200 Committer: Stig Rohde Døssing <stigdoess...@gmail.com> Committed: Tue Jun 14 19:40:55 2016 +0200 ---------------------------------------------------------------------- CHANGELOG.md | 751 ++---------------- README.markdown | 8 +- bin/storm.py | 36 +- conf/defaults.yaml | 6 +- conf/storm.yaml.example | 20 + docs/Clojure-DSL.md | 4 +- docs/Command-line-client.md | 163 ++++ docs/Common-patterns.md | 4 +- docs/Distributed-RPC.md | 2 +- docs/Metrics.md | 97 ++- docs/Powered-By.md | 10 + docs/SECURITY.md | 2 +- docs/State-checkpointing.md | 3 + docs/Transactional-topologies.md | 8 +- docs/Trident-state.md | 4 +- docs/Tutorial.md | 2 +- docs/Windowing.md | 37 +- examples/storm-starter/README.markdown | 12 +- .../storm/starter/SlidingWindowTopology.java | 4 +- .../storm/starter/spout/TwitterSampleSpout.java | 12 +- .../starter/trident/TridentKafkaWordCount.java | 67 +- .../java/org/apache/storm/flux/FluxBuilder.java | 8 + external/flux/flux-examples/README.md | 18 + .../flux/examples/StatefulWordCounter.java | 64 ++ .../resources/simple_stateful_wordcount.yaml | 60 ++ .../flux/wrappers/bolts/FluxShellBolt.java | 79 +- .../flux/wrappers/spouts/FluxShellSpout.java | 77 +- .../jvm/org/apache/storm/sql/StormSqlImpl.java | 25 +- .../apache/storm/sql/compiler/ExprCompiler.java | 2 +- .../standalone/BuiltinAggregateFunctions.java | 178 +++++ .../backends/standalone/PlanCompiler.java | 3 +- .../backends/standalone/RelNodeCompiler.java | 227 +++++- .../test/org/apache/storm/sql/TestStormSql.java | 151 ++++ .../sql/runtime/AbstractChannelHandler.java | 5 + .../storm/sql/runtime/ChannelContext.java | 1 + .../storm/sql/runtime/ChannelHandler.java | 2 + .../org/apache/storm/sql/runtime/Channels.java | 15 + .../test/org/apache/storm/sql/TestUtils.java | 36 + .../storm/hbase/bolt/AbstractHBaseBolt.java | 1 - .../org/apache/storm/hbase/bolt/HBaseBolt.java | 38 +- .../apache/storm/hdfs/spout/TextFileReader.java | 2 +- .../org/apache/storm/hive/bolt/HiveBolt.java | 34 +- .../apache/storm/hive/trident/HiveState.java | 8 +- .../storm/hive/trident/TridentHiveTopology.java | 29 +- external/storm-kafka-client/README.md | 110 ++- .../KafkaSpoutRetryExponentialBackoff.java | 2 +- external/storm-kafka/README.md | 55 +- external/storm-kafka/pom.xml | 5 + .../storm/kafka/DynamicBrokersReader.java | 2 +- .../kafka/DynamicPartitionConnections.java | 2 +- .../ExponentialBackoffMsgRetryManager.java | 38 +- .../storm/kafka/FailedMsgRetryManager.java | 60 +- .../jvm/org/apache/storm/kafka/KafkaConfig.java | 2 +- .../jvm/org/apache/storm/kafka/KafkaSpout.java | 2 +- .../jvm/org/apache/storm/kafka/KafkaUtils.java | 2 +- .../jvm/org/apache/storm/kafka/Partition.java | 3 +- .../apache/storm/kafka/PartitionManager.java | 57 +- .../jvm/org/apache/storm/kafka/SpoutConfig.java | 8 +- .../storm/kafka/StringMultiSchemeWithTopic.java | 3 +- .../org/apache/storm/kafka/ZkCoordinator.java | 2 +- .../src/jvm/org/apache/storm/kafka/ZkState.java | 2 +- .../kafka/trident/TridentKafkaEmitter.java | 2 +- .../storm/kafka/trident/ZkBrokerReader.java | 2 +- .../ExponentialBackoffMsgRetryManagerTest.java | 99 ++- .../org/apache/storm/kafka/KafkaTestBroker.java | 7 +- .../storm/mongodb/bolt/MongoInsertBolt.java | 61 +- external/storm-redis/pom.xml | 2 +- .../storm/redis/bolt/RedisLookupBolt.java | 4 + .../apache/storm/redis/bolt/RedisStoreBolt.java | 15 +- .../redis/common/config/JedisPoolConfig.java | 3 +- .../common/container/JedisClusterContainer.java | 7 +- .../common/mapper/RedisDataTypeDescription.java | 7 +- .../storm/redis/state/RedisKeyValueState.java | 6 +- .../storm/solr/topology/SolrTopology.java | 6 +- log4j2/cluster.xml | 14 + pom.xml | 11 +- .../clj/org/apache/storm/daemon/executor.clj | 6 +- .../src/clj/org/apache/storm/daemon/nimbus.clj | 198 +++-- .../src/clj/org/apache/storm/daemon/worker.clj | 2 +- storm-core/src/jvm/org/apache/storm/Config.java | 35 +- .../jvm/org/apache/storm/StormSubmitter.java | 48 +- .../storm/blobstore/BlobStoreAclHandler.java | 10 + .../apache/storm/cluster/ZKStateStorage.java | 10 +- .../org/apache/storm/daemon/StormCommon.java | 9 +- .../apache/storm/generated/HBMessageData.java | 6 +- .../storm/hooks/SubmitterHookException.java | 41 + .../metric/ClusterMetricsConsumerExecutor.java | 70 ++ .../metric/LoggingClusterMetricsConsumer.java | 86 ++ .../storm/metric/MetricsConsumerBolt.java | 85 +- .../org/apache/storm/metric/api/DataPoint.java | 43 + .../metric/api/IClusterMetricsConsumer.java | 63 ++ .../storm/metric/api/IMetricsConsumer.java | 2 + .../storm/metric/filter/FilterByMetricName.java | 110 +++ .../storm/metric/filter/MetricsFilter.java | 26 + .../apache/storm/pacemaker/PacemakerServer.java | 9 +- .../storm/pacemaker/codec/ThriftDecoder.java | 21 +- .../jvm/org/apache/storm/scheduler/Cluster.java | 7 + .../storm/scheduler/resource/RAS_Node.java | 11 +- .../DefaultResourceAwareStrategy.java | 228 ++++-- .../storm/spout/SpoutOutputCollector.java | 20 +- .../jvm/org/apache/storm/stats/StatsUtil.java | 62 +- .../storm/topology/WindowedBoltExecutor.java | 26 +- .../topology/base/BaseStatefulWindowedBolt.java | 8 + .../storm/topology/base/BaseWindowedBolt.java | 101 +++ .../spout/PartitionedTridentSpoutExecutor.java | 16 +- .../jvm/org/apache/storm/utils/BatchHelper.java | 92 +++ .../org/apache/storm/utils/DisruptorQueue.java | 16 +- .../src/jvm/org/apache/storm/utils/Utils.java | 14 +- .../storm/validation/ConfigValidation.java | 16 + storm-core/src/py/storm/ttypes.py | 422 +++++----- storm-core/src/storm.thrift | 26 +- .../metric/filter/FilterByMetricNameTest.java | 95 +++ .../apache/storm/nimbus/LocalNimbusTest.java | 132 ++++ .../resource/TestResourceAwareScheduler.java | 788 +------------------ .../TestUtilsForResourceAwareScheduler.java | 68 +- .../TestDefaultResourceAwareStrategy.java | 333 ++++++++ .../topology/WindowedBoltExecutorTest.java | 87 +- .../src/main/resources/resources/storm.js | 17 +- 118 files changed, 4119 insertions(+), 2262 deletions(-) ----------------------------------------------------------------------
