Skip to content

Commit 386d666

Browse files
committed
Fix
1 parent 92493c8 commit 386d666

File tree

4 files changed

+7
-157
lines changed

4 files changed

+7
-157
lines changed

sql/core/src/test/resources/tpcds-query-results/v1_4/q6.sql.out

Lines changed: 0 additions & 51 deletions
This file was deleted.

sql/core/src/test/resources/tpcds-query-results/v1_4/q75.sql.out

Lines changed: 0 additions & 105 deletions
This file was deleted.

sql/core/src/test/scala/org/apache/spark/sql/TPCDSBase.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import org.apache.spark.sql.test.SharedSparkSession
2424
trait TPCDSBase extends SharedSparkSession with TPCDSSchema {
2525

2626
// The TPCDS queries below are based on v1.4
27-
val tpcdsQueries = Seq(
27+
def tpcdsQueries: Seq[String] = Seq(
2828
"q1", "q2", "q3", "q4", "q5", "q6", "q7", "q8", "q9", "q10", "q11",
2929
"q12", "q13", "q14a", "q14b", "q15", "q16", "q17", "q18", "q19", "q20",
3030
"q21", "q22", "q23a", "q23b", "q24a", "q24b", "q25", "q26", "q27", "q28", "q29", "q30",

sql/core/src/test/scala/org/apache/spark/sql/TPCDSQueryTestSuite.scala

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,12 @@ class TPCDSQueryTestSuite extends QueryTest with TPCDSBase with SQLQueryTestHelp
8383
.toFile.getAbsolutePath
8484
}
8585

86+
override val tpcdsQueries = {
87+
// SPARK-35327: Filters out the TPC-DS queries that can cause flaky test results
88+
val excludedQueries = Set("q6", "q75")
89+
super.tpcdsQueries.filterNot(excludedQueries.contains)
90+
}
91+
8692
override def createTable(
8793
spark: SparkSession,
8894
tableName: String,

0 commit comments

Comments
 (0)