Author: hashutosh
Date: Fri Mar 21 07:27:57 2014
New Revision: 1579894
URL: http://svn.apache.org/r1579894
Log:
HIVE-6241 : Remove direct reference of Hadoop23Shims inQTestUtil (Navis via
Ashutosh Chauhan)
Modified:
hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
hive/trunk/shims/0.20/src/main/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java
hive/trunk/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java
hive/trunk/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java
Modified:
hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
URL:
http://svn.apache.org/viewvc/hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java?rev=1579894&r1=1579893&r2=1579894&view=diff
==============================================================================
---
hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
(original)
+++
hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
Fri Mar 21 07:27:57 2014
@@ -87,7 +87,6 @@ import org.apache.hadoop.hive.ql.session
import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer;
import org.apache.hadoop.hive.serde2.thrift.test.Complex;
-import org.apache.hadoop.hive.shims.Hadoop23Shims;
import org.apache.hadoop.hive.shims.HadoopShims;
import org.apache.hadoop.hive.shims.ShimLoader;
import org.apache.hadoop.mapred.SequenceFileInputFormat;
@@ -365,13 +364,11 @@ public class QTestUtil {
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);
}
}
Modified:
hive/trunk/shims/0.20/src/main/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java
URL:
http://svn.apache.org/viewvc/hive/trunk/shims/0.20/src/main/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java?rev=1579894&r1=1579893&r2=1579894&view=diff
==============================================================================
---
hive/trunk/shims/0.20/src/main/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java
(original)
+++
hive/trunk/shims/0.20/src/main/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java
Fri Mar 21 07:27:57 2014
@@ -98,6 +98,12 @@ public class Hadoop20Shims implements Ha
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
*/
Modified:
hive/trunk/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java
URL:
http://svn.apache.org/viewvc/hive/trunk/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java?rev=1579894&r1=1579893&r2=1579894&view=diff
==============================================================================
---
hive/trunk/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java
(original)
+++
hive/trunk/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java
Fri Mar 21 07:27:57 2014
@@ -58,6 +58,7 @@ import org.apache.hadoop.mapreduce.TaskI
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;
/**
@@ -175,6 +176,12 @@ public class Hadoop20SShims extends Hado
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
*/
Modified:
hive/trunk/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java
URL:
http://svn.apache.org/viewvc/hive/trunk/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java?rev=1579894&r1=1579893&r2=1579894&view=diff
==============================================================================
---
hive/trunk/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java
(original)
+++
hive/trunk/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java
Fri Mar 21 07:27:57 2014
@@ -89,6 +89,9 @@ public interface HadoopShims {
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
*/
