Skip to content

Commit 2e19011

Browse files
authored
chore: fix ConstantFolding rule exclusion (#4689)
1 parent e16b87d commit 2e19011

3 files changed

Lines changed: 6 additions & 3 deletions

File tree

spark/src/test/scala/org/apache/spark/sql/benchmark/CometBenchmarkBase.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ trait CometBenchmarkBase
124124
val cometExecConfigs = Map(
125125
CometConf.COMET_ENABLED.key -> "true",
126126
CometConf.COMET_EXEC_ENABLED.key -> "true",
127-
"spark.sql.optimizer.constantFolding.enabled" -> "false") ++ extraCometConfigs
127+
"spark.sql.optimizer.excludedRules" ->
128+
"org.apache.spark.sql.catalyst.optimizer.ConstantFolding") ++ extraCometConfigs
128129

129130
// Check that the plan is fully Comet native before running the benchmark
130131
withSQLConf(cometExecConfigs.toSeq: _*) {

spark/src/test/scala/org/apache/spark/sql/benchmark/CometRegExpBenchmark.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ object CometRegExpBenchmark extends CometBenchmarkBase {
100100
val baseExec = Map(
101101
CometConf.COMET_ENABLED.key -> "true",
102102
CometConf.COMET_EXEC_ENABLED.key -> "true",
103-
"spark.sql.optimizer.constantFolding.enabled" -> "false")
103+
"spark.sql.optimizer.excludedRules" ->
104+
"org.apache.spark.sql.catalyst.optimizer.ConstantFolding")
104105

105106
benchmark.addCase("Comet (Exec, native Rust regex)") { _ =>
106107
val configs = baseExec ++ Map(CometConf.getExprAllowIncompatConfigKey("RLike") -> "true")

spark/src/test/scala/org/apache/spark/sql/benchmark/CometRegExpExtractBenchmark.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,8 @@ object CometRegExpExtractBenchmark extends CometBenchmarkBase {
152152
val baseExec = Map(
153153
CometConf.COMET_ENABLED.key -> "true",
154154
CometConf.COMET_EXEC_ENABLED.key -> "true",
155-
"spark.sql.optimizer.constantFolding.enabled" -> "false")
155+
"spark.sql.optimizer.excludedRules" ->
156+
"org.apache.spark.sql.catalyst.optimizer.ConstantFolding")
156157

157158
benchmark.addCase("Comet (Exec, native Rust regex)") { _ =>
158159
val configs =

0 commit comments

Comments
 (0)