diff --git itests/util/src/main/java/org/apache/hadoop/hive/cli/control/AbstractCliConfig.java itests/util/src/main/java/org/apache/hadoop/hive/cli/control/AbstractCliConfig.java index e964490e17..0997681cbf 100644 --- itests/util/src/main/java/org/apache/hadoop/hive/cli/control/AbstractCliConfig.java +++ itests/util/src/main/java/org/apache/hadoop/hive/cli/control/AbstractCliConfig.java @@ -47,11 +47,6 @@ public static final String HIVE_ROOT = HiveTestEnvSetup.HIVE_ROOT; private static final Logger LOG = LoggerFactory.getLogger(AbstractCliConfig.class); - enum MetastoreType { - sql - } - - private MetastoreType metastoreType = MetastoreType.sql; private String queryFile; private String queryFileRegex; private String queryDirectory; @@ -401,23 +396,6 @@ public CliAdapter getCliAdapter() { } } - protected void setMetastoreType(MetastoreType mt) { - String metaStoreTypeProperty = getSysPropValue("metaStoreType"); - if (metaStoreTypeProperty != null) { - if (metaStoreTypeProperty.equalsIgnoreCase("sql")) { - metastoreType = MetastoreType.sql; - } else { - throw new IllegalArgumentException("Unknown metastore type: " + metaStoreTypeProperty); - } - } else { - metastoreType = mt; - } - } - - public MetastoreType getMetastoreType() { - return metastoreType; - } - public String getQueryDirectory() { return queryDirectory; } diff --git itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java index 78908ae8e1..2d290dbcaa 100644 --- itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java +++ itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java @@ -142,7 +142,6 @@ public MiniTezCliConfig() { setHiveConfDir("data/conf/tez"); setClusterType(MiniClusterType.TEZ); - setMetastoreType(MetastoreType.sql); setFsType(QTestMiniClusters.FsType.HDFS); } catch (Exception e) { throw new RuntimeException("can't construct cliconfig", e); @@ -167,7 +166,6 @@ public MiniLlapCliConfig() { setHiveConfDir("data/conf/llap"); setClusterType(MiniClusterType.LLAP); - setMetastoreType(MetastoreType.sql); } catch (Exception e) { throw new RuntimeException("can't construct cliconfig", e); } @@ -193,7 +191,6 @@ public MiniDruidCliConfig() { setCleanupScript("q_test_cleanup_druid.sql"); setHiveConfDir("data/conf/llap"); setClusterType(MiniClusterType.DRUID); - setMetastoreType(MetastoreType.sql); setFsType(QTestMiniClusters.FsType.HDFS); } catch (Exception e) { throw new RuntimeException("can't construct cliconfig", e); @@ -214,7 +211,6 @@ public MiniDruidKafkaCliConfig() { setCleanupScript("q_test_cleanup_druid.sql"); setHiveConfDir("data/conf/llap"); setClusterType(MiniClusterType.DRUID_KAFKA); - setMetastoreType(MetastoreType.sql); setFsType(QTestMiniClusters.FsType.HDFS); } catch (Exception e) { throw new RuntimeException("can't construct cliconfig", e); @@ -232,7 +228,6 @@ public MiniKafkaCliConfig() { setLogDir("itests/qtest/target/tmp/log"); setHiveConfDir("data/conf/llap"); setClusterType(MiniClusterType.KAFKA); - setMetastoreType(MetastoreType.sql); setFsType(QTestMiniClusters.FsType.HDFS); } catch (Exception e) { throw new RuntimeException("can't construct cliconfig", e); @@ -268,7 +263,6 @@ public MiniLlapLocalCliConfig() { setHiveConfDir("data/conf/llap"); setClusterType(MiniClusterType.LLAP_LOCAL); - setMetastoreType(MetastoreType.sql); setFsType(QTestMiniClusters.FsType.LOCAL); } catch (Exception e) { throw new RuntimeException("can't construct cliconfig", e); @@ -770,7 +764,6 @@ public MiniDruidLlapLocalCliConfig() { setCleanupScript("q_test_cleanup_druid.sql"); setHiveConfDir("data/conf/llap"); setClusterType(MiniClusterType.DRUID_LOCAL); - setMetastoreType(MetastoreType.sql); setFsType(QTestMiniClusters.FsType.LOCAL); } catch (Exception e) { throw new RuntimeException("can't construct cliconfig", e); @@ -795,7 +788,6 @@ public KuduCliConfig() { setHiveConfDir("data/conf/llap"); setClusterType(MiniClusterType.TEZ_LOCAL); - setMetastoreType(MetastoreType.sql); setFsType(QTestMiniClusters.FsType.LOCAL); } catch (Exception e) { throw new RuntimeException("can't construct cliconfig", e); @@ -817,7 +809,6 @@ public KuduNegativeCliConfig() { setHiveConfDir("data/conf/llap"); setClusterType(MiniClusterType.TEZ_LOCAL); - setMetastoreType(MetastoreType.sql); setFsType(QTestMiniClusters.FsType.LOCAL); } catch (Exception e) { throw new RuntimeException("can't construct cliconfig", e);