Fix Copilot comments

Author: zhangbutao

common/src/java/org/apache/hadoop/hive/conf/HiveConf.java

@@ -928,7 +928,7 @@ public static enum ConfVars {
 
     HIVE_METASTORE_CATALOG_WAREHOUSE_EXTERNAL("hive.metastore.warehouse.catalog.external.dir", null,
             "Default location for external tables created in the warehouse. " +
-                    "If not set or null, then the normal warehouse location(MetastoreConf.METASTORE_CATALOG_WAREHOUSE)" +
+                    "If not set or null, then the normal warehouse location (MetastoreConf.METASTORE_CATALOG_WAREHOUSE) " +
                     "will be used as the default location."),
 
     /**

ql/src/java/org/apache/hadoop/hive/ql/parse/EximUtil.java

@@ -393,10 +393,9 @@ private static void updateIfCustomDbLocations(Database database, Configuration c
       String whLocation = MetastoreConf.getVar(conf,
               isDefaultCatalog ? MetastoreConf.ConfVars.WAREHOUSE_EXTERNAL : MetastoreConf.ConfVars.WAREHOUSE_CATALOG_EXTERNAL,
               MetastoreConf.getVar(conf,
-                      isDefaultCatalog ? MetastoreConf.ConfVars.WAREHOUSE : MetastoreConf.ConfVars.WAREHOUSE_CATALOG
-              )
-      );
+                      isDefaultCatalog ? MetastoreConf.ConfVars.WAREHOUSE : MetastoreConf.ConfVars.WAREHOUSE_CATALOG));
 
+      whLocation  = isDefaultCatalog ? whLocation : whLocation + "/" + database.getCatalogName();
       Path dbDerivedLoc = new Path(whLocation, database.getName().toLowerCase() + DATABASE_PATH_SUFFIX);
       String defaultDbLoc = Utilities.getQualifiedPath((HiveConf) conf, dbDerivedLoc);
       database.putToParameters(ReplConst.REPL_IS_CUSTOM_DB_LOC,

ql/src/java/org/apache/hadoop/hive/ql/queryhistory/repository/AbstractRepository.java

@@ -28,6 +28,7 @@
 import org.apache.hadoop.hive.ql.QueryState;
 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.Table;
 import org.apache.hadoop.hive.ql.parse.PartitionTransform;
 import org.apache.hadoop.hive.ql.parse.TransformSpec;
@@ -40,6 +41,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.getDefaultCatalog;
+
 public abstract class AbstractRepository implements QueryHistoryRepository {
   protected Logger LOG = LoggerFactory.getLogger(getClass());
   @VisibleForTesting
@@ -82,7 +85,11 @@ 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);
-        String location = getDatabaseLocation(db);
+        db = new Database();
+        // TODO catalog. The Hive Query History functionality is currently limited to the default catalog.
+        db.setCatalogName(getDefaultCatalog(conf));
+        db.setName(QUERY_HISTORY_DB_NAME);
+        String location = getDatabaseLocation(new Database());
         db = new Database(QUERY_HISTORY_DB_NAME, QUERY_HISTORY_DB_COMMENT,
             location, null);
         hive.createDatabase(db, false);

standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/CatalogUtil.java

@@ -29,11 +29,13 @@ public enum CatalogType {
         ICEBERG
     }
 
-    public static final Set<CatalogType> VALID_CATALOG_TYPES = EnumSet.of(CatalogType.NATIVE, CatalogType.ICEBERG);
-
     public static boolean isValidCatalogType(String name) {
-        CatalogType type = EnumUtils.getEnumIgnoreCase(CatalogType.class, name);
-        return type != null && VALID_CATALOG_TYPES.contains(type);
+        try {
+            CatalogType.valueOf(name.toUpperCase());
+            return true;
+        } catch (IllegalArgumentException e) {
+            return false;
+        }
     }
 }
 

standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/Warehouse.java

@@ -56,7 +56,6 @@
 import org.apache.hadoop.hive.metastore.api.Partition;
 import org.apache.hadoop.hive.metastore.api.StorageDescriptor;
 import org.apache.hadoop.hive.metastore.api.Table;
-import org.stringtemplate.v4.ST;
 
 import static org.apache.hadoop.hive.common.AcidConstants.SOFT_DELETE_TABLE_PATTERN;
 import static org.apache.hadoop.hive.common.AcidConstants.SOFT_DELETE_PATH_SUFFIX;
@@ -203,7 +202,7 @@ public Path getWhRootExternal() throws MetaException {
   }
 
   public Path getWhRootExternal(String catalogName) throws MetaException {
-    boolean isDefault = DEFAULT_CATALOG_NAME.equals(catalogName);
+    boolean isDefault = DEFAULT_CATALOG_NAME.equals(catalogName.trim());
 
     Path rootExDir = isDefault ? whRootExternal : whCatRootExternal;
     if (rootExDir != null) {

standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java

@@ -1790,7 +1790,7 @@ public enum ConfVars {
     WAREHOUSE_CATALOG_EXTERNAL("metastore.warehouse.catalog.external.dir",
             "hive.metastore.warehouse.catalog.external.dir", "",
             "Default location for external tables created in the warehouse. " +
-                    "If not set or null, then the normal warehouse location(MetastoreConf.WAREHOUSE_CATALOG) " +
+                    "If not set or null, then the normal warehouse location (MetastoreConf.WAREHOUSE_CATALOG) " +
                     "will be used as the default location."),
     WM_DEFAULT_POOL_SIZE("metastore.wm.default.pool.size",
         "hive.metastore.wm.default.pool.size", 4,