diff --git service/src/java/org/apache/hive/service/cli/session/HiveSessionImpl.java service/src/java/org/apache/hive/service/cli/session/HiveSessionImpl.java index a8bf876e46..a0e27c9b50 100644 --- service/src/java/org/apache/hive/service/cli/session/HiveSessionImpl.java +++ service/src/java/org/apache/hive/service/cli/session/HiveSessionImpl.java @@ -82,6 +82,8 @@ import com.google.common.collect.Lists; +import static org.apache.hadoop.hive.metastore.Warehouse.DEFAULT_DATABASE_NAME; + /** * HiveSession * @@ -311,7 +313,8 @@ private void configureSession(Map sessionConfMap) throws HiveSQL } } else if (key.startsWith("use:")) { try { - if (sessionHive.getDatabase(entry.getValue()) == null) { + if (!(StringUtils.equals(DEFAULT_DATABASE_NAME, entry.getValue())) + && sessionHive.getDatabase(entry.getValue()) == null) { throw new HiveSQLException("Database " + entry.getValue() + " does not exist"); } } catch (HiveException e) {