Github user fhueske commented on a diff in the pull request:
https://github.com/apache/flink/pull/3673#discussion_r113664793
--- Diff:
flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetSingleRowJoin.scala
---
@@ -138,32 +146,97 @@ class DataSetSingleRowJoin(
val condition = codeGenerator.generateExpression(joinCondition)
val joinMethodBody =
- s"""
- |${condition.code}
- |if (${condition.resultTerm}) {
- | ${conversion.code}
- |
${codeGenerator.collectorTerm}.collect(${conversion.resultTerm});
- |}
- |""".stripMargin
+ if (joinType == JoinRelType.INNER) {
+ s"""
+ |${condition.code}
+ |if (${condition.resultTerm}) {
+ | ${conversion.code}
+ |
${codeGenerator.collectorTerm}.collect(${conversion.resultTerm});
+ |}
+ |""".stripMargin
+ } else {
+ val singleNode =
+ if (rightIsSingle) {
+ rightNode
+ }
+ else {
+ leftNode
+ }
+
+ val notSuitedToCondition = singleNode
+ .getRowType
+ .getFieldList
+ .map(field => getRowType.getFieldNames.indexOf(field.getName))
+ .map(i => s"${conversion.resultTerm}.setField($i,null);")
+
+ if (joinType == JoinRelType.LEFT && leftIsSingle) {
+ s"""
+ |${condition.code}
+ |${conversion.code}
+ |if(!${condition.resultTerm}){
+ |${notSuitedToCondition.mkString("\n")}
+ |}
+ |if(!${condition.leftNullTerm}){
+
|${codeGenerator.collectorTerm}.collect(${conversion.resultTerm});
+ |}
+ |""".stripMargin
+ } else if (joinType == JoinRelType.RIGHT && rightIsSingle){
+ s"""
+ |${condition.code}
+ |${conversion.code}
+ |if(!${condition.resultTerm}){
+ |${notSuitedToCondition.mkString("\n")}
+ |}
+ |if(!${condition.leftNullTerm} && ${condition.resultTerm}){
+
|${codeGenerator.collectorTerm}.collect(${conversion.resultTerm});
+ |}
+ |""".stripMargin
+ } else {
+ s"""
+ |${condition.code}
+ |${conversion.code}
+ |if(!${condition.resultTerm}){
+ |${notSuitedToCondition.mkString("\n")}
+ |}
+
|${codeGenerator.collectorTerm}.collect(${conversion.resultTerm});
+ |""".stripMargin
+ }
+ }
val genFunction = codeGenerator.generateFunction(
ruleDescription,
classOf[FlatJoinFunction[Row, Row, Row]],
joinMethodBody,
returnType)
- if (firstIsSingle) {
- new MapJoinRightRunner[Row, Row, Row](
- genFunction.name,
- genFunction.code,
- genFunction.returnType,
- broadcastInputSetName)
+ if (joinType == JoinRelType.RIGHT) {
--- End diff --
Do not invert the runners for `JoinRelType.RIGHT` the join input sides
should be independent of the join type.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
