initial checkin

Author: imback82

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

@@ -748,6 +748,8 @@ class Analyzer(
    * [[ResolveRelations]] still resolves v1 tables.
    */
   object ResolveTables extends Rule[LogicalPlan] {
+    import org.apache.spark.sql.connector.catalog.CatalogV2Implicits._
+
     def apply(plan: LogicalPlan): LogicalPlan = ResolveTempViews(plan).resolveOperatorsUp {
       case u: UnresolvedRelation =>
         lookupV2Relation(u.multipartIdentifier)
@@ -759,22 +761,29 @@ class Analyzer(
           .getOrElse(i)
 
       case desc @ DescribeTable(u: UnresolvedV2Relation, _) =>
-        CatalogV2Util.loadRelation(u.catalog, u.tableName)
-            .map(rel => desc.copy(table = rel))
-            .getOrElse(desc)
+        resolveV2Relation(u).map(rel => desc.copy(table = rel)).getOrElse(desc)
 
       case alter @ AlterTable(_, _, u: UnresolvedV2Relation, _) =>
-        CatalogV2Util.loadRelation(u.catalog, u.tableName)
-            .map(rel => alter.copy(table = rel))
-            .getOrElse(alter)
+        resolveV2Relation(u).map(rel => alter.copy(table = rel)).getOrElse(alter)
 
       case show @ ShowTableProperties(u: UnresolvedV2Relation, _) =>
-        CatalogV2Util.loadRelation(u.catalog, u.tableName)
-          .map(rel => show.copy(table = rel))
-          .getOrElse(show)
+        resolveV2Relation(u).map(rel => show.copy(table = rel)).getOrElse(show)
 
       case u: UnresolvedV2Relation =>
-        CatalogV2Util.loadRelation(u.catalog, u.tableName).getOrElse(u)
+        resolveV2Relation(u).getOrElse(u)
+    }
+
+    private def resolveV2Relation(unresolved: UnresolvedV2Relation) : Option[NamedRelation] = {
+      val maybeTempView = unresolved.originalNameParts match {
+        case Seq(part) => v1SessionCatalog.lookupTempView(part)
+        case _ => None
+      }
+      if (maybeTempView.isDefined) {
+        throw new AnalysisException(
+          s"A temp view '${unresolved.originalNameParts.quoted}' cannot be handled by V2 commands.")
+      }
+
+      CatalogV2Util.loadRelation(unresolved.catalog, unresolved.tableName)
     }
 
     /**

sql/core/src/test/scala/org/apache/spark/sql/connector/TableResolutionSuite.scala

@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.connector
+
+import org.scalatest.BeforeAndAfter
+
+import org.apache.spark.sql.{AnalysisException, QueryTest}
+import org.apache.spark.sql.test.SharedSparkSession
+
+class TableResolutionSuite extends QueryTest with SharedSparkSession with BeforeAndAfter{
+
+  before {
+    spark.conf.set("spark.sql.catalog.testcat", classOf[InMemoryTableCatalog].getName)
+  }
+
+  after {
+    spark.sessionState.catalog.reset()
+    spark.sessionState.catalogManager.reset()
+    spark.sessionState.conf.clear()
+  }
+
+  test("V2 commands should look up temp view first") {
+    val tbl = "t"
+    val commands = Seq(
+      s"DESCRIBE $tbl",
+      s"SHOW TBLPROPERTIES $tbl",
+      s"ALTER TABLE $tbl ADD COLUMN data string"
+    )
+
+    withTempView(s"$tbl") {
+      withTable(s"testcat.ns.$tbl") {
+        sql(s"CREATE TEMPORARY VIEW $tbl AS SELECT 1 AS i")
+        sql(s"CREATE TABLE testcat.ns.$tbl USING csv AS SELECT 2 AS i")
+        sql("USE testcat.ns")
+
+        commands.foreach { command =>
+          val ex = intercept[AnalysisException] {
+            sql(command)
+          }
+          assert(ex.getMessage.contains("A temp view 't' cannot be handled"))
+        }
+      }
+    }
+  }
+}