You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ab...@apache.org on 2019/09/09 13:19:15 UTC
[hive] branch master updated: HIVE-21942: Remove useless
MetastoreType enum from AbstractCliConfig (Imre Molnar via Laszlo Bodor)
This is an automated email from the ASF dual-hosted git repository.
abstractdog pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 9667f25 HIVE-21942: Remove useless MetastoreType enum from AbstractCliConfig (Imre Molnar via Laszlo Bodor)
9667f25 is described below
commit 9667f25f1bafbd8819c2fd50790c4d6fc7240fe9
Author: Imre Molnar <en...@gmail.com>
AuthorDate: Mon Sep 9 15:12:13 2019 +0200
HIVE-21942: Remove useless MetastoreType enum from AbstractCliConfig (Imre Molnar via Laszlo Bodor)
Signed-off-by: Laszlo Bodor <bo...@gmail.com>
---
.../hadoop/hive/cli/control/AbstractCliConfig.java | 22 ----------------------
.../apache/hadoop/hive/cli/control/CliConfigs.java | 9 ---------
2 files changed, 31 deletions(-)
diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/AbstractCliConfig.java b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/AbstractCliConfig.java
index e964490..0997681 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/AbstractCliConfig.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/AbstractCliConfig.java
@@ -47,11 +47,6 @@ public abstract class AbstractCliConfig {
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 abstract class AbstractCliConfig {
}
}
- 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 a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java
index 78908ae..2d290db 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java
@@ -142,7 +142,6 @@ public class CliConfigs {
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 class CliConfigs {
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 class CliConfigs {
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 class CliConfigs {
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 class CliConfigs {
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 class CliConfigs {
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 class CliConfigs {
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 class CliConfigs {
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 class CliConfigs {
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);