[hive] branch master updated: HIVE-22320 : Cluster and fs type settings can be replaced with a single minicluster setting in CliConfigs (Laszlo Bodor via Miklos Gergely)

[hashutosh]

This is an automated email from the ASF dual-hosted git repository.

hashutosh 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 b0dc673  HIVE-22320 : Cluster and fs type settings can be replaced 
with a single minicluster setting in CliConfigs (Laszlo Bodor via Miklos 
Gergely)
b0dc673 is described below

commit b0dc6734cdc0945ac9b3ebff800a63bccc4a7e61
Author: Laszlo Bodor <bodorlaszlo0...@gmail.com>
AuthorDate: Sun May 10 21:16:35 2020 -0700

    HIVE-22320 : Cluster and fs type settings can be replaced with a single 
minicluster setting in CliConfigs (Laszlo Bodor via Miklos Gergely)
    
    Signed-off-by: Ashutosh Chauhan <hashut...@apache.org>
---
 .../apache/hadoop/hive/cli/control/AbstractCliConfig.java    |  1 +
 .../java/org/apache/hadoop/hive/cli/control/CliConfigs.java  | 12 ++----------
 2 files changed, 3 insertions(+), 10 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 712af82..353a4aa 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
@@ -368,6 +368,7 @@ public abstract class AbstractCliConfig {
     if (clusterType == null) {
       throw new RuntimeException("clustertype cant be null");
     }
+    this.setFsType(clusterType.getDefaultFsType());
   }
 
   protected FsType getFsType() {
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 1ecd0d1..473a9f8 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
@@ -147,7 +147,6 @@ public class CliConfigs {
 
         setHiveConfDir("data/conf/tez");
         setClusterType(MiniClusterType.TEZ);
-        setFsType(QTestMiniClusters.FsType.HDFS);
       } catch (Exception e) {
         throw new RuntimeException("can't construct cliconfig", e);
       }
@@ -196,7 +195,6 @@ public class CliConfigs {
         setCleanupScript("q_test_cleanup_druid.sql");
         setHiveConfDir("data/conf/llap");
         setClusterType(MiniClusterType.DRUID);
-        setFsType(QTestMiniClusters.FsType.HDFS);
       } catch (Exception e) {
         throw new RuntimeException("can't construct cliconfig", e);
       }
@@ -216,7 +214,6 @@ public class CliConfigs {
         setCleanupScript("q_test_cleanup_druid.sql");
         setHiveConfDir("data/conf/llap");
         setClusterType(MiniClusterType.DRUID_KAFKA);
-        setFsType(QTestMiniClusters.FsType.HDFS);
       } catch (Exception e) {
         throw new RuntimeException("can't construct cliconfig", e);
       }
@@ -233,7 +230,6 @@ public class CliConfigs {
         setLogDir("itests/qtest/target/tmp/log");
         setHiveConfDir("data/conf/llap");
         setClusterType(MiniClusterType.KAFKA);
-        setFsType(QTestMiniClusters.FsType.HDFS);
       } catch (Exception e) {
         throw new RuntimeException("can't construct cliconfig", e);
       }
@@ -265,7 +261,6 @@ public class CliConfigs {
 
         setHiveConfDir("data/conf/llap");
         setClusterType(MiniClusterType.LLAP_LOCAL);
-        setFsType(QTestMiniClusters.FsType.LOCAL);
       } catch (Exception e) {
         throw new RuntimeException("can't construct cliconfig", e);
       }
@@ -288,7 +283,7 @@ public class CliConfigs {
 
 
         setClusterType(MiniClusterType.MR);
-        setFsType(QTestMiniClusters.FsType.ENCRYPTED_HDFS);
+        setFsType(QTestMiniClusters.FsType.ENCRYPTED_HDFS); // override 
default FsType.HDFS
         if (getClusterType() == MiniClusterType.TEZ) {
           setHiveConfDir("data/conf/tez");
         } else {
@@ -723,7 +718,7 @@ public class CliConfigs {
         setCleanupScript("q_test_cleanup_src.sql");
 
         setClusterType(MiniClusterType.MR);
-        setFsType(QTestMiniClusters.FsType.ERASURE_CODED_HDFS);
+        setFsType(QTestMiniClusters.FsType.ERASURE_CODED_HDFS); // override 
default FsType.HDFS
         setHiveConfDir(getClusterType());
       } catch (Exception e) {
         throw new RuntimeException("can't construct cliconfig", e);
@@ -766,7 +761,6 @@ public class CliConfigs {
         setCleanupScript("q_test_cleanup_druid.sql");
         setHiveConfDir("data/conf/llap");
         setClusterType(MiniClusterType.DRUID_LOCAL);
-        setFsType(QTestMiniClusters.FsType.LOCAL);
       } catch (Exception e) {
         throw new RuntimeException("can't construct cliconfig", e);
       }
@@ -790,7 +784,6 @@ public class CliConfigs {
 
         setHiveConfDir("data/conf/llap");
         setClusterType(MiniClusterType.TEZ_LOCAL);
-        setFsType(QTestMiniClusters.FsType.LOCAL);
       } catch (Exception e) {
         throw new RuntimeException("can't construct cliconfig", e);
       }
@@ -811,7 +804,6 @@ public class CliConfigs {
 
         setHiveConfDir("data/conf/llap");
         setClusterType(MiniClusterType.TEZ_LOCAL);
-        setFsType(QTestMiniClusters.FsType.LOCAL);
       } catch (Exception e) {
         throw new RuntimeException("can't construct cliconfig", e);
       }