KSHC create database respects catalog-level warehouse

Author: maomaodev

extensions/spark/kyuubi-spark-connector-hive/src/main/scala/org/apache/kyuubi/spark/connector/hive/HiveTableCatalog.scala

@@ -492,22 +492,17 @@ class HiveTableCatalog(sparkSession: SparkSession)
    * Returns the default database path with catalog-level warehouse configuration precedence.
    *
    * This method resolves the database path using the following priority order:
-   *   1. Catalog-level `spark.sql.catalog.<catalog>.spark.sql.warehouse.dir`
-   *   2. Catalog-level `spark.sql.catalog.<catalog>.hive.metastore.warehouse.dir`
-   *   3. Global-level `spark.sql.warehouse.dir` (Underlying)
+   *   1. Catalog-level `spark.sql.catalog.<catalog>.hive.metastore.warehouse.dir`
+   *   2. Global-level `spark.sql.warehouse.dir` (Underlying)
    *
    * @param db database name
    * @return qualified URI path for the database
    */
   private def getCatalogDefaultDBPath(db: String): URI = {
     val defaultLocation = catalog.getDefaultDBPath(db)
-    val catalogSparkWarehouseDir = catalogOptions.get("spark.sql.warehouse.dir")
-    val catalogHiveWarehouseDir = catalogOptions.get("hive.metastore.warehouse.dir")
+    val catalogWarehouseDir = catalogOptions.get("hive.metastore.warehouse.dir")
 
-    val warehouseDir = Option(catalogSparkWarehouseDir).filter(_.nonEmpty)
-      .orElse(Option(catalogHiveWarehouseDir).filter(_.nonEmpty))
-
-    warehouseDir match {
+    Option(catalogWarehouseDir).filter(_.nonEmpty) match {
       case Some(dir) =>
         CatalogUtils.makeQualifiedDBObjectPath(defaultLocation, dir, hadoopConf)
       case None =>

extensions/spark/kyuubi-spark-connector-hive/src/test/scala/org/apache/kyuubi/spark/connector/hive/HiveCatalogSuite.scala

@@ -380,28 +380,26 @@ class HiveCatalogSuite extends KyuubiHiveTest {
   }
 
   test("createNamespace location: use catalog-level warehouse dir") {
-    Seq("spark.sql.warehouse.dir", "hive.metastore.warehouse.dir").foreach { warehouseKey =>
-      withTempDir { tmpDir =>
-        val customWarehouseDir = tmpDir.getCanonicalPath
-        val customCatalog = newCatalog(Map(warehouseKey -> customWarehouseDir))
-        val ns = Array("ns_custom_path")
-        try {
-          customCatalog.createNamespace(ns, emptyProps)
-          val location = customCatalog.loadNamespaceMetadata(ns)
-            .asScala(SupportsNamespaces.PROP_LOCATION)
-
-          val expectedUri =
-            makeQualifiedPathWithWarehouse(s"${ns.head}.db", customWarehouseDir, customCatalog)
-          assert(new URI(location) === expectedUri, s"Failed for warehouseKey=$warehouseKey")
-
-          val defaultUri = makeQualifiedPathWithWarehouse(
-            s"${ns.head}.db",
-            customCatalog.conf.warehousePath,
-            customCatalog)
-          assert(new URI(location) !== defaultUri, s"Failed for warehouseKey=$warehouseKey")
-        } finally {
-          customCatalog.dropNamespace(ns, cascade = true)
-        }
+    withTempDir { tmpDir =>
+      val customWarehouseDir = tmpDir.getCanonicalPath
+      val customCatalog = newCatalog(Map("hive.metastore.warehouse.dir" -> customWarehouseDir))
+      val ns = Array("ns_custom_path")
+      try {
+        customCatalog.createNamespace(ns, emptyProps)
+        val location = customCatalog.loadNamespaceMetadata(ns)
+          .asScala(SupportsNamespaces.PROP_LOCATION)
+
+        val expectedUri =
+          makeQualifiedPathWithWarehouse(s"${ns.head}.db", customWarehouseDir, customCatalog)
+        assert(new URI(location) === expectedUri)
+
+        val defaultUri = makeQualifiedPathWithWarehouse(
+          s"${ns.head}.db",
+          customCatalog.conf.warehousePath,
+          customCatalog)
+        assert(new URI(location) !== defaultUri)
+      } finally {
+        customCatalog.dropNamespace(ns, cascade = true)
       }
     }
   }