diff --git a/ql/src/test/results/clientnegative/alter_table_wrong_db.q.out b/ql/src/test/results/clientnegative/alter_table_wrong_db.q.out index d3c16bb53d..07641b4a0c 100644 --- a/ql/src/test/results/clientnegative/alter_table_wrong_db.q.out +++ b/ql/src/test/results/clientnegative/alter_table_wrong_db.q.out @@ -22,4 +22,4 @@ PREHOOK: query: alter table bad_rename1.rename1 rename to bad_db_notexists.renam PREHOOK: type: ALTERTABLE_RENAME PREHOOK: Input: bad_rename1@rename1 PREHOOK: Output: bad_rename1@rename1 -FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.ddl.DDLTask. Unable to alter table. Unable to change partition or table. Object bad_db_notexists does not exist. Check metastore logs for detailed stack. +FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.ddl.DDLTask. Unable to alter table. Unable to change partition or table. Object database hive.bad_db_notexists does not exist. Check metastore logs for detailed stack. 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 index 7bc1200a02..13071f6266 100644 --- 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 @@ -714,7 +714,8 @@ public Database getDatabase(String catalogName, String name) throws NoSuchObject if (db == null) { LOG.debug("Failed to get database {}.{}, returning NoSuchObjectException", catalogName, name, ex); - throw new NoSuchObjectException(name + (ex == null ? "" : (": " + ex.getMessage()))); + final String errorMessage = (ex == null ? "" : (": " + ex.getMessage())); + throw new NoSuchObjectException("database " + catalogName + "." + name + errorMessage); } return db; }