Review feedback

apache · Jan 22, 2019 · 5f27005 · 5f27005
1 parent 367b6e8
commit 5f27005
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/WholeStageCodegenExec.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/WholeStageCodegenExec.scala
@@ -143,7 +143,7 @@ trait CodegenSupport extends SparkPlan {
    * Note that `outputVars` and `row` can't both be null.
    */
   final def consume(ctx: CodegenContext, outputVars: Seq[ExprCode], row: String = null): String = {
-    val inputVars = {
+    val inputVarsCandidate =
       if (outputVars != null) {
         assert(outputVars.length == output.length)
         // outputVars will be used to generate the code for UnsafeRow, so we should copy them
@@ -156,7 +156,8 @@ trait CodegenSupport extends SparkPlan {
           BoundReference(i, attr.dataType, attr.nullable).genCode(ctx)
         }
       }
-    } match {
+
+    val inputVars = inputVarsCandidate match {
       case stream: Stream[ExprCode] => stream.force
       case other => other
     }