diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetastoreDefaultTransformer.java b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetastoreDefaultTransformer.java index 9adbd6ca82..a5d8c028c4 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetastoreDefaultTransformer.java +++ b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetastoreDefaultTransformer.java @@ -618,8 +618,10 @@ public Table transformCreateTable(Table table, List processorCapabilitie */ @Override public Database transformDatabase(Database db, List processorCapabilities, String processorId) throws MetaException { + boolean isDbURIExistsInWhRoot = db.getLocationUri() != null && + db.getLocationUri().startsWith(hmsHandler.getWh().getWhRoot().toString()); if ((processorCapabilities != null && processorCapabilities.contains(MANAGERAWMETADATA)) || - !defaultCatalog.equalsIgnoreCase(db.getCatalogName())) { + !defaultCatalog.equalsIgnoreCase(db.getCatalogName()) || !isDbURIExistsInWhRoot) { LOG.debug("Database belongs to non-default catalog, skipping translation"); return db; }