From 1bca2c5ea6c79e67a686d2c1c3ee750e6cce06df Mon Sep 17 00:00:00 2001 From: beliefer Date: Fri, 26 Sep 2025 16:55:14 +0800 Subject: [PATCH] [GLUTEN-10810] Change the default value of propagateIgnoreNullKeys to false --- .../src/main/scala/org/apache/gluten/config/VeloxConfig.scala | 2 +- .../gluten/execution/VeloxAggregateFunctionsSuite.scala | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/backends-velox/src/main/scala/org/apache/gluten/config/VeloxConfig.scala b/backends-velox/src/main/scala/org/apache/gluten/config/VeloxConfig.scala index 22e0b2e62076..60ba9efcce65 100644 --- a/backends-velox/src/main/scala/org/apache/gluten/config/VeloxConfig.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/config/VeloxConfig.scala @@ -639,7 +639,7 @@ object VeloxConfig { "on the grouping keys, and mark the ignoreNullKeys flag to true to " + "avoid unnecessary aggregation on null keys.") .booleanConf - .createWithDefault(true) + .createWithDefault(false) val FLOATING_POINT_MODE = buildConf("spark.gluten.sql.columnar.backend.velox.floatingPointMode") diff --git a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxAggregateFunctionsSuite.scala b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxAggregateFunctionsSuite.scala index b5ebcf1785ec..fdaa4cdd550d 100644 --- a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxAggregateFunctionsSuite.scala +++ b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxAggregateFunctionsSuite.scala @@ -1203,7 +1203,9 @@ class VeloxAggregateFunctionsDefaultSuite extends VeloxAggregateFunctionsSuite { | (select l_orderkey from lineitem) b |on a.l_orderkey = b.l_orderkey |""".stripMargin - withSQLConf(GlutenConfig.COLUMNAR_FORCE_SHUFFLED_HASH_JOIN_ENABLED.key -> "true") { + withSQLConf( + GlutenConfig.COLUMNAR_FORCE_SHUFFLED_HASH_JOIN_ENABLED.key -> "true", + VeloxConfig.VELOX_PROPAGATE_IGNORE_NULL_KEYS_ENABLED.key -> "true") { runQueryAndCompare(s) { df => val executedPlan = getExecutedPlan(df)