Merge branch 'STORM-2125-1.x' 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/c778af85
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c778af85
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c778af85

Branch: refs/heads/1.x-branch
Commit: c778af85338e0e086c7e565239a2debebf868763
Parents: cdcfaef dec76a7
Author: Jungtaek Lim <kabh...@gmail.com>
Authored: Wed Oct 12 18:27:24 2016 +0900
Committer: Jungtaek Lim <kabh...@gmail.com>
Committed: Wed Oct 12 18:27:24 2016 +0900

----------------------------------------------------------------------
 external/sql/storm-sql-core/pom.xml             |  25 -
 .../storm-sql-core/src/codegen/data/Parser.tdd  |   6 +-
 .../jvm/org/apache/storm/sql/StormSqlImpl.java  |   9 +-
 .../apache/storm/sql/compiler/ExprCompiler.java | 523 -------------------
 .../RexNodeToBlockStatementCompiler.java        | 102 ++++
 .../backends/standalone/PlanCompiler.java       |  16 +-
 .../backends/standalone/RelNodeCompiler.java    |  68 ++-
 .../compiler/backends/trident/PlanCompiler.java |   9 +-
 .../trident/TridentLogicalPlanCompiler.java     |  84 +--
 .../test/org/apache/storm/sql/TestStormSql.java |  70 ++-
 .../storm/sql/compiler/TestCompilerUtils.java   |  34 +-
 .../storm/sql/compiler/TestExprCompiler.java    |  93 ----
 .../storm/sql/compiler/TestExprSemantic.java    | 262 +++++++++-
 .../backends/standalone/TestPlanCompiler.java   |   6 +-
 .../standalone/TestRelNodeCompiler.java         |   2 +-
 .../backends/trident/TestPlanCompiler.java      | 143 ++++-
 external/sql/storm-sql-runtime/pom.xml          |  13 -
 .../calcite/interpreter/StormContext.java       |  31 ++
 .../sql/runtime/calcite/StormDataContext.java   |  79 +++
 .../trident/functions/EvaluationFilter.java     |  21 +-
 .../trident/functions/EvaluationFunction.java   |  22 +-
 .../test/org/apache/storm/sql/TestUtils.java    |  91 +++-
 pom.xml                                         |  11 +-
 23 files changed, 923 insertions(+), 797 deletions(-)
----------------------------------------------------------------------


Reply via email to