[SPARK] Refactor deltaTable forName fix (delta-io#4710)

<!--
Thanks for sending a pull request!  Here are some tips for you:
1. If this is your first time, please read our contributor guidelines:
https://github.com/delta-io/delta/blob/master/CONTRIBUTING.md
2. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP]
Your PR title ...'.
  3. Be sure to keep the PR description updated to reflect all changes.
  4. Please write your PR title to summarize what this PR proposes.
5. If possible, provide a concise example to reproduce the issue for a
faster review.
6. If applicable, include the corresponding issue number in the PR title
and link it in the body.
-->

#### Which Delta project/connector is this regarding?
<!--
Please add the component selected below to the beginning of the pull
request title
For example: [Spark] Title of my pull request
-->

- [x] Spark
- [ ] Standalone
- [ ] Flink
- [ ] Kernel
- [ ] Other (fill in here)

## Description
Follow up PR for delta-io#4605, adding an
extra test and refactoring some parts of the previous PR. This PR
doesn't add any new functional changes.
<!--
- Describe what this PR changes.
- Describe why we need the change.
 
If this PR resolves an issue be sure to include "Resolves #XXX" to
correctly link and close the issue upon merge.
-->

## How was this patch tested?
UTs

<!--
If tests were added, say they were added here. Please make sure to test
the changes thoroughly including negative and positive cases if
possible.
If the changes were tested in any way other than unit tests, please
clarify how you tested step by step (ideally copy and paste-able, so
that other reviewers can test and check, and descendants can verify in
the future).
If the changes were not tested, please explain why.
-->

## Does this PR introduce _any_ user-facing changes?

<!--
If yes, please clarify the previous behavior and the change this PR
proposes - provide the console output, description and/or an example to
show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change
compared to the released Delta Lake versions or within the unreleased
branches such as master.
If no, write 'No'.
-->

---------

Co-authored-by: Omar Elhadidy <[email protected]>

Author: Omar-Saleh

spark/src/main/scala/org/apache/spark/sql/delta/catalog/CatalogResolver.scala

@@ -16,8 +16,7 @@
 
 package org.apache.spark.sql.delta.catalog
 
-import org.apache.spark.sql.delta.{DeltaErrors, DeltaTableIdentifier}
-import org.apache.spark.sql.delta.sources.DeltaSourceUtils
+import org.apache.spark.sql.delta.{DeltaErrors, DeltaTableIdentifier, DeltaTableUtils}
 import org.apache.hadoop.fs.Path
 
 import org.apache.spark.sql.SparkSession
@@ -27,15 +26,25 @@ import org.apache.spark.sql.connector.catalog.CatalogV2Implicits.CatalogHelper
 import org.apache.spark.sql.connector.catalog.CatalogV2Implicits.MultipartIdentifierHelper
 
 /**
- * Helper object for resolving tables using a *non-session* catalog.
+ * Helper object for resolving Delta tables using a *non-session* catalog.
  */
 object CatalogResolver {
-  private def asDeltaTable(spark: SparkSession, table: Table): DeltaTableV2 = table match {
-    case v2: DeltaTableV2 => v2
-    case v1: V1Table if DeltaSourceUtils.isDeltaTable(v1.v1Table.provider) =>
-      DeltaTableV2(spark, new Path(v1.v1Table.location), Some(v1.v1Table))
-    case _ => throw DeltaErrors.notADeltaTableException(
-      DeltaTableIdentifier(table = Some(TableIdentifier(table.name()))))
+  def getDeltaTableFromCatalog(
+      spark: SparkSession,
+      catalog: CatalogPlugin,
+      ident: Identifier): DeltaTableV2 = {
+    catalog.asTableCatalog.loadTable(ident) match {
+      case v2: DeltaTableV2 => v2
+      case v1: V1Table if DeltaTableUtils.isDeltaTable(v1.v1Table) =>
+        DeltaTableV2(
+          spark,
+          path = new Path(v1.v1Table.location),
+          catalogTable = Some(v1.v1Table),
+          tableIdentifier = Some(ident.toString)
+        )
+      case table => throw DeltaErrors.notADeltaTableException(
+        DeltaTableIdentifier(table = Some(TableIdentifier(table.name()))))
+    }
   }
 
   /**
@@ -46,20 +55,6 @@ object CatalogResolver {
       spark: SparkSession,
       catalog: String,
       ident: Seq[String]): (CatalogPlugin, Identifier) = {
-    (spark.sessionState.catalogManager.catalog(catalog),
-      MultipartIdentifierHelper(ident).asIdentifier)
-  }
-
-  def getDeltaTableFromCatalog(
-      spark: SparkSession,
-      catalog: CatalogPlugin,
-      ident: Identifier): DeltaTableV2 = {
-    val tblCatalog = catalog.asTableCatalog
-    if (tblCatalog.tableExists(ident)) {
-      asDeltaTable(spark, tblCatalog.loadTable(ident))
-    } else {
-      throw DeltaErrors.nonExistentDeltaTable(
-        DeltaTableIdentifier(table = Some(TableIdentifier(ident.name()))))
-    }
+    (spark.sessionState.catalogManager.catalog(catalog), ident.asIdentifier)
   }
 }

spark/src/test/scala/io/delta/tables/DeltaTableForNameSuite.scala

@@ -82,7 +82,7 @@ class DeltaTableForNameSuite extends QueryTest
   }
 
   private def getTablePath(tableName: String): Path = {
-    new Path(FileUtils.getTempDirectory.toString + "/DeltaTableForNameSuite/" + tableName)
+    new Path(DummyCatalogWithNamespace.catalogDir + s"/$tableName")
   }
 
   private def setUpTable(catalog: String, schema: String, table: String): Unit = {
@@ -167,4 +167,12 @@ class DeltaTableForNameSuite extends QueryTest
     checkError(exception = e, "DELTA_MISSING_DELTA_TABLE",
       parameters = Map("tableName" -> s"`$nonSessionCatalogNonDefaultSchema`.`$commonTblName`"))
   }
+
+  test("forName fails with fully qualified non existent table") {
+    val e = intercept[AnalysisException] {
+      DeltaTable.forName(spark, s"$catalogName.$defaultSchema.invalid_table")
+    }
+    checkError(exception = e, "TABLE_OR_VIEW_NOT_FOUND",
+      parameters = Map("relationName" -> s"`$catalogName`.`$defaultSchema`.`invalid_table`"))
+  }
 }

spark/src/test/scala/org/apache/spark/sql/delta/test/CustomCatalogs.scala

@@ -194,8 +194,7 @@ class DummyCatalogWithNamespace extends DummyCatalog with SupportsNamespaces {
   // To load a catalog into spark CatalogPlugin calls the Catalog's no-arg constructor and
   // then Catalog.initialize. To have a consistent state across different invocations
   // in the same test, this catalog impl uses a hard coded path.
-  override lazy val tempDir: Path = new Path(
-    FileUtils.getTempDirectory.toString + "/DeltaTableForNameSuite")
+  override lazy val tempDir: Path = DummyCatalogWithNamespace.catalogDir
   // scalastyle:off deltahadoopconfiguration
   override lazy val fs: FileSystem =
     tempDir.getFileSystem(spark.sessionState.newHadoopConf())
@@ -308,3 +307,7 @@ class DummyCatalogWithNamespace extends DummyCatalog with SupportsNamespaces {
     new util.HashMap[String, String]()
   }
 }
+
+object DummyCatalogWithNamespace {
+  val catalogDir: Path = new Path(Utils.createTempDir().getAbsolutePath)
+}