Fix aggregation.

viirya · viirya · commit 6d600d5eb4a2 · 2017-08-13T14:17:01.000Z
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
@@ -222,7 +222,7 @@ trait CodegenSupport extends SparkPlan {
 
     s"""
        | boolean continueForLoop = $doConsumeFuncName($callingParams);
-       | if (continueForLoop) $effectiveContinueStatement;
+       | if (continueForLoop) $effectiveContinueStatement
      """.stripMargin
   }
 
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/HashAggregateExec.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/HashAggregateExec.scala
@@ -163,6 +163,8 @@ case class HashAggregateExec(
   // The variables used as aggregation buffer. Only used for aggregation without keys.
   private var bufVars: Seq[ExprCode] = _
 
+  override protected def effectiveContinueStatement: String = "continue;"
+
   private def doProduceWithoutKeys(ctx: CodegenContext): String = {
     val initAgg = ctx.freshName("initAgg")
     ctx.addMutableState("boolean", initAgg, s"$initAgg = false;")

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ trait CodegenSupport extends SparkPlan {`
`222`	`222`
`223`	`223`	`s"""`
`224`	`224`	`\| boolean continueForLoop = $doConsumeFuncName($callingParams);`
`225`		`- \| if (continueForLoop) $effectiveContinueStatement;`
	`225`	`+ \| if (continueForLoop) $effectiveContinueStatement`
`226`	`226`	`""".stripMargin`
`227`	`227`	`}`
`228`	`228`