Index: shims/src/0.20/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- shims/src/0.20/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java (revision 1445267) +++ shims/src/0.20/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java (revision ) @@ -61,6 +61,7 @@ import org.apache.hadoop.mapred.TaskLogServlet; import org.apache.hadoop.mapred.lib.CombineFileInputFormat; import org.apache.hadoop.mapred.lib.CombineFileSplit; +import org.apache.hadoop.mapred.MiniMRCluster; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.TaskAttemptID; import org.apache.hadoop.security.SecurityUtil; @@ -124,9 +125,13 @@ public void shutdown() { cluster.shutdown(); } + } + + public MiniMRCluster getMiniMR(Configuration conf, String nameNode) throws IOException { + return new MiniMRCluster(4, nameNode, 1, null, null, new JobConf(conf)); - } + } - /** + /** * We define this function here to make the code compatible between * hadoop 0.17 and hadoop 0.20. * Index: shims/src/0.23/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- shims/src/0.23/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java (revision 1445267) +++ shims/src/0.23/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java (revision ) @@ -17,6 +17,7 @@ */ package org.apache.hadoop.hive.shims; +import java.io.IOException; import java.lang.Integer; import java.net.MalformedURLException; import java.net.URL; @@ -26,6 +27,7 @@ import org.apache.hadoop.hive.shims.HadoopShimsSecure; import org.apache.hadoop.mapred.ClusterStatus; import org.apache.hadoop.mapred.JobConf; +import org.apache.hadoop.mapred.MiniMRCluster; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.TaskAttemptID; import org.apache.hadoop.mapreduce.task.JobContextImpl; @@ -78,6 +80,12 @@ progressable.progress(); } }; + } + + @Override + public MiniMRCluster getMiniMR(Configuration conf, String nameNode) throws IOException { + conf.set("yarn.minicluster.fixed.ports", "true"); + return new MiniMRCluster(4, nameNode, 1, null, null, new JobConf(conf)); } @Override Index: shims/src/common-secure/java/org/apache/hadoop/hive/shims/HadoopShimsSecure.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- shims/src/common-secure/java/org/apache/hadoop/hive/shims/HadoopShimsSecure.java (revision 1445267) +++ shims/src/common-secure/java/org/apache/hadoop/hive/shims/HadoopShimsSecure.java (revision ) @@ -58,6 +58,7 @@ import org.apache.hadoop.mapred.TaskID; import org.apache.hadoop.mapred.lib.CombineFileInputFormat; import org.apache.hadoop.mapred.lib.CombineFileSplit; +import org.apache.hadoop.mapred.MiniMRCluster; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.token.Token; @@ -129,9 +130,13 @@ public void shutdown() { cluster.shutdown(); } + } + + public MiniMRCluster getMiniMR(Configuration conf, String nameNode) throws IOException { + return new MiniMRCluster(4, nameNode, 1); } - /** + /** * We define this function here to make the code compatible between * hadoop 0.17 and hadoop 0.20. * Index: ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java (revision 1445267) +++ ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java (revision ) @@ -290,7 +290,7 @@ if (miniMr) { dfs = ShimLoader.getHadoopShims().getMiniDfs(conf, 4, true, null); FileSystem fs = dfs.getFileSystem(); - mr = new MiniMRCluster(4, getHdfsUriString(fs.getUri().toString()), 1); + mr = ShimLoader.getHadoopShims().getMiniMR(conf, getHdfsUriString(fs.getUri().toString())); } initConf(); Index: shims/src/common/java/org/apache/hadoop/hive/shims/HadoopShims.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- shims/src/common/java/org/apache/hadoop/hive/shims/HadoopShims.java (revision 1445267) +++ shims/src/common/java/org/apache/hadoop/hive/shims/HadoopShims.java (revision ) @@ -44,6 +44,7 @@ import org.apache.hadoop.mapred.Reporter; import org.apache.hadoop.mapred.RunningJob; import org.apache.hadoop.mapred.TaskCompletionEvent; +import org.apache.hadoop.mapred.MiniMRCluster; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.JobContext; import org.apache.hadoop.mapreduce.TaskAttemptContext; @@ -129,8 +130,13 @@ void shutdown() throws IOException; } + + /** + * Returns a shim to wrap MiniMRCluster. + */ + MiniMRCluster getMiniMR(Configuration conf, String nameNode) throws IOException; - /** + /** * We define this function here to make the code compatible between * hadoop 0.17 and hadoop 0.20. *