Merge branch 'FLINK-4086'
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/18995c8c Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/18995c8c Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/18995c8c Branch: refs/heads/master Commit: 18995c8c7b8f9c75035b1a95a00379944c6f2b0c Parents: e34fea5 429b844 Author: twalthr <twal...@apache.org> Authored: Mon Jul 4 18:21:04 2016 +0200 Committer: twalthr <twal...@apache.org> Committed: Mon Jul 4 18:21:04 2016 +0200 ---------------------------------------------------------------------- .../api/table/expressions/Expression.scala | 24 +++---- .../api/table/expressions/InputTypeSpec.scala | 4 +- .../api/table/expressions/aggregations.scala | 36 +++++----- .../api/table/expressions/arithmetic.scala | 28 ++++---- .../flink/api/table/expressions/call.scala | 8 +-- .../flink/api/table/expressions/cast.scala | 6 +- .../api/table/expressions/comparison.scala | 73 ++++++++++--------- .../api/table/expressions/fieldExpression.scala | 35 ++++----- .../flink/api/table/expressions/literals.scala | 6 +- .../flink/api/table/expressions/logic.scala | 22 +++--- .../api/table/expressions/mathExpressions.scala | 57 +++++++-------- .../flink/api/table/expressions/ordering.scala | 10 +-- .../table/expressions/stringExpressions.scala | 76 ++++++++++---------- .../apache/flink/api/table/trees/TreeNode.scala | 10 +-- 14 files changed, 202 insertions(+), 193 deletions(-) ----------------------------------------------------------------------
