Address PR comments

Author: imback82

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

@@ -104,17 +104,7 @@ class ResolveCatalogs(val catalogManager: CatalogManager)
       if (isView) {
         throw new AnalysisException("Renaming view is not supported in v2 catalogs.")
       }
-      newNameParts match {
-        case NonSessionCatalog(newCatalog, newName) =>
-          if (catalog.name == newCatalog.name) {
-            RenameTable(catalog.asTableCatalog, oldName.asIdentifier, newName.asIdentifier)
-          } else {
-            throw new AnalysisException(
-              s"Cannot rename table in different catalogs: ${catalog.name} and ${newCatalog.name}")
-          }
-        case _ => throw new AnalysisException(
-          "Renaming table cannot be performed across the session and non-session catalogs.")
-      }
+      RenameTable(catalog.asTableCatalog, oldName.asIdentifier, newNameParts.asIdentifier)
 
     case DescribeTableStatement(
          nameParts @ NonSessionCatalog(catalog, tableName), partitionSpec, isExtended) =>

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

@@ -180,12 +180,7 @@ class ResolveSessionCatalog(
       AlterDatabaseSetLocationCommand(nameParts.head, location)
 
     case RenameTableStatement(SessionCatalog(_, oldName), newNameParts, isView) =>
-      newNameParts match {
-        case SessionCatalog(_, newName) =>
-          AlterTableRenameCommand(oldName.asTableIdentifier, newName.asTableIdentifier, isView)
-        case _ => throw new AnalysisException(
-          "Renaming table cannot be performed across the session and non-session catalogs.")
-      }
+      AlterTableRenameCommand(oldName.asTableIdentifier, newNameParts.asTableIdentifier, isView)
 
     case DescribeTableStatement(
          nameParts @ SessionCatalog(catalog, tableName), partitionSpec, isExtended) =>

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

@@ -1536,50 +1536,21 @@ class DataSourceV2SQLSuite
   }
 
   test("AlterTable: rename table basic test") {
-    val t1 = "testcat.ns1.ns2.old"
-    val t2 = "testcat.ns1.new"
-    withTable(t1, t2) {
-      sql(s"CREATE TABLE $t1 USING foo AS SELECT id, data FROM source")
+    withTable("testcat.ns1.new") {
+      sql(s"CREATE TABLE testcat.ns1.ns2.old USING foo AS SELECT id, data FROM source")
       checkAnswer(sql("SHOW TABLES FROM testcat.ns1.ns2"), Seq(Row("ns1.ns2", "old")))
 
-      sql(s"ALTER TABLE $t1 RENAME TO $t2")
+      sql(s"ALTER TABLE testcat.ns1.ns2.old RENAME TO ns1.new")
       checkAnswer(sql("SHOW TABLES FROM testcat.ns1.ns2"), Seq.empty)
       checkAnswer(sql("SHOW TABLES FROM testcat.ns1"), Seq(Row("ns1", "new")))
     }
   }
 
-  test("AlterTable: rename table fails when different v2 catalogs are used") {
-    val t1 = "testcat.ns1.ns2.t1"
-    val t2 = "testcat2.ns1.ns2.t2"
-    withTable(t1) {
-      sql(s"CREATE TABLE $t1 USING foo AS SELECT id, data FROM source")
-
-      val exception = intercept[AnalysisException] {
-        sql(s"ALTER TABLE $t1 RENAME TO $t2")
-      }
-      assert(exception.getMessage.contains(
-        "Cannot rename table in different catalogs: testcat and testcat2"))
-    }
-  }
-
-  test("AlterTable: rename table fails across session and non-session catalogs") {
-    val t1 = "t1"
-    val t2 = "testcat2.ns1.ns2.t2"
-    withTable(t1, t2) {
-      sql(s"CREATE TABLE $t1 USING csv AS SELECT id, data FROM source")
-      sql(s"CREATE TABLE $t2 USING foo AS SELECT id, data FROM source")
-
-      def assertFailure(oldTable: String, newTable: String) {
-        val exception = intercept[AnalysisException] {
-          sql(s"ALTER TABLE $oldTable RENAME TO $newTable")
-        }
-        assert(exception.getMessage.contains(
-          "Renaming table cannot be performed across the session and non-session catalogs."))
-      }
-
-      assertFailure(t1, t2) // session catalog to non-session catalog.
-      assertFailure(t2, t1) // non-session catalog to session catalog.
+  test("AlterTable: renaming views are not supported") {
+    val e = intercept[AnalysisException] {
+      sql(s"ALTER VIEW testcat.ns.tbl RENAME TO ns.view")
     }
+    assert(e.getMessage.contains("Renaming view is not supported in v2 catalogs"))
   }
 
   test("ANALYZE TABLE") {