Skip to content

Commit 2c68fe3

Browse files
committed
fix stylecheck
1 parent 5965fb9 commit 2c68fe3

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1276,8 +1276,8 @@ object SQLConf {
12761276

12771277
val COLLAPSE_AGGREGATE_NODES_ENABLED = buildConf("spark.sql.execution.collapseAggregateNodes")
12781278
.internal()
1279-
.doc("Whether to collapse the Partial and the Final aggregate exec nodes based on whether there is " +
1280-
"exchange between them")
1279+
.doc("Whether to collapse the Partial and the Final aggregate exec nodes based " +
1280+
"on whether there is exchange between them")
12811281
.version("3.1.0")
12821282
.booleanConf
12831283
.createWithDefault(true)

sql/core/src/main/scala/org/apache/spark/sql/execution/CollapseAggregates.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ object CollapseAggregates extends Rule[SparkPlan] {
3838
}
3939

4040
private def collapseAggregates(plan: SparkPlan): SparkPlan = {
41-
plan transformDown {
41+
plan transform {
4242
case parent@HashAggregateExec(_, _, _, _, _, _, child: HashAggregateExec)
4343
if checkIfAggregatesCanBeCollapsed(parent, child) =>
4444
val completeAggregateExpressions = child.aggregateExpressions.map(_.copy(mode = Complete))
@@ -77,8 +77,9 @@ object CollapseAggregates extends Rule[SparkPlan] {
7777
}
7878
}
7979

80-
private def checkIfAggregatesCanBeCollapsed(parent: BaseAggregateExec,
81-
child: BaseAggregateExec): Boolean = {
80+
private def checkIfAggregatesCanBeCollapsed(
81+
parent: BaseAggregateExec,
82+
child: BaseAggregateExec): Boolean = {
8283
val parentHasFinalMode = parent.aggregateExpressions.forall(_.mode == Final)
8384
if (!parentHasFinalMode) {
8485
return false

0 commit comments

Comments
 (0)