Fix

apache · May 12, 2021 · 9fe4b42 · 9fe4b42
1 parent 82c520a
commit 9fe4b42
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/TPCDSBase.scala b/sql/core/src/test/scala/org/apache/spark/sql/TPCDSBase.scala
@@ -24,7 +24,7 @@ import org.apache.spark.sql.test.SharedSparkSession
 trait TPCDSBase extends SharedSparkSession with TPCDSSchema {
 
   // The TPCDS queries below are based on v1.4
-  def tpcdsQueries: Seq[String] = Seq(
+  private val tpcdsAllQueries: Seq[String] = Seq(
     "q1", "q2", "q3", "q4", "q5", "q6", "q7", "q8", "q9", "q10", "q11",
     "q12", "q13", "q14a", "q14b", "q15", "q16", "q17", "q18", "q19", "q20",
     "q21", "q22", "q23a", "q23b", "q24a", "q24b", "q25", "q26", "q27", "q28", "q29", "q30",
@@ -36,6 +36,12 @@ trait TPCDSBase extends SharedSparkSession with TPCDSSchema {
     "q81", "q82", "q83", "q84", "q85", "q86", "q87", "q88", "q89", "q90",
     "q91", "q92", "q93", "q94", "q95", "q96", "q97", "q98", "q99")
 
+  // Since `tpcdsQueriesV2_7_0` has almost the same queries with these oens below,
+  // we skip them in the TPCDS-related tests.
+  private val excludedTpcdsQueries: Set[String] = Set("q6", "q34", "q64", "q74", "q75", "q78")
+
+  val tpcdsQueries: Seq[String] = tpcdsAllQueries.filterNot(excludedTpcdsQueries.contains)
+
   // This list only includes TPCDS v2.7 queries that are different from v1.4 ones
   val tpcdsQueriesV2_7_0 = Seq(
     "q5a", "q6", "q10a", "q11", "q12", "q14", "q14a", "q18a",

diff --git a/sql/core/src/test/scala/org/apache/spark/sql/TPCDSQueryTestSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/TPCDSQueryTestSuite.scala
@@ -83,12 +83,6 @@ class TPCDSQueryTestSuite extends QueryTest with TPCDSBase with SQLQueryTestHelp
       .toFile.getAbsolutePath
   }
 
-  override val tpcdsQueries = {
-    // SPARK-35327: Filters out the TPC-DS queries that can cause flaky test results
-    val excludedQueries = Set("q6", "q75")
-    super.tpcdsQueries.filterNot(excludedQueries.contains)
-  }
-
   override def createTable(
       spark: SparkSession,
       tableName: String,