HIVE-29241: Distinguish the default location of the database by catalog

zhangbutao · zhangbutao · commit 0a57566d5ee1 · 2026-04-12T20:02:11.000+08:00
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ddl/catalog/create/CreateCatalogAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/ddl/catalog/create/CreateCatalogAnalyzer.java
@@ -50,7 +50,7 @@ public void analyzeInternal(ASTNode root) throws SemanticException {
     String locationUrl = null;
     boolean ifNotExists = false;
     String comment = null;
-    Map<String, String> props = null;
+    Map<String, String> props = new HashMap<>();
 
     for (int i = 1; i < root.getChildCount(); i++) {
       ASTNode childNode = (ASTNode) root.getChild(i);
@@ -73,10 +73,7 @@ public void analyzeInternal(ASTNode root) throws SemanticException {
       }
     }
 
-    // Initialize props if null, and set default type to native if not specified
-    if (props == null) {
-      props = new HashMap<>();
-    }
+    // Set default type to hive if not specified
     checkCatalogType(props);
 
     CreateCatalogDesc desc = new CreateCatalogDesc(catalogName, comment, locationUrl, ifNotExists, props);
@@ -87,15 +84,10 @@ public void analyzeInternal(ASTNode root) throws SemanticException {
   }
 
   private static void checkCatalogType(Map<String, String> props) throws SemanticException {
-    String catalogType = props.get("type");
-    // Set default type to native if not specified
-    if (Strings.isNullOrEmpty(catalogType)) {
-      props.put("type", CatalogUtil.NATIVE);
-      return;
-    }
+    String catalogType = props.get(CatalogUtil.TYPE);
     // Normalize and validate catalog type (fail fast on invalid input)
     try {
-      props.put("type", CatalogUtil.normalizeCatalogType(catalogType));
+      props.put(CatalogUtil.TYPE, CatalogUtil.normalizeCatalogType(catalogType));
     } catch (IllegalArgumentException e) {
       throw new SemanticException(String.format("type '%s' is not valid", catalogType));
     }
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/create/CreateDatabaseOperation.java b/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/create/CreateDatabaseOperation.java
@@ -31,6 +31,7 @@
 import org.apache.hadoop.hive.ql.ddl.DDLOperationContext;
 import org.apache.hadoop.hive.ql.exec.Utilities;
 import org.apache.hadoop.hive.ql.metadata.HiveException;
+import org.apache.hadoop.hive.ql.metadata.HiveUtils;
 import org.apache.hadoop.hive.ql.session.SessionState;
 
 /**
@@ -83,7 +84,7 @@ public int execute() throws HiveException {
   private void makeLocationQualified(Database database) throws HiveException {
     String catalogName = database.getCatalogName().toLowerCase();
     String dbName = database.getName().toLowerCase();
-    boolean isDefaultCatalog = Warehouse.DEFAULT_CATALOG_NAME.equalsIgnoreCase(catalogName);
+    boolean isDefaultCatalog = HiveUtils.isDefaultCatalog(catalogName, context.getConf());
 
     // -------- External location --------
     if (database.isSetLocationUri()) {
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveUtils.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveUtils.java
@@ -553,4 +553,8 @@ public static String getCurrentCatalogOrDefault(Configuration conf) {
             .map(SessionState::getCurrentCatalog)
             .orElseGet(() -> getDefaultCatalog(conf));
   }
+
+  public static boolean isDefaultCatalog(String catName, Configuration conf) {
+    return catName == null || catName.isEmpty() || getDefaultCatalog(conf).equals(catName);
+  }
 }
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/SessionHiveMetaStoreClient.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/SessionHiveMetaStoreClient.java
@@ -181,7 +181,7 @@ private Warehouse getWh() throws MetaException {
   }
 
   private boolean isDefaultCatalog(String catName) {
-    return catName == null || catName.isEmpty() || getDefaultCatalog(conf).equals(catName);
+    return HiveUtils.isDefaultCatalog(catName, conf);
   }
 
   /**
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/EximUtil.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/EximUtil.java
@@ -40,6 +40,7 @@
 import org.apache.hadoop.hive.ql.hooks.WriteEntity;
 import org.apache.hadoop.hive.ql.metadata.Hive;
 import org.apache.hadoop.hive.ql.metadata.HiveException;
+import org.apache.hadoop.hive.ql.metadata.HiveUtils;
 import org.apache.hadoop.hive.ql.metadata.Partition;
 import org.apache.hadoop.hive.ql.metadata.Table;
 import org.apache.hadoop.hive.ql.parse.repl.DumpType;
@@ -391,7 +392,7 @@ private static void updateIfCustomDbLocations(Database database, Configuration c
     try {
       String catName = database.getCatalogName();
       String dbName = database.getName().toLowerCase();
-      boolean isDefaultCatalog = Warehouse.DEFAULT_CATALOG_NAME.equals(catName);
+      boolean isDefaultCatalog = HiveUtils.isDefaultCatalog(catName, conf);
 
       // external warehouse root
       String whLocation = MetastoreConf.getVar(conf,
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/queryhistory/repository/AbstractRepository.java b/ql/src/java/org/apache/hadoop/hive/ql/queryhistory/repository/AbstractRepository.java
@@ -85,13 +85,12 @@ protected Database initDatabase(Hive hive) {
       db = hive.getDatabase(QUERY_HISTORY_DB_NAME);
       if (db == null) {
         LOG.warn("Database ({}) for query history table hasn't been found, auto-creating one", QUERY_HISTORY_DB_NAME);
-        db = new Database();
-        // TODO catalog. The Hive Query History functionality is currently limited to the default catalog.
+        // TODO catalog. The Hive Query History functionality is currently limited to the default catalog. Depend on HIVE-29561
+        db = new Database(QUERY_HISTORY_DB_NAME, QUERY_HISTORY_DB_COMMENT,
+            null, null);
         db.setCatalogName(getDefaultCatalog(conf));
-        db.setName(QUERY_HISTORY_DB_NAME);
         String location = getDatabaseLocation(db);
-        db = new Database(QUERY_HISTORY_DB_NAME, QUERY_HISTORY_DB_COMMENT,
-            location, null);
+        db.setLocationUri(location);
         hive.createDatabase(db, false);
       }
       return db;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/StorageBasedAuthorizationProvider.java b/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/StorageBasedAuthorizationProvider.java
@@ -133,7 +133,7 @@ public void authorizeDbLevelOperations(Privilege[] readRequiredPriv, Privilege[]
     try {
       initWh();
       // TODO catalog. Need to determine auth root path based on catalog name.
-      //  Not sure how to get catalog name yet. Use getWhRoot(String) instead.
+      //  If the catalog name is available, use `wh.getWhRoot(catName)` to obtain the auth path. Depend on HIVE-29562
       root = wh.getWhRoot();
       // When we have some path in outputs, we should check access on that path, usually happens when
       // we have HiveOperation.CREATEDATABASE query with some location
diff --git a/ql/src/test/queries/clientnegative/lockneg_try_lock_cat_db_in_use.q b/ql/src/test/queries/clientnegative/lockneg_try_lock_cat_db_in_use.q
@@ -1,7 +1,7 @@
 set hive.lock.numretries=0;
 set hive.support.concurrency=true;
 
-CREATE CATALOG testcat LOCATION '/tmp/testcat' COMMENT 'Hive test catalog' PROPERTIES('type'='native');
+CREATE CATALOG testcat LOCATION '/tmp/testcat' COMMENT 'Hive test catalog';
 create database testcat.lockneg9;
 
 lock database testcat.lockneg9 shared;
diff --git a/ql/src/test/queries/clientpositive/catalog.q b/ql/src/test/queries/clientpositive/catalog.q
@@ -8,21 +8,21 @@ dfs -mkdir -p hdfs:///tmp/test_cat;
 SHOW CATALOGS;
 
 -- CREATE with comment and default location
-CREATE CATALOG test_cat COMMENT 'Hive test catalog' PROPERTIES('type'='NATIVE');
+CREATE CATALOG test_cat COMMENT 'Hive test catalog';
 
 -- DESCRIBE
 DESC CATALOG test_cat;
 
 -- CREATE INE already exists
-CREATE CATALOG IF NOT EXISTS test_cat LOCATION 'hdfs:///tmp/test_cat' PROPERTIES('type'='native');
+CREATE CATALOG IF NOT EXISTS test_cat LOCATION 'hdfs:///tmp/test_cat';
 SHOW CATALOGS;
 
 -- DROP
 DROP CATALOG test_cat;
 SHOW CATALOGS;
 
 -- CREATE INE doesn't exist
-CREATE CATALOG IF NOT EXISTS test_cat LOCATION 'hdfs:///tmp/test_cat' COMMENT 'Hive test catalog' PROPERTIES('type'='native');
+CREATE CATALOG IF NOT EXISTS test_cat LOCATION 'hdfs:///tmp/test_cat' COMMENT 'Hive test catalog' PROPERTIES('type'='hive');
 SHOW CATALOGS;
 
 -- DROP IE exists
@@ -33,7 +33,7 @@ SHOW CATALOGS;
 DROP CATALOG IF EXISTS test_cat;
 
 -- SHOW
-CREATE CATALOG test_cat LOCATION 'hdfs:///tmp/test_cat' COMMENT 'Hive test catalog' PROPERTIES('type'='native');
+CREATE CATALOG test_cat LOCATION 'hdfs:///tmp/test_cat' COMMENT 'Hive test catalog' PROPERTIES('type'='hive');
 SHOW CATALOGS;
 
 -- SHOW pattern
diff --git a/ql/src/test/results/clientpositive/llap/catalog.q.out b/ql/src/test/results/clientpositive/llap/catalog.q.out
@@ -3,10 +3,10 @@ PREHOOK: type: SHOWCATALOGS
 POSTHOOK: query: SHOW CATALOGS
 POSTHOOK: type: SHOWCATALOGS
 hive
-PREHOOK: query: CREATE CATALOG test_cat COMMENT 'Hive test catalog' PROPERTIES('type'='NATIVE')
+PREHOOK: query: CREATE CATALOG test_cat COMMENT 'Hive test catalog'
 PREHOOK: type: CREATECATALOG
 PREHOOK: Output: catalog:test_cat
-POSTHOOK: query: CREATE CATALOG test_cat COMMENT 'Hive test catalog' PROPERTIES('type'='NATIVE')
+POSTHOOK: query: CREATE CATALOG test_cat COMMENT 'Hive test catalog'
 POSTHOOK: type: CREATECATALOG
 POSTHOOK: Output: catalog:test_cat
 PREHOOK: query: DESC CATALOG test_cat
diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/CatalogUtil.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/CatalogUtil.java
@@ -18,27 +18,25 @@
 
 package org.apache.hadoop.hive.metastore;
 
+import com.google.common.base.Strings;
+
 public class CatalogUtil {
-    // Catalog type constants
-    public static final String NATIVE = "native";
-    public static final String ICEBERG = "iceberg";
+    public static final String TYPE = "type";
 
+    // Supported Catalog types
     public enum CatalogType {
-        NATIVE,
+        HIVE,
         ICEBERG
     }
 
     /**
-     * Check if the given catalog type name is valid.
-     * @param name catalog type name (case-insensitive)
+     * Check if the given catalog type is valid.
+     * @param type catalog type (case-insensitive)
      * @return true if valid, false otherwise
      */
-    public static boolean isValidCatalogType(String name) {
-        if (name == null || name.trim().isEmpty()) {
-            return false;
-        }
+    public static boolean isValidCatalogType(String type) {
         try {
-            CatalogType.valueOf(name.toUpperCase().trim());
+            CatalogType.valueOf(type.toUpperCase().trim());
             return true;
         } catch (IllegalArgumentException e) {
             return false;
@@ -47,18 +45,19 @@ public static boolean isValidCatalogType(String name) {
 
     /**
      * Normalize catalog type to standard lowercase format.
-     * @param name catalog type name (case-insensitive)
+     * @param type catalog type (case-insensitive)
      * @return normalized catalog type in lowercase
      * @throws IllegalArgumentException if the catalog type is null, empty, or invalid
      */
-    public static String normalizeCatalogType(String name) {
-        if (name == null || name.trim().isEmpty()) {
-            throw new IllegalArgumentException("Catalog type cannot be null or empty");
+    public static String normalizeCatalogType(String type) {
+        if (Strings.isNullOrEmpty(type)) {
+            // Set default type to hive if not specified
+            return CatalogType.HIVE.name();
         }
-        if (!isValidCatalogType(name)) {
-            throw new IllegalArgumentException("Invalid catalog type: " + name);
+        if (!isValidCatalogType(type)) {
+            throw new IllegalArgumentException("Invalid catalog type: " + type);
         }
-        return name.trim().toLowerCase();
+        return type.trim().toLowerCase();
     }
 }
 
diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/ReplChangeManager.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/ReplChangeManager.java
@@ -632,7 +632,7 @@ private static void setCmRootPermissions(Path cmroot) throws IOException{
     cmFs.setPermission(cmroot, new FsPermission("770"));
     try {
       // TODO catalog. The Repl function is currently only available for the default catalog path ConfVars.WAREHOUSE.
-      //  We may consider adding new created native catalog path (ConfVars.WAREHOUSE_CATALOG) later.
+      //  We may consider adding new created native catalog path (ConfVars.WAREHOUSE_CATALOG) later. Depend on HIVE-29278.
       FileStatus warehouseStatus = cmFs.getFileStatus(new Path(MetastoreConf.get(conf, ConfVars.WAREHOUSE.getVarname())));
       String warehouseOwner = warehouseStatus.getOwner();
       String warehouseGroup = warehouseStatus.getGroup();
diff --git a/standalone-metastore/metastore-rest-catalog/src/main/java/org/apache/iceberg/rest/HMSCatalogFactory.java b/standalone-metastore/metastore-rest-catalog/src/main/java/org/apache/iceberg/rest/HMSCatalogFactory.java
@@ -79,7 +79,10 @@ private Catalog createCatalog() {
     if (configUri != null && !configUri.isEmpty()) {
       properties.put("uri", configUri);
     }
-    // TODO catalog. Consider adding new created native catalog warehouse(MetastoreConf.ConfVars.WAREHOUSE_CATALOG) later.
+    // TODO catalog. Currently, `configWarehouse` is determined by the path of the default catalog. We need to consider whether,
+    //  in the case of a non-default catalog, `configWarehouse` should be determined by the specific catalog path instead.
+    //  Need to consider adding new created native/internal catalog warehouse(MetastoreConf.ConfVars.WAREHOUSE_CATALOG) later.
+    //  Create HIVE-28879 to track this issue.
     final String configWarehouse = MetastoreConf.getVar(configuration, MetastoreConf.ConfVars.WAREHOUSE);
     if (configWarehouse != null) {
       properties.put("warehouse", configWarehouse);
diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java
@@ -720,14 +720,10 @@ private void ensureCatalogType(Catalog cat) throws MetaException {
     }
 
     String catalogType = parameters.get("type");
-    if (catalogType == null || catalogType.trim().isEmpty()) {
-      parameters.put("type", CatalogUtil.NATIVE);
-    } else {
-      try {
-        parameters.put("type", CatalogUtil.normalizeCatalogType(catalogType));
-      } catch (IllegalArgumentException e) {
-        throw new MetaException("Invalid catalog type: " + catalogType);
-      }
+    try {
+      parameters.put("type", CatalogUtil.normalizeCatalogType(catalogType));
+    } catch (IllegalArgumentException e) {
+      throw new MetaException("Invalid catalog type: " + catalogType);
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -553,4 +553,8 @@ public static String getCurrentCatalogOrDefault(Configuration conf) {`
`553`	`553`	`.map(SessionState::getCurrentCatalog)`
`554`	`554`	`.orElseGet(() -> getDefaultCatalog(conf));`
`555`	`555`	`}`
	`556`	`+`
	`557`	`+ public static boolean isDefaultCatalog(String catName, Configuration conf) {`
	`558`	`+ return catName == null \|\| catName.isEmpty() \|\| getDefaultCatalog(conf).equals(catName);`
	`559`	`+ }`
`556`	`560`	`}`
Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ private Warehouse getWh() throws MetaException {`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`private boolean isDefaultCatalog(String catName) {`
`184`		`- return catName == null \|\| catName.isEmpty() \|\| getDefaultCatalog(conf).equals(catName);`
	`184`	`+ return HiveUtils.isDefaultCatalog(catName, conf);`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`/**`