Fix tests

imback82 · imback82 · commit e6e9061ea7da · 2021-04-01T23:42:31.000-07:00
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
@@ -3639,6 +3639,18 @@ class Analyzer(override val catalogManager: CatalogManager)
       }
     }
   }
+
+  /**
+   * A rule that calls `TransformationAfterAnalysis.transform` for a plan that needs to be
+   * transformed after all the analysis rules are run.
+   */
+  object TransformAfterAnalysis extends Rule[LogicalPlan] {
+    override def apply(plan: LogicalPlan): LogicalPlan = plan resolveOperators {
+      case t: TransformationAfterAnalysis if t.resolved =>
+        checkAnalysis(t)
+        t.transform
+    }
+  }
 }
 
 /**
@@ -3703,18 +3715,6 @@ object CleanupAliases extends Rule[LogicalPlan] with AliasHelper {
   }
 }
 
-/**
- * A rule that calls `TransformationAfterAnalysis.transform` for a plan that needs to be transformed
- * after all the analysis rules are run.
- */
-object TransformAfterAnalysis extends Rule[LogicalPlan] {
-  override def apply(plan: LogicalPlan): LogicalPlan = plan resolveOperators {
-    // Transform only if the plan is resolved so that unresolved plan will
-    // fail in checkAnalysis.
-    case t: TransformationAfterAnalysis if t.resolved => t.transform
-  }
-}
-
 /**
  * Ignore event time watermark in batch query, which is only supported in Structured Streaming.
  * TODO: add this rule into analyzer rule list.
diff --git a/sql/core/src/test/resources/sql-tests/results/explain-aqe.sql.out b/sql/core/src/test/resources/sql-tests/results/explain-aqe.sql.out
@@ -913,7 +913,7 @@ Execute CreateViewCommand (1)
 Output: []
 
 (2) CreateViewCommand
-Arguments: `default`.`explain_view`, SELECT key, val FROM explain_temp1, false, false, PersistedView
+Arguments: `default`.`explain_view`, SELECT key, val FROM explain_temp1, false, false, PersistedView, true
 
 (3) LogicalRelation
 Arguments: parquet, [key#x, val#x], CatalogTable(
diff --git a/sql/core/src/test/resources/sql-tests/results/explain.sql.out b/sql/core/src/test/resources/sql-tests/results/explain.sql.out
@@ -858,7 +858,7 @@ Execute CreateViewCommand (1)
 Output: []
 
 (2) CreateViewCommand
-Arguments: `default`.`explain_view`, SELECT key, val FROM explain_temp1, false, false, PersistedView
+Arguments: `default`.`explain_view`, SELECT key, val FROM explain_temp1, false, false, PersistedView, true
 
 (3) LogicalRelation
 Arguments: parquet, [key#x, val#x], CatalogTable(
