Optimising the 'database' capture logic

apache · Jul 18, 2024 · c1a0921 · c1a0921
1 parent 69fb0bc
commit c1a0921
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/...ark-authz/src/main/scala/org/apache/kyuubi/plugin/spark/authz/serde/tableExtractors.scala b/...ark-authz/src/main/scala/org/apache/kyuubi/plugin/spark/authz/serde/tableExtractors.scala
@@ -196,20 +196,17 @@ class DataSourceV2RelationTableExtractor extends TableExtractor {
             !isPathIdentifier(v2Relation.identifier.get.name(), spark) =>
         val maybeCatalog = v2Relation.catalog.flatMap(catalogPlugin =>
           lookupExtractor[CatalogPluginCatalogExtractor].apply(catalogPlugin))
-
-        val identifierDatabase = {
-          val maybeIdentifier = invokeAs[Option[AnyRef]](v2Relation, "identifier")
-          maybeIdentifier.flatMap { id =>
-            lookupExtractor[IdentifierTableExtractor].apply(spark, id)
-          } match {
-            case Some(value) => value.database
-            case _ => None
-          }
-        }
         lookupExtractor[TableTableExtractor].apply(spark, v2Relation.table)
           .map { table =>
             val maybeOwner = TableExtractor.getOwner(v2Relation)
-            val maybeDatabase = table.database.orElse(identifierDatabase)
+            val maybeDatabase: Option[String] = table.database match {
+              case Some(x) => Some(x)
+              case None =>
+                val maybeIdentifier = invokeAs[Option[AnyRef]](v2Relation, "identifier")
+                maybeIdentifier.flatMap { id =>
+                  lookupExtractor[IdentifierTableExtractor].apply(spark, id)
+                }.flatMap(table => table.database)
+            }
             table.copy(catalog = maybeCatalog, database = maybeDatabase, owner = maybeOwner)
           }
       case _ => None