Skip to content

Commit 2b3704b

Browse files
committed
Fix: Address review comments
1 parent 85280ca commit 2b3704b

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2173,8 +2173,8 @@ object SQLConf {
21732173
.checkValue(bit => bit >= 10 && bit <= 30, "The bit value must be in [10, 30].")
21742174
.createWithDefault(16)
21752175

2176-
val SPILL_PARTIAL_AGGREGATE_DISABLED =
2177-
buildConf("spark.sql.aggregate.spill.partialaggregate.disabled")
2176+
val SKIP_PARTIAL_AGGREGATE_ENABLED =
2177+
buildConf("spark.sql.aggregate.partialaggregate.skip.enabled")
21782178
.internal()
21792179
.doc("Avoid sort/spill to disk during partial aggregation")
21802180
.booleanConf
@@ -2893,7 +2893,7 @@ class SQLConf extends Serializable with Logging {
28932893

28942894
def fastHashAggregateRowMaxCapacityBit: Int = getConf(FAST_HASH_AGGREGATE_MAX_ROWS_CAPACITY_BIT)
28952895

2896-
def spillInPartialAggregationDisabled: Boolean = getConf(SPILL_PARTIAL_AGGREGATE_DISABLED)
2896+
def spillInPartialAggregationDisabled: Boolean = getConf(SKIP_PARTIAL_AGGREGATE_ENABLED)
28972897

28982898
def datetimeJava8ApiEnabled: Boolean = getConf(DATETIME_JAVA8API_ENABLED)
28992899

sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/HashAggregateExec.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ case class HashAggregateExec(
7474
"peakMemory" -> SQLMetrics.createSizeMetric(sparkContext, "peak memory"),
7575
"spillSize" -> SQLMetrics.createSizeMetric(sparkContext, "spill size"),
7676
"aggTime" -> SQLMetrics.createTimingMetric(sparkContext, "time in aggregation build"),
77-
"partialAggSkipped" -> SQLMetrics.createMetric(sparkContext, "Num records" +
78-
" skipped partial aggregation skipped"),
77+
"partialAggSkipped" -> SQLMetrics.createMetric(sparkContext,
78+
"number of skipped records for partial aggregates"),
7979
"avgHashProbe" ->
8080
SQLMetrics.createAverageMetric(sparkContext, "avg hash probe bucket list iters"))
8181

sql/core/src/test/scala/org/apache/spark/sql/execution/WholeStageCodegenSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class WholeStageCodegenSuite extends QueryTest with SharedSparkSession
5252
}
5353

5454
test(s"Avoid spill in partial aggregation" ) {
55-
withSQLConf((SQLConf.SPILL_PARTIAL_AGGREGATE_DISABLED.key, "true")) {
55+
withSQLConf((SQLConf.SKIP_PARTIAL_AGGREGATE_ENABLED.key, "true")) {
5656
// Create Dataframes
5757
val data = Seq(("James", 1), ("James", 1), ("Phil", 1))
5858
val aggDF = data.toDF("name", "values").groupBy("name").sum("values")

0 commit comments

Comments
 (0)