Index: hbase-handler/src/test/org/apache/hadoop/hive/hbase/HBaseQTestUtil.java =================================================================== --- hbase-handler/src/test/org/apache/hadoop/hive/hbase/HBaseQTestUtil.java (revision 1537774) +++ hbase-handler/src/test/org/apache/hadoop/hive/hbase/HBaseQTestUtil.java (working copy) @@ -18,6 +18,7 @@ package org.apache.hadoop.hive.hbase; import org.apache.hadoop.hive.ql.QTestUtil; +import org.apache.hadoop.hive.ql.QTestUtil.MiniClusterType; /** * HBaseQTestUtil initializes HBase-specific test fixtures. @@ -24,7 +25,7 @@ */ public class HBaseQTestUtil extends QTestUtil { public HBaseQTestUtil( - String outDir, String logDir, String miniMr, HBaseTestSetup setup) + String outDir, String logDir, MiniClusterType miniMr, HBaseTestSetup setup) throws Exception { super(outDir, logDir, miniMr, null); Index: hbase-handler/src/test/templates/TestHBaseCliDriver.vm =================================================================== --- hbase-handler/src/test/templates/TestHBaseCliDriver.vm (revision 1537774) +++ hbase-handler/src/test/templates/TestHBaseCliDriver.vm (working copy) @@ -24,6 +24,7 @@ import java.io.*; import java.util.*; +import org.apache.hadoop.hive.ql.QTestUtil.MiniClusterType; import org.apache.hadoop.hive.hbase.HBaseQTestUtil; import org.apache.hadoop.hive.hbase.HBaseTestSetup; import org.apache.hadoop.hive.ql.session.SessionState; @@ -42,10 +43,11 @@ @Override protected void setUp() { + + MiniClusterType miniMR = MiniClusterType.valueForString("$clusterMode"); + try { - String miniMR = "$clusterMode"; qt = new HBaseQTestUtil((HIVE_ROOT + "$resultsDir"), (HIVE_ROOT + "$logDir"), miniMR, setup); - } catch (Exception e) { System.err.println("Exception: " + e.getMessage()); e.printStackTrace(); Index: hbase-handler/src/test/templates/TestHBaseNegativeCliDriver.vm =================================================================== --- hbase-handler/src/test/templates/TestHBaseNegativeCliDriver.vm (revision 1537774) +++ hbase-handler/src/test/templates/TestHBaseNegativeCliDriver.vm (working copy) @@ -25,6 +25,7 @@ import java.io.*; import java.util.*; +import org.apache.hadoop.hive.ql.QTestUtil.MiniClusterType; import org.apache.hadoop.hive.hbase.HBaseQTestUtil; import org.apache.hadoop.hive.hbase.HBaseTestSetup; @@ -42,11 +43,11 @@ @Override protected void setUp() { + + MiniClusterType miniMR = MiniClusterType.valueForString("$clusterMode"); + try { - String miniMR = "$clusterMode"; - qt = new HBaseQTestUtil((HIVE_ROOT + "$resultsDir"), (HIVE_ROOT + "$logDir"), miniMR, setup); - } catch (Exception e) { System.err.println("Exception: " + e.getMessage()); e.printStackTrace(); Index: ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java =================================================================== --- ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java (revision 1537774) +++ ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java (working copy) @@ -127,7 +127,6 @@ private boolean miniMr = false; private String hadoopVer = null; private QTestSetup setup = null; - private boolean miniTez = false; public boolean deleteDirectory(File path) { if (path.exists()) { @@ -196,7 +195,7 @@ } public QTestUtil(String outDir, String logDir) throws Exception { - this(outDir, logDir, "", "0.20"); + this(outDir, logDir, MiniClusterType.none, "0.20"); } public String getOutputDirectory() { @@ -289,17 +288,27 @@ } public enum MiniClusterType { - miniMr, - tez + mr, + tez, + none; + + public static MiniClusterType valueForString(String type) { + if (type.equals("miniMR")) { + return mr; + } else if (type.equals("tez")) { + return tez; + } else { + return none; + } + } } - public QTestUtil(String outDir, String logDir, String miniMr, String hadoopVer) + public QTestUtil(String outDir, String logDir, MiniClusterType clusterType, String hadoopVer) throws Exception { this.outDir = outDir; this.logDir = logDir; conf = new HiveConf(Driver.class); - this.miniMr = miniMr.equals("miniMr"); - this.miniTez = miniMr.equals("tez"); + this.miniMr = (clusterType == MiniClusterType.mr); this.hadoopVer = getHadoopMainVersion(hadoopVer); qMap = new TreeMap(); qSkipSet = new HashSet(); @@ -306,9 +315,8 @@ qSortSet = new HashSet(); HadoopShims shims = null; - MiniClusterType clusterType = MiniClusterType.valueOf(miniMr); switch (clusterType) { - case miniMr: + case mr: shims = ShimLoader.getHadoopShims(); break; @@ -321,14 +329,20 @@ shims = (HadoopShims) new TezShims(); break; + case none: + break; + default: - throw new Exception("Unknown cluster type"); + throw new Exception("Unrecognized cluster type"); } - dfs = shims.getMiniDfs(conf, 4, true, null); - FileSystem fs = dfs.getFileSystem(); - mr = shims.getMiniMrCluster(conf, 4, getHdfsUriString(fs.getUri().toString()), 1); + if (shims != null) { + dfs = shims.getMiniDfs(conf, 4, true, null); + FileSystem fs = dfs.getFileSystem(); + mr = shims.getMiniMrCluster(conf, 4, getHdfsUriString(fs.getUri().toString()), 1); + } + initConf(); // Use the current directory if it is not specified @@ -1454,7 +1468,7 @@ { QTestUtil[] qt = new QTestUtil[qfiles.length]; for (int i = 0; i < qfiles.length; i++) { - qt[i] = new QTestUtil(resDir, logDir, "", "0.20"); + qt[i] = new QTestUtil(resDir, logDir, MiniClusterType.none, "0.20"); qt[i].addFile(qfiles[i]); qt[i].clearTestSideEffects(); } Index: ql/src/test/org/apache/hadoop/hive/ql/TestLocationQueries.java =================================================================== --- ql/src/test/org/apache/hadoop/hive/ql/TestLocationQueries.java (revision 1537774) +++ ql/src/test/org/apache/hadoop/hive/ql/TestLocationQueries.java (working copy) @@ -24,6 +24,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.hadoop.hive.ql.QTestUtil.MiniClusterType; + /** * Suite for testing location. e.g. if "alter table alter partition * location" is run, do the partitions end up in the correct location. @@ -82,7 +84,7 @@ return failedCount; } - public CheckResults(String outDir, String logDir, String miniMr, + public CheckResults(String outDir, String logDir, MiniClusterType miniMr, String hadoopVer, String locationSubdir) throws Exception { @@ -102,8 +104,9 @@ File[] qfiles = setupQFiles(testNames); QTestUtil[] qt = new QTestUtil[qfiles.length]; + for (int i = 0; i < qfiles.length; i++) { - qt[i] = new CheckResults(resDir, logDir, "non-minimr", "0.20", "parta"); + qt[i] = new CheckResults(resDir, logDir, MiniClusterType.none, "0.20", "parta"); qt[i].addFile(qfiles[i]); qt[i].clearTestSideEffects(); } Index: ql/src/test/templates/TestCliDriver.vm =================================================================== --- ql/src/test/templates/TestCliDriver.vm (revision 1537774) +++ ql/src/test/templates/TestCliDriver.vm (working copy) @@ -25,6 +25,7 @@ import java.util.*; import org.apache.hadoop.hive.ql.QTestUtil; +import org.apache.hadoop.hive.ql.QTestUtil.MiniClusterType; import org.apache.hadoop.hive.ql.session.SessionState; public class $className extends TestCase { @@ -33,9 +34,10 @@ private static QTestUtil qt; static { + + MiniClusterType miniMR = MiniClusterType.valueForString("$clusterMode"); try { String hadoopVer = "$hadoopVersion"; - String miniMR = "$clusterMode"; qt = new QTestUtil((HIVE_ROOT + "$resultsDir"), (HIVE_ROOT + "$logDir"), miniMR, hadoopVer); // do a one time initialization Index: ql/src/test/templates/TestNegativeCliDriver.vm =================================================================== --- ql/src/test/templates/TestNegativeCliDriver.vm (revision 1537774) +++ ql/src/test/templates/TestNegativeCliDriver.vm (working copy) @@ -25,6 +25,7 @@ import java.util.*; import org.apache.hadoop.hive.ql.QTestUtil; +import org.apache.hadoop.hive.ql.QTestUtil.MiniClusterType; import org.apache.hadoop.hive.ql.exec.Task; public class $className extends TestCase { @@ -33,8 +34,9 @@ private static QTestUtil qt; static { + MiniClusterType miniMR = MiniClusterType.valueForString("$clusterMode"); + try { - String miniMR = "$clusterMode"; String hadoopVer = "$hadoopVersion"; qt = new QTestUtil((HIVE_ROOT + "$resultsDir"), (HIVE_ROOT + "$logDir"), miniMR, hadoopVer); // do a one time initialization Index: ql/src/test/templates/TestParse.vm =================================================================== --- ql/src/test/templates/TestParse.vm (revision 1537774) +++ ql/src/test/templates/TestParse.vm (working copy) @@ -25,6 +25,7 @@ import java.util.*; import org.apache.hadoop.hive.ql.QTestUtil; +import org.apache.hadoop.hive.ql.QTestUtil.MiniClusterType; import org.apache.hadoop.hive.ql.exec.Task; public class $className extends TestCase { @@ -31,10 +32,11 @@ private static final String HIVE_ROOT = QTestUtil.ensurePathEndsInSlash(System.getProperty("hive.root")); private static QTestUtil qt; + + static { + MiniClusterType miniMR = MiniClusterType.valueForString("$clusterMode"); - static { try { - String miniMR = "$clusterMode"; String hadoopVer = "$hadoopVersion"; qt = new QTestUtil((HIVE_ROOT + "$resultsDir"), (HIVE_ROOT + "$logDir"), miniMR, hadoopVer); qt.init(null); Index: ql/src/test/templates/TestParseNegative.vm =================================================================== --- ql/src/test/templates/TestParseNegative.vm (revision 1537774) +++ ql/src/test/templates/TestParseNegative.vm (working copy) @@ -25,6 +25,7 @@ import java.util.*; import org.apache.hadoop.hive.ql.QTestUtil; +import org.apache.hadoop.hive.ql.QTestUtil.MiniClusterType; import org.apache.hadoop.hive.ql.exec.Task; public class $className extends TestCase { @@ -33,8 +34,10 @@ private static QTestUtil qt; static { + + MiniClusterType miniMR = MiniClusterType.valueForString("$clusterMode"); + try { - String miniMR = "$clusterMode"; String hadoopVer = "$hadoopVersion"; qt = new QTestUtil((HIVE_ROOT + "$resultsDir"), (HIVE_ROOT + "$logDir"), miniMR, hadoopVer); } catch (Exception e) {