Skip to content

[SPARK-22747][SQL] Localize lifetime of mutable states in HashAggregateExec #19938

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
wants to merge 1 commit into from
+21 −2
Closed

[SPARK-22747][SQL] Localize lifetime of mutable states in HashAggregateExec #19938

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
23 changes: 21 additions & 2 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/HashAggregateExec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,13 +214,32 @@ case class HashAggregateExec(
val resultVars = resultExpressions.map { e =>
BindReferences.bindReference(e, aggregateAttributes).genCode(ctx)
}
(resultVars, s"""
val localBufVars = resultExpressions.zip(resultVars).map { case (expr, ev) =>
val isNull = ctx.freshName("localBufisNull")
val value = ctx.freshName("localBufValue")
(s"""
|boolean $isNull = ${ev.isNull};\n
|${ctx.javaType(expr.dataType)} $value = ${ev.value};
""".stripMargin,
isNull, value)
}
(localBufVars.map(e => ExprCode("", e._2, e._3)), s"""
|$evaluateAggResults
|${evaluateVariables(resultVars)}
|${localBufVars.map(_._1).mkString("\n")}
""".stripMargin)
} else if (modes.contains(Partial) || modes.contains(PartialMerge)) {
// output the aggregate buffer directly
(bufVars, "")
val localBufVars = initExpr.zip(bufVars).map { case (expr, ev) =>
val isNull = ctx.freshName("localBufisNull")
val value = ctx.freshName("localBufValue")
(s"""
|boolean $isNull = ${ev.isNull};\n
|${ctx.javaType(expr.dataType)} $value = ${ev.value};
""".stripMargin,
isNull, value)
}
(localBufVars.map(e => ExprCode("", e._2, e._3)), localBufVars.map(_._1).mkString("\n"))
} else {
// no aggregate function, the result should be literals
val resultVars = resultExpressions.map(_.genCode(ctx))
Expand Down