update

apache · Oct 31, 2024 · db5ed73 · db5ed73
1 parent 9488005
commit db5ed73
Show file tree

Hide file tree

Showing 4 changed files with 248 additions and 167 deletions.
diff --git a/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHRuleApi.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHRuleApi.scala
@@ -49,7 +49,7 @@ private object CHRuleApi {
     // Inject the regular Spark rules directly.
     injector.injectQueryStagePrepRule(FallbackBroadcastHashJoinPrepQueryStage.apply)
     injector.injectQueryStagePrepRule(spark => CHAQEPropagateEmptyRelation(spark))
-    injector.injectQueryStagePrepRule(spark => LazyExpandRule(spark))
+    // injector.injectQueryStagePrepRule(spark => LazyExpandRule(spark))
     injector.injectParser(
       (spark, parserInterface) => new GlutenCacheFilesSqlParser(spark, parserInterface))
     injector.injectParser(
@@ -84,6 +84,7 @@ private object CHRuleApi {
     injector.injectTransform(_ => CollapseProjectExecTransformer)
     injector.injectTransform(c => RewriteSortMergeJoinToHashJoinRule.apply(c.session))
     injector.injectTransform(c => PushdownAggregatePreProjectionAheadExpand.apply(c.session))
+    injector.injectTransform(c => LazyAggregateExpandRule.apply(c.session))
     injector.injectTransform(
       c =>
         intercept(