You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/03/02 18:27:40 UTC

[7/9] storm git commit: upmerge from master

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

Branch: refs/heads/master
Commit: ff11c8a0bfaf2ac4a0daa2d6b0399fb42f301cd5
Parents: 3def236 d42c437
Author: 卫乐 <we...@taobao.com>
Authored: Wed Mar 2 11:12:55 2016 +0800
Committer: 卫乐 <we...@taobao.com>
Committed: Wed Mar 2 11:12:55 2016 +0800

----------------------------------------------------------------------
 CHANGELOG.md                                    |  4 ++
 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 +++++++++-
 .../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 +++++++++++++++++++
 18 files changed, 344 insertions(+), 116 deletions(-)
----------------------------------------------------------------------