[CH] enable replaceSortAggWithHashAgg

apache · Dec 11, 2023 · 4a9ccba · 4a9ccba
1 parent fb3bc84
commit 4a9ccba
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/...lickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseFileFormatSuite.scala b/...lickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseFileFormatSuite.scala
@@ -196,7 +196,7 @@ class GlutenClickHouseFileFormatSuite
     )
   }
 
-  test("read data from csv file format witsh agg") {
+  test("read data from csv file format with agg") {
     val filePath = basePath + "/csv_test_agg.csv"
     val csvFileFormat = "csv"
     val sql =
@@ -214,8 +214,7 @@ class GlutenClickHouseFileFormatSuite
           case f: FileSourceScanExecTransformer => f
         }
         assert(csvFileScan.size == 1)
-      },
-      noFallBack = false
+      }
     )
   }
 

diff --git a/...scala/io/glutenproject/execution/GlutenClickHouseTPCHColumnarShuffleParquetAQESuite.scala b/...scala/io/glutenproject/execution/GlutenClickHouseTPCHColumnarShuffleParquetAQESuite.scala
@@ -327,7 +327,7 @@ class GlutenClickHouseTPCHColumnarShuffleParquetAQESuite
           |    l_returnflag,
           |    l_linestatus
           |""".stripMargin
-      runQueryAndCompare(sql, noFallBack = false) { df => }
+      runQueryAndCompare(sql) { df => }
     }
   }
 }
diff --git a/backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/VeloxBackend.scala b/backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/VeloxBackend.scala
@@ -278,8 +278,6 @@ object BackendSettings extends BackendSettingsApi {
   override def removeHashColumnFromColumnarShuffleExchangeExec(): Boolean = true
   override def rescaleDecimalLiteral(): Boolean = true
 
-  override def replaceSortAggWithHashAgg: Boolean = GlutenConfig.getConf.forceToUseHashAgg
-
   /** Get the config prefix for each backend */
   override def getBackendConfigPrefix(): String =
     GlutenConfig.GLUTEN_CONFIG_PREFIX + VeloxBackend.BACKEND_NAME

diff --git a/gluten-core/src/main/scala/io/glutenproject/backendsapi/BackendSettingsApi.scala b/gluten-core/src/main/scala/io/glutenproject/backendsapi/BackendSettingsApi.scala
@@ -82,7 +82,7 @@ trait BackendSettingsApi {
    * Whether to replace sort agg with hash agg., e.g., sort agg will be used in spark's planning for
    * string type input.
    */
-  def replaceSortAggWithHashAgg: Boolean = false
+  def replaceSortAggWithHashAgg: Boolean = GlutenConfig.getConf.forceToUseHashAgg
 
   /** Get the config prefix for each backend */
   def getBackendConfigPrefix: String

diff --git a/gluten-core/src/main/scala/io/glutenproject/utils/FallbackUtil.scala b/gluten-core/src/main/scala/io/glutenproject/utils/FallbackUtil.scala
@@ -78,9 +78,9 @@ object FallbackUtil extends Logging with AdaptiveSparkPlanHelper {
       }
     }
 
-    if (!fallbackOperator.isEmpty) {
+    if (fallbackOperator.nonEmpty) {
       fallbackOperator.foreach(operator => log.info(s"gluten fallback operator:{$operator}"))
     }
-    return fallbackOperator.nonEmpty
+    fallbackOperator.nonEmpty
   }
 }