diff --git a/spark/src/test/scala/org/apache/spark/sql/benchmark/CometBenchmarkBase.scala b/spark/src/test/scala/org/apache/spark/sql/benchmark/CometBenchmarkBase.scala index 9307c785c7..71ff2000b3 100644 --- a/spark/src/test/scala/org/apache/spark/sql/benchmark/CometBenchmarkBase.scala +++ b/spark/src/test/scala/org/apache/spark/sql/benchmark/CometBenchmarkBase.scala @@ -124,7 +124,8 @@ trait CometBenchmarkBase val cometExecConfigs = Map( CometConf.COMET_ENABLED.key -> "true", CometConf.COMET_EXEC_ENABLED.key -> "true", - "spark.sql.optimizer.constantFolding.enabled" -> "false") ++ extraCometConfigs + "spark.sql.optimizer.excludedRules" -> + "org.apache.spark.sql.catalyst.optimizer.ConstantFolding") ++ extraCometConfigs // Check that the plan is fully Comet native before running the benchmark withSQLConf(cometExecConfigs.toSeq: _*) { diff --git a/spark/src/test/scala/org/apache/spark/sql/benchmark/CometRegExpBenchmark.scala b/spark/src/test/scala/org/apache/spark/sql/benchmark/CometRegExpBenchmark.scala index 37ab47e71a..5a6741dc2a 100644 --- a/spark/src/test/scala/org/apache/spark/sql/benchmark/CometRegExpBenchmark.scala +++ b/spark/src/test/scala/org/apache/spark/sql/benchmark/CometRegExpBenchmark.scala @@ -100,7 +100,8 @@ object CometRegExpBenchmark extends CometBenchmarkBase { val baseExec = Map( CometConf.COMET_ENABLED.key -> "true", CometConf.COMET_EXEC_ENABLED.key -> "true", - "spark.sql.optimizer.constantFolding.enabled" -> "false") + "spark.sql.optimizer.excludedRules" -> + "org.apache.spark.sql.catalyst.optimizer.ConstantFolding") benchmark.addCase("Comet (Exec, native Rust regex)") { _ => val configs = baseExec ++ Map(CometConf.getExprAllowIncompatConfigKey("RLike") -> "true") diff --git a/spark/src/test/scala/org/apache/spark/sql/benchmark/CometRegExpExtractBenchmark.scala b/spark/src/test/scala/org/apache/spark/sql/benchmark/CometRegExpExtractBenchmark.scala index 1d04ae49df..2db4fff134 100644 --- a/spark/src/test/scala/org/apache/spark/sql/benchmark/CometRegExpExtractBenchmark.scala +++ b/spark/src/test/scala/org/apache/spark/sql/benchmark/CometRegExpExtractBenchmark.scala @@ -152,7 +152,8 @@ object CometRegExpExtractBenchmark extends CometBenchmarkBase { val baseExec = Map( CometConf.COMET_ENABLED.key -> "true", CometConf.COMET_EXEC_ENABLED.key -> "true", - "spark.sql.optimizer.constantFolding.enabled" -> "false") + "spark.sql.optimizer.excludedRules" -> + "org.apache.spark.sql.catalyst.optimizer.ConstantFolding") benchmark.addCase("Comet (Exec, native Rust regex)") { _ => val configs =