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/3457a038
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3457a038
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3457a038

Branch: refs/heads/master
Commit: 3457a03884bba7976074b0a36c3c10c91a6ee074
Parents: e740c32 7e15fbe
Author: Stig Rohde Døssing <s...@it-minds.dk>
Authored: Mon Aug 29 09:48:37 2016 +0200
Committer: Stig Rohde Døssing <s...@it-minds.dk>
Committed: Mon Aug 29 09:48:37 2016 +0200

----------------------------------------------------------------------
 .travis.yml                                     |    1 -
 CHANGELOG.md                                    |   35 +-
 README.markdown                                 |    6 +-
 bin/storm.py                                    |  149 +-
 docs/Command-line-client.md                     |   24 +-
 docs/SECURITY.md                                |    4 +-
 docs/STORM-UI-REST-API.md                       |  121 +-
 docs/Troubleshooting.md                         |   68 -
 docs/flux.md                                    |   27 +-
 docs/images/supervisor_page.png                 |  Bin 0 -> 133290 bytes
 docs/storm-sql.md                               |   63 +-
 examples/storm-starter/README.markdown          |    2 +-
 examples/storm-starter/pom.xml                  |    4 +-
 external/flux/README.md                         |   27 +-
 external/flux/flux-examples/pom.xml             |    2 +-
 external/flux/pom.xml                           |    2 +-
 external/sql/README.md                          |   67 +-
 external/sql/storm-sql-core/pom.xml             |    6 +
 .../jvm/org/apache/storm/sql/StormSqlImpl.java  |   19 +-
 .../apache/storm/sql/compiler/ExprCompiler.java |   16 +-
 .../sql/compiler/PostOrderRelNodeVisitor.java   |  100 +-
 .../backends/standalone/RelNodeCompiler.java    |   14 +-
 .../compiler/backends/trident/PlanCompiler.java |  222 +-
 .../backends/trident/RelNodeCompiler.java       |  116 -
 .../trident/TridentLogicalPlanCompiler.java     |  392 ++
 .../storm/sql/compiler/TestCompilerUtils.java   |   69 +-
 .../storm/sql/compiler/TestExprCompiler.java    |    2 +-
 .../standalone/TestRelNodeCompiler.java         |    7 +-
 .../backends/trident/TestPlanCompiler.java      |   99 +-
 external/sql/storm-sql-kafka/pom.xml            |    4 +-
 external/sql/storm-sql-runtime/pom.xml          |   83 +-
 .../sql/runtime/trident/NumberConverter.java    |   47 +
 .../storm/sql/runtime/trident/TridentUtils.java |   35 +
 .../trident/functions/EvaluationFilter.java     |   62 +
 .../trident/functions/EvaluationFunction.java   |   64 +
 .../trident/functions/ForwardFunction.java      |   30 +
 .../functions/UDAFWrappedAggregator.java        |  154 +
 .../sql/runtime/trident/operations/CountBy.java |   53 +
 .../trident/operations/DivideForAverage.java    |   45 +
 .../sql/runtime/trident/operations/MaxBy.java   |   68 +
 .../sql/runtime/trident/operations/MinBy.java   |   68 +
 .../sql/runtime/trident/operations/SumBy.java   |   60 +
 .../test/org/apache/storm/sql/TestUtils.java    |   74 +
 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 +-
 external/storm-kafka-client/README.md           |   29 +-
 external/storm-kafka-client/pom.xml             |    1 +
 .../KafkaSpoutRetryExponentialBackoff.java      |    2 +-
 .../test/KafkaSpoutTopologyMainNamedTopics.java |    6 +-
 external/storm-kafka-monitor/pom.xml            |    4 +-
 .../storm/kafka/monitor/KafkaOffsetLagUtil.java |    4 +-
 external/storm-kafka/README.md                  |   14 +-
 external/storm-kafka/pom.xml                    |    8 +-
 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 +-
 external/storm-submit-tools/pom.xml             |  199 +
 .../submit/command/DependencyResolverMain.java  |  105 +
 .../storm/submit/dependency/AetherUtils.java    |   81 +
 .../apache/storm/submit/dependency/Booter.java  |   63 +
 .../submit/dependency/DependencyResolver.java   |   70 +
 .../dependency/RepositorySystemFactory.java     |   66 +
 .../submit/dependency/AetherUtilsTest.java      |  102 +
 .../dependency/DependencyResolverTest.java      |   78 +
 pom.xml                                         |   50 +-
 .../src/clj/org/apache/storm/blobstore.clj      |   28 -
 .../clj/org/apache/storm/command/blobstore.clj  |  163 -
 .../clj/org/apache/storm/command/get_errors.clj |   55 -
 .../clj/org/apache/storm/command/heartbeats.clj |   54 -
 .../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/nimbus.clj  |  351 +-
 .../src/clj/org/apache/storm/daemon/worker.clj  |   70 +-
 storm-core/src/clj/org/apache/storm/testing.clj |   16 +-
 storm-core/src/clj/org/apache/storm/ui/core.clj |   94 +-
 .../src/jvm/org/apache/storm/Constants.java     |   24 +-
 .../jvm/org/apache/storm/StormSubmitter.java    |  116 +-
 .../apache/storm/blobstore/BlobStoreUtils.java  |   21 +-
 .../apache/storm/blobstore/ClientBlobStore.java |   17 +
 .../apache/storm/blobstore/NimbusBlobStore.java |    3 +
 .../jvm/org/apache/storm/command/Blobstore.java |  348 ++
 .../jvm/org/apache/storm/command/GetErrors.java |   80 +
 .../org/apache/storm/command/Heartbeats.java    |   89 +
 .../org/apache/storm/daemon/StormCommon.java    |  175 +-
 .../src/jvm/org/apache/storm/daemon/Task.java   |   76 +-
 .../daemon/supervisor/SyncSupervisorEvent.java  |  101 +-
 .../workermanager/DefaultWorkerManager.java     |   23 +-
 .../dependency/DependencyPropertiesParser.java  |   61 +
 .../storm/dependency/DependencyUploader.java    |  166 +
 .../dependency/FileNotAvailableException.java   |   33 +
 .../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 +
 .../org/apache/storm/generated/Assignment.java  |  244 +-
 .../org/apache/storm/generated/BoltStats.java   |  406 +-
 .../apache/storm/generated/ClusterSummary.java  |  108 +-
 .../storm/generated/ClusterWorkerHeartbeat.java |   52 +-
 .../storm/generated/ComponentPageInfo.java      |  220 +-
 .../org/apache/storm/generated/Credentials.java |   44 +-
 .../apache/storm/generated/ExecutorStats.java   |  168 +-
 .../jvm/org/apache/storm/generated/HBNodes.java |   32 +-
 .../org/apache/storm/generated/HBRecords.java   |   36 +-
 .../storm/generated/LSApprovedWorkers.java      |   44 +-
 .../generated/LSSupervisorAssignments.java      |   48 +-
 .../apache/storm/generated/LSTopoHistory.java   |   64 +-
 .../storm/generated/LSTopoHistoryList.java      |   36 +-
 .../storm/generated/LSWorkerHeartbeat.java      |   36 +-
 .../apache/storm/generated/ListBlobsResult.java |   32 +-
 .../apache/storm/generated/LocalAssignment.java |   36 +-
 .../apache/storm/generated/LocalStateData.java  |   48 +-
 .../org/apache/storm/generated/LogConfig.java   |   48 +-
 .../jvm/org/apache/storm/generated/Nimbus.java  | 3486 ++++++++++++------
 .../org/apache/storm/generated/NodeInfo.java    |   32 +-
 .../storm/generated/RebalanceOptions.java       |   44 +-
 .../storm/generated/SettableBlobMeta.java       |   36 +-
 .../org/apache/storm/generated/SpoutStats.java  |  252 +-
 .../org/apache/storm/generated/StormBase.java   |   92 +-
 .../apache/storm/generated/StormTopology.java   |  428 ++-
 .../apache/storm/generated/SupervisorInfo.java  |  152 +-
 .../storm/generated/SupervisorPageInfo.java     |  624 ++++
 .../storm/generated/SupervisorSummary.java      |   44 +-
 .../storm/generated/TopologyHistoryInfo.java    |   32 +-
 .../apache/storm/generated/TopologyInfo.java    |  160 +-
 .../storm/generated/TopologyPageInfo.java       |  284 +-
 .../apache/storm/generated/TopologyStats.java   |  220 +-
 .../apache/storm/generated/WorkerSummary.java   | 1880 ++++++++++
 .../messaging/netty/StormClientHandler.java     |    2 +-
 .../jvm/org/apache/storm/scheduler/Cluster.java |  217 +-
 .../resource/ResourceAwareScheduler.java        |    9 +
 .../storm/security/auth/ThriftClient.java       |    3 +-
 .../auth/authorizer/SimpleACLAuthorizer.java    |    8 +-
 .../apache/storm/stats/BoltExecutorStats.java   |    1 +
 .../jvm/org/apache/storm/stats/CommonStats.java |    5 +-
 .../apache/storm/stats/SpoutExecutorStats.java  |    1 +
 .../jvm/org/apache/storm/stats/StatsUtil.java   |  132 +
 .../org/apache/storm/task/TopologyContext.java  |   32 +-
 .../src/jvm/org/apache/storm/tuple/Fields.java  |    4 +-
 .../jvm/org/apache/storm/utils/ConfigUtils.java |   11 +-
 .../org/apache/storm/utils/NimbusClient.java    |    5 +-
 .../apache/storm/utils/ThriftTopologyUtils.java |    4 +
 .../src/jvm/org/apache/storm/utils/Utils.java   |   35 +-
 .../storm/utils/WorkerBackpressureThread.java   |   11 +-
 storm-core/src/py/storm/Nimbus-remote           |    7 +
 storm-core/src/py/storm/Nimbus.py               |  272 +-
 storm-core/src/py/storm/ttypes.py               | 2219 +++++++----
 storm-core/src/storm.thrift                     |   27 +
 storm-core/src/ui/public/component.html         |    8 +
 storm-core/src/ui/public/css/style.css          |   20 +
 storm-core/src/ui/public/js/script.js           |  191 +
 storm-core/src/ui/public/supervisor.html        |  132 +
 .../public/templates/index-page-template.html   |    4 +-
 .../templates/supervisor-page-template.html     |  145 +
 .../templates/topology-page-template.html       |  208 +-
 storm-core/src/ui/public/topology.html          |   12 +-
 .../org/apache/storm/integration_test.clj       |   11 +-
 .../test/clj/org/apache/storm/grouping_test.clj |    2 +-
 .../test/clj/org/apache/storm/nimbus_test.clj   |  106 +-
 .../auth/DefaultHttpCredentialsPlugin_test.clj  |   75 -
 .../authorizer/DRPCSimpleACLAuthorizer_test.clj |  241 --
 .../serialization/SerializationFactory_test.clj |   54 -
 .../clj/org/apache/storm/supervisor_test.clj    |   18 +-
 .../utils/ZookeeperServerCnxnFactory_test.clj   |   35 -
 .../DependencyPropertiesParserTest.java         |   72 +
 .../dependency/DependencyUploaderTest.java      |  297 ++
 .../auth/DefaultHttpCredentialsPluginTest.java  |   90 +
 .../authorizer/DRPCSimpleACLAuthorizerTest.java |  163 +
 .../serialization/SerializationFactoryTest.java |   61 +
 .../org/apache/storm/stats/TestStatsUtil.java   |  266 ++
 .../jvm/org/apache/storm/tuple/FieldsTest.java  |    2 +-
 .../storm/utils/ThriftTopologyUtilsTest.java    |   12 +
 .../utils/ZookeeperServerCnxnFactoryTest.java   |   39 +
 .../staticmocking/ConfigUtilsInstaller.java     |    2 +
 storm-dist/binary/src/main/assembly/binary.xml  |   49 +-
 213 files changed, 20220 insertions(+), 5844 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/3457a038/storm-core/src/clj/org/apache/storm/testing.clj
----------------------------------------------------------------------

Reply via email to