Merged upstream

Author: wangyum

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala

@@ -859,6 +859,8 @@ class Analyzer(override val catalogManager: CatalogManager)
         s.copy(namespace = ResolvedNamespace(currentCatalog, catalogManager.currentNamespace))
       case s @ ShowViews(UnresolvedNamespace(Seq()), _, _) =>
         s.copy(namespace = ResolvedNamespace(currentCatalog, catalogManager.currentNamespace))
+      case a @ AnalyzeTables(UnresolvedNamespace(Seq()), _) =>
+        a.copy(namespace = ResolvedNamespace(currentCatalog, catalogManager.currentNamespace))
       case UnresolvedNamespace(Seq()) =>
         ResolvedNamespace(currentCatalog, Seq.empty[String])
       case UnresolvedNamespace(CatalogAndNamespace(catalog, ns)) =>

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala

@@ -3669,7 +3669,7 @@ class AstBuilder extends SqlBaseBaseVisitor[AnyRef] with SQLConfHelper with Logg
     }
     val multiPart = Option(ctx.multipartIdentifier).map(visitMultipartIdentifier)
     AnalyzeTables(
-      UnresolvedNamespace(multiPart.getOrElse(Nil)),
+      UnresolvedNamespace(multiPart.getOrElse(Seq.empty[String])),
       noScan = ctx.identifier != null)
   }
 

sql/core/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveSessionCatalog.scala

@@ -373,11 +373,8 @@ class ResolveSessionCatalog(val catalogManager: CatalogManager)
         AnalyzePartitionCommand(ident.asTableIdentifier, partitionSpec, noScan)
       }
 
-    case AnalyzeTables(SessionCatalogAndNamespace(_, ns), noScan) =>
-      if (ns.length > 1) {
-        throw new AnalysisException(s"The database name is not valid: ${ns.quoted}")
-      }
-      AnalyzeTablesCommand(ns.headOption, noScan)
+    case AnalyzeTables(DatabaseInSessionCatalog(db), noScan) =>
+      AnalyzeTablesCommand(Some(db), noScan)
 
     case AnalyzeColumn(ResolvedV1TableOrViewIdentifier(ident), columnNames, allColumns) =>
       AnalyzeColumnCommand(ident.asTableIdentifier, columnNames, allColumns)

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

@@ -691,31 +691,20 @@ class StatisticsCollectionSuite extends StatisticsCollectionTestBase with Shared
             sql("CREATE VIEW v1 AS SELECT 1 c1")
             sql("CREATE VIEW v2 AS SELECT 2 c2")
             sql("CACHE TABLE v1")
-            sql("CACHE TABLE v2")
-            sql("UNCACHE TABLE v1")
-            sql("UNCACHE TABLE v2")
             sql("CACHE LAZY TABLE v2")
 
             sql(s"ANALYZE TABLES IN $database COMPUTE STATISTICS NOSCAN")
             checkTableStats("t1", hasSizeInBytes = true, expectedRowCounts = None)
             checkTableStats("t2", hasSizeInBytes = true, expectedRowCounts = None)
             assert(getCatalogTable("v1").stats.isEmpty)
-            val stats11 = getTableStatsFromOptimizedPlan("v1")
-            assert(stats11.sizeInBytes > 0)
-            assert(stats11.rowCount === None)
-            val stats12 = getTableStatsFromOptimizedPlan("v2")
-            assert(stats12.sizeInBytes > 0)
-            assert(stats12.rowCount === None)
+            checkOptimizedPlanStats(spark.table("v1"), 4, Some(1), Seq.empty)
+            checkOptimizedPlanStats(spark.table("v2"), 1, None, Seq.empty)
 
             sql("ANALYZE TABLES COMPUTE STATISTICS")
             checkTableStats("t1", hasSizeInBytes = true, expectedRowCounts = Some(10))
             checkTableStats("t2", hasSizeInBytes = true, expectedRowCounts = Some(20))
-            val stats21 = getTableStatsFromOptimizedPlan("v1")
-            assert(stats21.sizeInBytes > 0)
-            assert(stats21.rowCount === None)
-            val stats22 = getTableStatsFromOptimizedPlan("v2")
-            assert(stats22.sizeInBytes > 0)
-            assert(stats22.rowCount === Some(1))
+            checkOptimizedPlanStats(spark.table("v1"), 4, Some(1), Seq.empty)
+            checkOptimizedPlanStats(spark.table("v2"), 4, Some(1), Seq.empty)
           }
         }
       }