Skip to content

Commit 889adbe

Browse files
committed
Address all comments and fix unit test failure
1 parent d02f108 commit 889adbe

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/grouping.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,9 @@ case class Grouping(child: Expression) extends Expression with Unevaluable
217217
Examples:
218218
> SELECT name, _FUNC_(), sum(age), avg(height) FROM VALUES (2, 'Alice', 165), (5, 'Bob', 180) people(age, name, height) GROUP BY cube(name, height);
219219
Alice 0 2 165.0
220-
Bob 0 5 180.0
221220
Alice 1 2 165.0
222221
NULL 3 7 172.5
222+
Bob 0 5 180.0
223223
Bob 1 5 180.0
224224
NULL 2 2 165.0
225225
NULL 2 5 180.0

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3875,8 +3875,6 @@ class SQLConf extends Serializable with Logging {
38753875

38763876
def enableTwoLevelAggMap: Boolean = getConf(ENABLE_TWOLEVEL_AGG_MAP)
38773877

3878-
def enableTwoLevelAggMapPartialOnly: Boolean = getConf(ENABLE_TWOLEVEL_AGG_MAP_PARTIAL_ONLY)
3879-
38803878
def enableVectorizedHashMap: Boolean = getConf(ENABLE_VECTORIZED_HASH_MAP)
38813879

38823880
def useObjectHashAggregation: Boolean = getConf(USE_OBJECT_HASH_AGG)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@ case class HashAggregateExec(
671671
if (modes.forall(mode => mode == Partial || mode == PartialMerge)) {
672672
true
673673
} else {
674-
!conf.enableTwoLevelAggMapPartialOnly
674+
!conf.getConf(SQLConf.ENABLE_TWOLEVEL_AGG_MAP_PARTIAL_ONLY)
675675
}
676676

677677
isSupported && isNotByteArrayDecimalType && isEnabledForAggModes

0 commit comments

Comments
 (0)