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/31 13:34:29 UTC
[2/3] storm git commit: Merge branch 'master' into patch-27
Merge branch 'master' into patch-27
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c8191d75
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c8191d75
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c8191d75
Branch: refs/heads/master
Commit: c8191d75e630b762b3b06adc288b416eb97424e2
Parents: dd78590 bcadf04
Author: Xin Wang <be...@163.com>
Authored: Wed Aug 31 21:21:42 2016 +0800
Committer: Xin Wang <be...@163.com>
Committed: Wed Aug 31 21:21:42 2016 +0800
----------------------------------------------------------------------
CHANGELOG.md | 10 +
README.markdown | 3 +
bin/storm.py | 143 +-
conf/defaults.yaml | 1 +
docs/Command-line-client.md | 24 +-
docs/SECURITY.md | 4 +-
docs/STORM-UI-REST-API.md | 121 +-
docs/flux.md | 27 +-
docs/images/supervisor_page.png | Bin 0 -> 133290 bytes
docs/storm-sql.md | 63 +-
examples/storm-starter/README.markdown | 2 +-
external/flux/README.md | 27 +-
external/sql/README.md | 67 +-
external/sql/storm-sql-core/pom.xml | 5 +
.../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-runtime/pom.xml | 5 +
.../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-kafka-client/README.md | 30 +-
.../apache/storm/kafka/spout/KafkaSpout.java | 50 +-
.../storm/kafka/spout/KafkaSpoutConfig.java | 6 +-
.../KafkaSpoutRetryExponentialBackoff.java | 2 +-
.../test/KafkaSpoutTopologyMainNamedTopics.java | 6 +-
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 +
log4j2/worker.xml | 2 +-
pom.xml | 12 +
.../src/clj/org/apache/storm/daemon/nimbus.clj | 353 +-
.../src/clj/org/apache/storm/daemon/worker.clj | 27 +-
storm-core/src/clj/org/apache/storm/ui/core.clj | 94 +-
storm-core/src/jvm/org/apache/storm/Config.java | 7 +
.../jvm/org/apache/storm/StormSubmitter.java | 106 +-
.../apache/storm/blobstore/BlobStoreUtils.java | 21 +-
.../jvm/org/apache/storm/daemon/DrpcServer.java | 18 +-
.../org/apache/storm/daemon/StormCommon.java | 4 +-
.../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 | 20 +-
.../apache/storm/executor/ExecutorShutdown.java | 2 +-
.../storm/executor/spout/SpoutExecutor.java | 2 +-
.../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 ++++++++++
.../storm/logging/ThriftAccessLogger.java | 30 +-
.../jvm/org/apache/storm/scheduler/Cluster.java | 217 +-
.../resource/ResourceAwareScheduler.java | 9 +
.../auth/authorizer/SimpleACLAuthorizer.java | 7 +-
.../jvm/org/apache/storm/stats/StatsUtil.java | 132 +
.../jvm/org/apache/storm/utils/ConfigUtils.java | 11 +-
.../apache/storm/utils/ThriftTopologyUtils.java | 4 +
.../src/jvm/org/apache/storm/utils/Utils.java | 6 +-
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 | 27 +-
storm-core/src/ui/public/css/style.css | 20 +
.../src/ui/public/deep_search_result.html | 4 +-
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 | 14 +-
.../test/clj/org/apache/storm/nimbus_test.clj | 106 +-
.../clj/org/apache/storm/supervisor_test.clj | 18 +-
.../DependencyPropertiesParserTest.java | 72 +
.../dependency/DependencyUploaderTest.java | 297 ++
.../org/apache/storm/stats/TestStatsUtil.java | 266 ++
.../storm/utils/ThriftTopologyUtilsTest.java | 12 +
.../staticmocking/ConfigUtilsInstaller.java | 2 +
storm-dist/binary/src/main/assembly/binary.xml | 7 +
131 files changed, 14122 insertions(+), 4040 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/c8191d75/storm-core/src/ui/public/templates/topology-page-template.html
----------------------------------------------------------------------
diff --cc storm-core/src/ui/public/templates/topology-page-template.html
index d82696e,ebdf3aa..268678b
--- a/storm-core/src/ui/public/templates/topology-page-template.html
+++ b/storm-core/src/ui/public/templates/topology-page-template.html
@@@ -59,7 -59,7 +59,7 @@@
</span>
</th>
<th>
- <span data-toggle="tooltip" data-placement="above" title="Number of nimbus hosts on which this topology's code is replicated. ">
- <span cdata-toggle="tooltip" data-placement="top" title="Number of nimbus hosts on which this topology's code is replicated. ">
++ <span data-toggle="tooltip" data-placement="top" title="Number of nimbus hosts on which this topology's code is replicated. ">
Replication count
</span>
</th>