Skip to content

[FLINK-3731] make embedded SQL outer joins fail during translation #1869

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vasia wants to merge 1 commit into from
Closed

[FLINK-3731] make embedded SQL outer joins fail during translation #1869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions ...-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetJoinRule.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,10 @@ package org.apache.flink.api.table.plan.rules.dataSet
import org.apache.calcite.plan.{RelOptRuleCall, Convention, RelOptRule, RelTraitSet}
import org.apache.calcite.rel.RelNode
import org.apache.calcite.rel.convert.ConverterRule
import org.apache.calcite.rel.core.JoinRelType
import org.apache.calcite.rel.logical.LogicalJoin
import org.apache.calcite.rex.{RexInputRef, RexCall}
import org.apache.calcite.sql.fun.SqlStdOperatorTable
import org.apache.flink.api.java.operators.join.JoinType
import org.apache.flink.api.table.plan.nodes.dataset.{DataSetJoin, DataSetConvention}
import scala.collection.JavaConverters._
import scala.collection.JavaConversions._

class DataSetJoinRule
Expand All @@ -37,6 +35,14 @@ class DataSetJoinRule
"FlinkJoinRule")
{

/**
* Only translate INNER joins for now
*/
override def matches(call: RelOptRuleCall): Boolean = {
val join: LogicalJoin = call.rel(0).asInstanceOf[LogicalJoin]
join.getJoinType.equals(JoinRelType.INNER)
}

def convert(rel: RelNode): RelNode = {

val join: LogicalJoin = rel.asInstanceOf[LogicalJoin]
Expand Down
53 changes: 52 additions & 1 deletion ...libraries/flink-table/src/test/scala/org/apache/flink/api/scala/sql/test/JoinITCase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import org.apache.flink.api.scala._
import org.apache.flink.api.scala.table._
import org.apache.flink.api.scala.util.CollectionDataSets
import org.apache.flink.api.table.{TableException, Row}
import org.apache.flink.api.table.plan.TranslationContext
import org.apache.flink.api.table.plan.{PlanGenException, TranslationContext}
import org.apache.flink.api.table.test.utils.TableProgramsTestBase
import org.apache.flink.api.table.test.utils.TableProgramsTestBase.TableConfigMode
import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode
Expand Down Expand Up @@ -256,4 +256,55 @@ class JoinITCase(
val results = result.toDataSet[Row](getConfig).collect()
TestBaseUtils.compareResultAsText(results.asJava, expected)
}

@Test(expected = classOf[PlanGenException])
def testFullOuterJoin(): Unit = {

val env = ExecutionEnvironment.getExecutionEnvironment
val tEnv = getScalaTableEnvironment
TranslationContext.reset()

val sqlQuery = "SELECT c, g FROM Table3 FULL OUTER JOIN Table5 ON b = e"

val ds1 = CollectionDataSets.getSmall3TupleDataSet(env).toTable.as('a, 'b, 'c)
val ds2 = CollectionDataSets.get5TupleDataSet(env).toTable.as('d, 'e, 'f, 'g, 'h)
tEnv.registerTable("Table3", ds1)
tEnv.registerTable("Table5", ds2)

tEnv.sql(sqlQuery).toDataSet[Row](getConfig).collect()
}

@Test(expected = classOf[PlanGenException])
def testLeftOuterJoin(): Unit = {

val env = ExecutionEnvironment.getExecutionEnvironment
val tEnv = getScalaTableEnvironment
TranslationContext.reset()

val sqlQuery = "SELECT c, g FROM Table3 LEFT OUTER JOIN Table5 ON b = e"

val ds1 = CollectionDataSets.getSmall3TupleDataSet(env).toTable.as('a, 'b, 'c)
val ds2 = CollectionDataSets.get5TupleDataSet(env).toTable.as('d, 'e, 'f, 'g, 'h)
tEnv.registerTable("Table3", ds1)
tEnv.registerTable("Table5", ds2)

tEnv.sql(sqlQuery).toDataSet[Row](getConfig).collect()
}

@Test(expected = classOf[PlanGenException])
def testRightOuterJoin(): Unit = {

val env = ExecutionEnvironment.getExecutionEnvironment
val tEnv = getScalaTableEnvironment
TranslationContext.reset()

val sqlQuery = "SELECT c, g FROM Table3 RIGHT OUTER JOIN Table5 ON b = e"

val ds1 = CollectionDataSets.getSmall3TupleDataSet(env).toTable.as('a, 'b, 'c)
val ds2 = CollectionDataSets.get5TupleDataSet(env).toTable.as('d, 'e, 'f, 'g, 'h)
tEnv.registerTable("Table3", ds1)
tEnv.registerTable("Table5", ds2)

tEnv.sql(sqlQuery).toDataSet[Row](getConfig).collect()
}
}