flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fhue...@apache.org
Subject [1/5] flink git commit: [FLINK-7404] [table] Generate code for non-equi join conditions only.
Date Tue, 05 Sep 2017 12:22:40 GMT
Repository: flink
Updated Branches:
  refs/heads/master ba03b78c7 -> 7c11bd7f4


[FLINK-7404] [table] Generate code for non-equi join conditions only.

This closes #4507.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/4cf737c1
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/4cf737c1
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/4cf737c1

Branch: refs/heads/master
Commit: 4cf737c1c12a4d61e9388992ee96875c43faa410
Parents: 0eef8e8
Author: Fabian Hueske <fhueske@apache.org>
Authored: Wed Aug 9 17:41:10 2017 +0200
Committer: Fabian Hueske <fhueske@apache.org>
Committed: Tue Sep 5 13:53:59 2017 +0200

----------------------------------------------------------------------
 .../org/apache/flink/table/plan/nodes/dataset/DataSetJoin.scala   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/4cf737c1/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetJoin.scala
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetJoin.scala
b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetJoin.scala
index 1583e31..acbf94d 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetJoin.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetJoin.scala
@@ -186,7 +186,8 @@ class DataSetJoin(
            |""".stripMargin
     }
     else {
-      val condition = generator.generateExpression(joinCondition)
+      val nonEquiPredicates = joinInfo.getRemaining(this.cluster.getRexBuilder)
+      val condition = generator.generateExpression(nonEquiPredicates)
       body = s"""
            |${condition.code}
            |if (${condition.resultTerm}) {


Mime
View raw message