Revert "HIVE-19310 : Metastore: MetaStoreDirectSql.ensureDbInit has some slow DN calls which might need to be run only in test env (Sergey Shelukhin, reviewed by Gopal Vijayaraghavan)"
This reverts commit 41f570a2c303cf390806e4681c73873486fdb19d. Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/71d77ab1 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/71d77ab1 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/71d77ab1 Branch: refs/heads/branch-3 Commit: 71d77ab1b268b200c93cb9e69f2f2ee74afa8c96 Parents: d5d8982 Author: Vineet Garg <[email protected]> Authored: Tue May 8 15:41:30 2018 -0700 Committer: Vineet Garg <[email protected]> Committed: Tue May 8 15:41:30 2018 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/71d77ab1/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java index e2ca6d2..997f5fd 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java +++ b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java @@ -179,8 +179,7 @@ class MetaStoreDirectSql { + " Disabling directSQL as it uses hand-hardcoded SQL with that assumption."); isCompatibleDatastore = false; } else { - boolean isInTest = MetastoreConf.getBoolVar(conf, ConfVars.HIVE_IN_TEST); - isCompatibleDatastore = (!isInTest || ensureDbInit()) && runTestQuery(); + isCompatibleDatastore = ensureDbInit() && runTestQuery(); if (isCompatibleDatastore) { LOG.info("Using direct SQL, underlying DB is " + dbType); }
