diff --git itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java index 9ad5986..a8842d3 100644 --- itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java +++ itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java @@ -87,7 +87,6 @@ import org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer; import org.apache.hadoop.hive.serde2.thrift.test.Complex; import org.apache.hadoop.hive.shims.HadoopShims; -import org.apache.hadoop.hive.shims.Hadoop23Shims; import org.apache.hadoop.hive.shims.ShimLoader; import org.apache.hadoop.mapred.SequenceFileInputFormat; import org.apache.hadoop.mapred.SequenceFileOutputFormat; @@ -100,9 +99,7 @@ import org.apache.zookeeper.ZooKeeper; import org.junit.Assume; -import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableList; -import com.google.common.collect.Ordering; /** * QTestUtil. @@ -366,13 +363,11 @@ public QTestUtil(String outDir, String logDir, MiniClusterType clusterType, if (clusterType != MiniClusterType.none) { dfs = shims.getMiniDfs(conf, numberOfDataNodes, true, null); FileSystem fs = dfs.getFileSystem(); + String uriString = getHdfsUriString(fs.getUri().toString()); if (clusterType == MiniClusterType.tez) { - if (!(shims instanceof Hadoop23Shims)) { - throw new Exception("Cannot run tez on hadoop-1, Version: "+this.hadoopVer); - } - mr = ((Hadoop23Shims)shims).getMiniTezCluster(conf, 4, getHdfsUriString(fs.getUri().toString()), 1); + mr = shims.getMiniTezCluster(conf, 4, uriString, 1); } else { - mr = shims.getMiniMrCluster(conf, 4, getHdfsUriString(fs.getUri().toString()), 1); + mr = shims.getMiniMrCluster(conf, 4, uriString, 1); } } diff --git shims/0.20/src/main/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java shims/0.20/src/main/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java index ec1f18e..93d3d74 100644 --- shims/0.20/src/main/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java +++ shims/0.20/src/main/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java @@ -95,6 +95,12 @@ public MiniMrShim getMiniMrCluster(Configuration conf, int numberOfTaskTrackers, return new MiniMrShim(conf, numberOfTaskTrackers, nameNode, numDir); } + @Override + public MiniMrShim getMiniTezCluster(Configuration conf, int numberOfTaskTrackers, + String nameNode, int numDir) throws IOException { + throw new IOException("Cannot run tez on current hadoop, Version: " + VersionInfo.getVersion()); + } + /** * Shim for MiniMrCluster */ diff --git shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java index d0ff7d4..e7600bf 100644 --- shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java +++ shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java @@ -55,6 +55,7 @@ import org.apache.hadoop.util.Progressable; import org.apache.hadoop.mapred.lib.TotalOrderPartitioner; import org.apache.hadoop.security.UserGroupInformation; +import org.apache.hadoop.util.VersionInfo; /** @@ -172,6 +173,12 @@ public MiniMrShim getMiniMrCluster(Configuration conf, int numberOfTaskTrackers, return new MiniMrShim(conf, numberOfTaskTrackers, nameNode, numDir); } + @Override + public MiniMrShim getMiniTezCluster(Configuration conf, int numberOfTaskTrackers, + String nameNode, int numDir) throws IOException { + throw new IOException("Cannot run tez on current hadoop, Version: " + VersionInfo.getVersion()); + } + /** * Shim for MiniMrCluster */ diff --git shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java index 2b3c6c1..72ccd2c 100644 --- shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java +++ shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java @@ -87,6 +87,9 @@ String getTaskAttemptLogUrl(JobConf conf, public MiniMrShim getMiniMrCluster(Configuration conf, int numberOfTaskTrackers, String nameNode, int numDir) throws IOException; + public MiniMrShim getMiniTezCluster(Configuration conf, int numberOfTaskTrackers, + String nameNode, int numDir) throws IOException; + /** * Shim for MiniMrCluster */