[flink] branch master updated: [hotfix][table-runtime-blink] Fix checkstyle of NestedLoopJoinCodeGenerator

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jark pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/master by this push:
     new bcc994b  [hotfix][table-runtime-blink] Fix checkstyle of NestedLoopJoinCodeGenerator
bcc994b is described below

commit bcc994be7d9e5b5ba80ee4362770bdb38f9134f5
Author: Jark Wu <im...@gmail.com>
AuthorDate: Fri Jul 5 10:26:01 2019 +0800

    [hotfix][table-runtime-blink] Fix checkstyle of NestedLoopJoinCodeGenerator
---
 .../flink/table/codegen/NestedLoopJoinCodeGenerator.scala   | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/codegen/NestedLoopJoinCodeGenerator.scala b/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/codegen/NestedLoopJoinCodeGenerator.scala
index 264a52a..b909899 100644
--- a/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/codegen/NestedLoopJoinCodeGenerator.scala
+++ b/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/codegen/NestedLoopJoinCodeGenerator.scala
@@ -180,17 +180,18 @@ class NestedLoopJoinCodeGenerator(
         ctx.addReusableMember(s"$bitSetTerm $buildMatched = null;")
       }
     }
+    val collectorRow = if (leftIsBuild) {
+      joinedRow(buildNullRow, probeRow)
+    } else {
+      joinedRow(probeRow, buildNullRow)
+    }
 
     val probeOuterCode =
       s"""
          |if (!$probeMatched) {
-         |  ${generateCollect(
-              if (leftIsBuild)
-                joinedRow(buildNullRow, probeRow)
-              else
-                joinedRow(probeRow, buildNullRow))}
+         |  ${generateCollect(collectorRow)}
          |}
-            """.stripMargin
+       """.stripMargin
 
     val iterCnt = newName("iteratorCount")
     val joinBuildAndProbe = {