upmerge from master
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b1c8188d Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b1c8188d Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b1c8188d Branch: refs/heads/master Commit: b1c8188d8252ef613c04aeae9e9560a800f9ead3 Parents: 69f2906 df54280 Author: å«ä¹ <[email protected]> Authored: Thu Mar 3 10:17:26 2016 +0800 Committer: å«ä¹ <[email protected]> Committed: Thu Mar 3 10:17:26 2016 +0800 ---------------------------------------------------------------------- .gitignore | 1 + CHANGELOG.md | 6 ++ bin/storm.cmd | 2 +- bin/storm.py | 4 +- .../storm/starter/ThroughputVsLatency.java | 2 +- .../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 +++++++++- pom.xml | 23 +++++++ .../apache/storm/command/upload_credentials.clj | 35 ----------- .../src/jvm/org/apache/storm/command/List.java | 50 --------------- .../apache/storm/command/ListTopologies.java | 52 ++++++++++++++++ .../apache/storm/command/UploadCredentials.java | 61 +++++++++++++++++++ .../jvm/org/apache/storm/utils/ConfigUtils.java | 8 +-- .../src/jvm/org/apache/storm/utils/Utils.java | 9 +-- 22 files changed, 375 insertions(+), 128 deletions(-) ----------------------------------------------------------------------
