Skip to content

Commit 01b5917

Browse files
authored
fix: Set scan implementation choice via environment variable (#1231)
1 parent 6ab514f commit 01b5917

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

common/src/main/scala/org/apache/comet/CometConf.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ object CometConf extends ShimCometConf {
9494
.stringConf
9595
.transform(_.toLowerCase(Locale.ROOT))
9696
.checkValues(Set(SCAN_NATIVE, SCAN_NATIVE_FULL, SCAN_NATIVE_RECORDBATCH))
97-
.createWithDefault(SCAN_NATIVE_FULL)
97+
.createWithDefault(sys.env.getOrElse("NATIVE_SCAN_IMPL", SCAN_NATIVE_FULL))
9898

9999
val COMET_PARQUET_PARALLEL_IO_ENABLED: ConfigEntry[Boolean] =
100100
conf("spark.comet.parquet.read.parallel.io.enabled")

spark/src/test/scala/org/apache/spark/sql/CometTestBase.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ abstract class CometTestBase
8080
conf.set(CometConf.COMET_EXEC_SHUFFLE_ENABLED.key, "true")
8181
conf.set(CometConf.COMET_SPARK_TO_ARROW_ENABLED.key, "true")
8282
conf.set(CometConf.COMET_NATIVE_SCAN_ENABLED.key, "true")
83-
conf.set(CometConf.COMET_NATIVE_SCAN_IMPL.key, CometConf.SCAN_NATIVE_FULL)
8483
conf.set(CometConf.COMET_MEMORY_OVERHEAD.key, "2g")
8584
conf.set(CometConf.COMET_EXEC_SORT_MERGE_JOIN_WITH_JOIN_FILTER_ENABLED.key, "true")
8685
conf

spark/src/test/scala/org/apache/spark/sql/comet/CometPlanStabilitySuite.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -270,9 +270,8 @@ trait CometPlanStabilitySuite extends DisableAdaptiveExecutionSuite with TPCDSBa
270270
withSQLConf(
271271
CometConf.COMET_ENABLED.key -> "true",
272272
CometConf.COMET_NATIVE_SCAN_ENABLED.key -> "true",
273-
CometConf.COMET_NATIVE_SCAN_IMPL.key -> CometConf.SCAN_NATIVE_FULL,
274-
SQLConf.DYNAMIC_PARTITION_PRUNING_ENABLED.key -> dppEnabled.toString,
275273
CometConf.COMET_EXEC_ENABLED.key -> "true",
274+
CometConf.COMET_DPP_FALLBACK_ENABLED.key -> "false",
276275
CometConf.COMET_EXEC_SHUFFLE_ENABLED.key -> "true",
277276
CometConf.COMET_EXEC_SORT_MERGE_JOIN_WITH_JOIN_FILTER_ENABLED.key -> "true",
278277
CometConf.COMET_CAST_ALLOW_INCOMPATIBLE.key -> "true", // needed for v1.4/q9, v1.4/q44, v2.7.0/q6, v2.7.0/q64
@@ -303,7 +302,6 @@ trait CometPlanStabilitySuite extends DisableAdaptiveExecutionSuite with TPCDSBa
303302
conf.set(CometConf.COMET_ENABLED.key, "true")
304303
conf.set(CometConf.COMET_EXEC_ENABLED.key, "true")
305304
conf.set(CometConf.COMET_NATIVE_SCAN_ENABLED.key, "true")
306-
conf.set(CometConf.COMET_NATIVE_SCAN_IMPL.key, CometConf.SCAN_NATIVE_FULL)
307305
conf.set(CometConf.COMET_MEMORY_OVERHEAD.key, "1g")
308306
conf.set(CometConf.COMET_EXEC_SHUFFLE_ENABLED.key, "true")
309307

0 commit comments

Comments
 (0)