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 997f5fdb88..b778932f70 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 @@ -131,6 +131,7 @@ private final boolean isCompatibleDatastore; private final boolean isAggregateStatsCacheEnabled; private AggregateStatsCache aggrStatsCache; + private boolean isRunFromTest = false; @java.lang.annotation.Target(java.lang.annotation.ElementType.FIELD) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @@ -190,6 +191,10 @@ public MetaStoreDirectSql(PersistenceManager pm, Configuration conf, String sche if (isAggregateStatsCacheEnabled) { aggrStatsCache = AggregateStatsCache.getInstance(conf); } + + if (MetastoreConf.getBoolVar(conf, ConfVars.HIVE_IN_TEST)) { + isRunFromTest = true; + } } private static String getFullyQualifiedName(String schema, String tblName) { @@ -229,8 +234,10 @@ private boolean ensureDbInit() { initQueries.add(pm.newQuery(MTableColumnStatistics.class, "dbName == ''")); initQueries.add(pm.newQuery(MPartitionColumnStatistics.class, "dbName == ''")); initQueries.add(pm.newQuery(MConstraint.class, "childIntegerIndex < 0")); - initQueries.add(pm.newQuery(MNotificationLog.class, "dbName == ''")); - initQueries.add(pm.newQuery(MNotificationNextId.class, "nextEventId < -1")); + if (isRunFromTest) { + initQueries.add(pm.newQuery(MNotificationLog.class, "dbName == ''")); + initQueries.add(pm.newQuery(MNotificationNextId.class, "nextEventId < -1")); + } initQueries.add(pm.newQuery(MWMResourcePlan.class, "name == ''")); initQueries.add(pm.newQuery(MCreationMetadata.class, "dbName == ''")); Query q;