Optimize use catalog.db pattern

zhangbutao · zhangbutao · commit 5a64e40f8c85 · 2025-09-25T10:47:14.000+08:00
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/use/SwitchDatabaseAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/use/SwitchDatabaseAnalyzer.java
@@ -47,7 +47,7 @@ public void analyzeInternal(ASTNode root) throws SemanticException {
     readEntity.noLockNeeded();
     inputs.add(readEntity);
 
-    SwitchDatabaseDesc desc = new SwitchDatabaseDesc(catDbNamePair.getRight());
+    SwitchDatabaseDesc desc = new SwitchDatabaseDesc(catDbNamePair.getLeft(), catDbNamePair.getRight());
     rootTasks.add(TaskFactory.get(new DDLWork(getInputs(), getOutputs(), desc)));
   }
 }
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/use/SwitchDatabaseDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/use/SwitchDatabaseDesc.java
@@ -31,14 +31,21 @@
 public class SwitchDatabaseDesc implements DDLDesc, Serializable {
   private static final long serialVersionUID = 1L;
 
+  private final String catalogName;
   private final String databaseName;
 
-  public SwitchDatabaseDesc(String databaseName) {
+  public SwitchDatabaseDesc(String catalogName, String databaseName) {
+    this.catalogName = catalogName;
     this.databaseName = databaseName;
   }
 
   @Explain(displayName = "name", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getDatabaseName() {
     return databaseName;
   }
+
+  @Explain(displayName = "catalogName", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
+  public String getCatalogName() {
+    return catalogName;
+  }
 }
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/use/SwitchDatabaseOperation.java b/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/use/SwitchDatabaseOperation.java
@@ -38,15 +38,21 @@ public SwitchDatabaseOperation(DDLOperationContext context, SwitchDatabaseDesc d
 
   @Override
   public int execute() throws HiveException {
+    String catName = desc.getCatalogName();
+    if (catName != null && context.getDb().getCatalog(catName) != null) {
+      SessionState.get().setCurrentCatalog(catName);
+    } else if (catName != null) {
+      throw new HiveException(ErrorMsg.CATALOG_NOT_EXISTS, catName);
+    }
     String dbName = desc.getDatabaseName();
-    if (!context.getDb().databaseExists(dbName)) {
+    if (!context.getDb().databaseExists(catName, dbName)) {
       throw new HiveException(ErrorMsg.DATABASE_NOT_EXISTS, dbName);
     }
 
     SessionState.get().setCurrentDatabase(dbName);
 
     // set database specific parameters
-    Database database = context.getDb().getDatabase(dbName);
+    Database database = context.getDb().getDatabase(catName, dbName);
     assert(database != null);
 
     Map<String, String> dbParams = database.getParameters();
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
@@ -2601,6 +2601,7 @@ public void alterCatalog(String catName, Catalog catalog) throws HiveException {
   }
 
   /**
+   * @deprecated please use {@link #databaseExists(String, String)}}
    * Query metadata to see if a database with the given name already exists.
    *
    * @param dbName
@@ -2612,6 +2613,19 @@ public boolean databaseExists(String dbName) throws HiveException {
     return getDatabase(dbName) != null;
   }
 
+  /**
+   * Query metadata to see if a database with the given name already exists.
+   *
+   * @param catName
+   * @param dbName
+   * @return true if a database with the given name already exists, false if
+   *         does not exist.
+   * @throws HiveException
+   */
+  public boolean databaseExists(String catName, String dbName) throws HiveException {
+    return getDatabase(catName, dbName) != null;
+  }
+
   /**
    * Get the database by name.
    * @param dbName the name of the database.
@@ -2622,7 +2636,7 @@ public Database getDatabase(String dbName) throws HiveException {
     PerfLogger perfLogger = SessionState.getPerfLogger();
     perfLogger.perfLogBegin(CLASS_NAME, PerfLogger.HIVE_GET_DATABASE);
     try {
-      return getMSC().getDatabase(SessionState.get().getCurrentCatalog(), dbName);
+      return getMSC().getDatabase(dbName);
     } catch (NoSuchObjectException e) {
       return null;
     } catch (Exception e) {
diff --git a/ql/src/test/queries/clientpositive/catalog_database.q b/ql/src/test/queries/clientpositive/catalog_database.q
@@ -17,11 +17,21 @@ CREATE DATABASE testcat.testdb_1;
 -- Switch the catalog from hive to 'testcat'
 SET CATALOG testcat;
 
+-- Check the current catalog, should be testcat.
+select current_catalog();
+
+-- Switch database by catalog.db pattern, and the catalog also be changed.
+USE hive.default;
+
+-- Check the current catalog, should be hive
+select current_catalog();
+
 -- CREATE DATABASE in new catalog testcat
+SET CATALOG testcat;
 CREATE DATABASE testdb_2;
 
 -- Check databases in catalog 'testcat',
--- The list of databases in the catalog 'hive' should contain default and testdb_1 and testdb_2.
+-- The list of databases in the catalog 'testcat' should contain default and testdb_1 and testdb_2.
 SHOW DATABASES;
 
 -- Switch database by catalog.db pattern
@@ -31,5 +41,6 @@ USE testcat.testdb_1;
 DROP DATABASE testcat.testdb_1;
 
 -- Check databases in catalog 'testcat',
--- The list of databases in the catalog 'hive' should contain default and testdb_2.
+-- The list of databases in the catalog 'testcat' should contain default and testdb_2.
 SHOW DATABASES;
+
diff --git a/ql/src/test/results/clientpositive/llap/catalog_database.q.out b/ql/src/test/results/clientpositive/llap/catalog_database.q.out
@@ -36,6 +36,36 @@ PREHOOK: Input: catalog:testcat
 POSTHOOK: query: SET CATALOG testcat
 POSTHOOK: type: SWITCHCATALOG
 POSTHOOK: Input: catalog:testcat
+PREHOOK: query: select current_catalog()
+PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: hdfs://### HDFS PATH ###
+POSTHOOK: query: select current_catalog()
+POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: hdfs://### HDFS PATH ###
+testcat
+PREHOOK: query: USE hive.default
+PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:default
+POSTHOOK: query: USE hive.default
+POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:default
+PREHOOK: query: select current_catalog()
+PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: hdfs://### HDFS PATH ###
+POSTHOOK: query: select current_catalog()
+POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: hdfs://### HDFS PATH ###
+hive
+PREHOOK: query: SET CATALOG testcat
+PREHOOK: type: SWITCHCATALOG
+PREHOOK: Input: catalog:testcat
+POSTHOOK: query: SET CATALOG testcat
+POSTHOOK: type: SWITCHCATALOG
+POSTHOOK: Input: catalog:testcat
 PREHOOK: query: CREATE DATABASE testdb_2
 PREHOOK: type: CREATEDATABASE
 PREHOOK: Output: database:testdb_2

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public void analyzeInternal(ASTNode root) throws SemanticException {`
`47`	`47`	`readEntity.noLockNeeded();`
`48`	`48`	`inputs.add(readEntity);`
`49`	`49`
`50`		`- SwitchDatabaseDesc desc = new SwitchDatabaseDesc(catDbNamePair.getRight());`
	`50`	`+ SwitchDatabaseDesc desc = new SwitchDatabaseDesc(catDbNamePair.getLeft(), catDbNamePair.getRight());`
`51`	`51`	`rootTasks.add(TaskFactory.get(new DDLWork(getInputs(), getOutputs(), desc)));`
`52`	`52`	`}`
`53`	`53`	`}`