Merge branch '1.x-branch' of https://github.com/apache/storm into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e701a2a1 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e701a2a1 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e701a2a1 Branch: refs/heads/1.x-branch Commit: e701a2a1d3438479322da40b5011e8c595ae0295 Parents: e2251c4 f0abfff Author: Stig Døssing <[email protected]> Authored: Tue Mar 15 21:33:17 2016 +0100 Committer: Stig Døssing <[email protected]> Committed: Tue Mar 15 21:33:17 2016 +0100 ---------------------------------------------------------------------- .gitignore | 2 + CHANGELOG.md | 29 +++ README.markdown | 1 + bin/flight.bash | 4 +- bin/storm-config.cmd | 4 + bin/storm.cmd | 2 +- conf/defaults.yaml | 2 +- .../travis/print-errors-from-test-reports.py | 4 + dev-tools/travis/travis-script.sh | 4 +- .../storm/starter/ThroughputVsLatency.java | 2 +- .../storm/starter/spout/RandomIntegerSpout.java | 15 +- .../spout/RandomNumberGeneratorSpout.java | 95 +++++++++ .../trident/TridentMinMaxOfDevicesTopology.java | 201 +++++++++++++++++++ .../TridentMinMaxOfVehiclesTopology.java | 180 +++++++++++++++++ .../src/jvm/storm/starter/StatefulTopology.java | 1 + .../apache/storm/sql/compiler/CompilerUtil.java | 7 +- .../apache/storm/sql/compiler/ExprCompiler.java | 32 ++- .../backends/standalone/RelNodeCompiler.java | 6 +- .../apache/storm/sql/parser/StormParser.java | 5 + .../test/org/apache/storm/sql/TestStormSql.java | 64 +++++- .../storm/sql/compiler/TestCompilerUtils.java | 62 +++++- .../storm/sql/compiler/TestExprSemantic.java | 18 ++ .../backends/standalone/TestPlanCompiler.java | 20 ++ .../backends/trident/TestPlanCompiler.java | 4 +- .../test/org/apache/storm/sql/TestUtils.java | 32 ++- .../storm/hbase/security/HBaseSecurityUtil.java | 36 ++-- external/storm-hdfs/pom.xml | 23 ++- .../storm/hdfs/bolt/AbstractHdfsBolt.java | 10 +- .../storm/hdfs/bolt/AvroGenericRecordBolt.java | 8 +- .../org/apache/storm/hdfs/bolt/HdfsBolt.java | 8 +- .../storm/hdfs/bolt/SequenceFileBolt.java | 8 +- .../apache/storm/kafka/PartitionManager.java | 12 +- external/storm-mqtt/core/pom.xml | 4 +- pom.xml | 13 +- storm-core/pom.xml | 2 +- storm-core/src/clj/org/apache/storm/cluster.clj | 11 +- storm-core/src/clj/org/apache/storm/config.clj | 4 + .../clj/org/apache/storm/daemon/executor.clj | 2 +- .../src/clj/org/apache/storm/daemon/nimbus.clj | 39 ++-- .../clj/org/apache/storm/daemon/supervisor.clj | 17 +- .../src/clj/org/apache/storm/daemon/worker.clj | 8 +- storm-core/src/clj/org/apache/storm/ui/core.clj | 20 +- storm-core/src/clj/org/apache/storm/util.clj | 4 - storm-core/src/jvm/org/apache/storm/Config.java | 13 ++ .../jvm/org/apache/storm/drpc/DRPCSpout.java | 2 + .../apache/storm/messaging/netty/Client.java | 34 ++++ .../storm/metric/FileBasedEventLogger.java | 45 +++-- .../auth/AbstractSaslClientCallbackHandler.java | 76 +++++++ .../auth/AbstractSaslServerCallbackHandler.java | 94 +++++++++ .../apache/storm/security/auth/AuthUtils.java | 40 ++++ .../security/auth/SimpleTransportPlugin.java | 2 + .../security/auth/ThriftConnectionType.java | 8 +- .../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 +++++++++++++++ .../serialization/SerializationFactory.java | 2 + .../testing/SingleUserSimpleTransport.java | 5 +- .../topology/CheckpointTupleForwarder.java | 22 +- .../apache/storm/topology/IStatefulBolt.java | 7 +- .../storm/topology/StatefulBoltExecutor.java | 46 ++++- .../apache/storm/topology/TopologyBuilder.java | 18 +- .../jvm/org/apache/storm/trident/Stream.java | 121 +++++++++-- .../operation/builtin/ComparisonAggregator.java | 91 +++++++++ .../storm/trident/operation/builtin/Max.java | 37 ++++ .../operation/builtin/MaxWithComparator.java | 51 +++++ .../storm/trident/operation/builtin/Min.java | 36 ++++ .../operation/builtin/MinWithComparator.java | 51 +++++ .../apache/storm/trident/tuple/ConsList.java | 20 +- .../src/jvm/org/apache/storm/utils/Utils.java | 21 +- .../storm/utils/WorkerBackpressureCallback.java | 3 +- .../storm/utils/WorkerBackpressureThread.java | 38 +++- storm-core/src/ui/public/component.html | 2 +- .../templates/topology-page-template.html | 6 +- storm-core/src/ui/public/topology.html | 2 +- .../security/auth/auto_login_module_test.clj | 24 ++- .../clj/org/apache/storm/supervisor_test.clj | 3 + .../topology/StatefulBoltExecutorTest.java | 1 + .../storm/topology/TopologyBuilderTest.java | 65 ++++++ .../utils/WorkerBackpressureThreadTest.java | 50 +++++ 84 files changed, 2225 insertions(+), 344 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/e701a2a1/storm-core/src/clj/org/apache/storm/daemon/executor.clj ----------------------------------------------------------------------
