Experiment with SQLQueryTestSuite

tanelk · Sep 19, 2020 · 317f313 · 317f313
1 parent cf6c7e9
commit 317f313
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala
@@ -293,8 +293,17 @@ abstract class Optimizer(catalogManager: CatalogManager)
    * if necessary, instead of this method.
    */
   final override def batches: Seq[Batch] = {
-    val excludedRulesConf =
-      SQLConf.get.optimizerExcludedRules.toSeq.flatMap(Utils.stringToSeq)
+    val excludedRulesConf = {
+      val excludedRulesConf = SQLConf.get.optimizerExcludedRules.toSeq.flatMap(Utils.stringToSeq)
+      if (excludedRulesConf.contains("*")) {
+        defaultBatches.flatMap { batch =>
+          batch.rules.map(_.ruleName)
+        }
+      } else {
+        excludedRulesConf
+      }
+    }
+
     val excludedRules = excludedRulesConf.filter { ruleName =>
       val nonExcludable = nonExcludableRules.contains(ruleName)
       if (nonExcludable) {

diff --git a/sql/core/src/test/scala/org/apache/spark/sql/SQLQueryTestSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/SQLQueryTestSuite.scala
@@ -335,7 +335,7 @@ class SQLQueryTestSuite extends QueryTest with SharedSparkSession with SQLHelper
 
       val configSets = configDims.values.foldLeft(Seq(Seq[(String, String)]())) { (res, dim) =>
         dim.flatMap { configSet => res.map(_ ++ configSet) }
-      }
+      } ++ Seq(Seq(("spark.sql.optimizer.excludedRules", "*")))
 
       configSets.foreach { configSet =>
         try {