Skip to content

Commit c13da4e

Browse files
andygroveSteve Vaughan Jr
authored andcommitted
Enable plan stability tests (apache#2516)
1 parent bf6c6e0 commit c13da4e

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

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

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ trait CometPlanStabilitySuite extends DisableAdaptiveExecutionSuite with TPCDSBa
248248
CometConf.COMET_EXPLAIN_FALLBACK_ENABLED.key -> "true",
249249
CometConf.COMET_ENABLED.key -> "true",
250250
CometConf.COMET_NATIVE_SCAN_ENABLED.key -> "true",
251+
CometConf.COMET_NATIVE_SCAN_IMPL.key -> CometConf.SCAN_AUTO,
251252
CometConf.COMET_EXEC_ENABLED.key -> "true",
252253
CometConf.COMET_DPP_FALLBACK_ENABLED.key -> "false",
253254
CometConf.COMET_EXEC_SHUFFLE_ENABLED.key -> "true",
@@ -284,8 +285,6 @@ trait CometPlanStabilitySuite extends DisableAdaptiveExecutionSuite with TPCDSBa
284285
conf.set(CometConf.COMET_ENABLED.key, "true")
285286
conf.set(CometConf.COMET_EXEC_ENABLED.key, "true")
286287
conf.set(CometConf.COMET_EXEC_SORT_MERGE_JOIN_WITH_JOIN_FILTER_ENABLED.key, "true")
287-
conf.set(CometConf.COMET_NATIVE_SCAN_ENABLED.key, "true")
288-
conf.set(CometConf.COMET_NATIVE_SCAN_IMPL.key, CometConf.SCAN_AUTO)
289288
conf.set(CometConf.COMET_MEMORY_OVERHEAD.key, "1g")
290289
conf.set(CometConf.COMET_EXEC_SHUFFLE_ENABLED.key, "true")
291290

@@ -304,11 +303,9 @@ class CometTPCDSV1_4_PlanStabilitySuite extends CometPlanStabilitySuite {
304303
override val goldenFilePath: String =
305304
new File(baseResourcePath, planName).getAbsolutePath
306305

307-
if (CometConf.COMET_NATIVE_SCAN_IMPL.get() == CometConf.SCAN_AUTO) {
308-
tpcdsQueries.foreach { q =>
309-
test(s"check simplified (tpcds-v1.4/$q)") {
310-
testQuery("tpcds", q)
311-
}
306+
tpcdsQueries.foreach { q =>
307+
test(s"check simplified (tpcds-v1.4/$q)") {
308+
testQuery("tpcds", q)
312309
}
313310
}
314311
}
@@ -324,11 +321,9 @@ class CometTPCDSV2_7_PlanStabilitySuite extends CometPlanStabilitySuite {
324321
override val goldenFilePath: String =
325322
new File(baseResourcePath, planName).getAbsolutePath
326323

327-
if (CometConf.COMET_NATIVE_SCAN_IMPL.get() == CometConf.SCAN_AUTO) {
328-
tpcdsQueriesV2_7_0.foreach { q =>
329-
test(s"check simplified (tpcds-v2.7.0/$q)") {
330-
testQuery("tpcds-v2.7.0", q)
331-
}
324+
tpcdsQueriesV2_7_0.foreach { q =>
325+
test(s"check simplified (tpcds-v2.7.0/$q)") {
326+
testQuery("tpcds-v2.7.0", q)
332327
}
333328
}
334329
}

0 commit comments

Comments
 (0)