You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by gu...@apache.org on 2013/11/01 01:38:11 UTC
svn commit: r1537781 - in /hive/branches/tez:
hbase-handler/src/test/org/apache/hadoop/hive/hbase/
hbase-handler/src/test/templates/ ql/src/test/org/apache/hadoop/hive/ql/
ql/src/test/templates/
Author: gunther
Date: Fri Nov 1 00:38:11 2013
New Revision: 1537781
URL: http://svn.apache.org/r1537781
Log:
HIVE-5688: TestCliDriver compilation fails on tez branch. (Vikram Dixit K via Gunther Hagleitner)
Modified:
hive/branches/tez/hbase-handler/src/test/org/apache/hadoop/hive/hbase/HBaseQTestUtil.java
hive/branches/tez/hbase-handler/src/test/templates/TestHBaseCliDriver.vm
hive/branches/tez/hbase-handler/src/test/templates/TestHBaseNegativeCliDriver.vm
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/TestLocationQueries.java
hive/branches/tez/ql/src/test/templates/TestCliDriver.vm
hive/branches/tez/ql/src/test/templates/TestNegativeCliDriver.vm
hive/branches/tez/ql/src/test/templates/TestParse.vm
hive/branches/tez/ql/src/test/templates/TestParseNegative.vm
Modified: hive/branches/tez/hbase-handler/src/test/org/apache/hadoop/hive/hbase/HBaseQTestUtil.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/hbase-handler/src/test/org/apache/hadoop/hive/hbase/HBaseQTestUtil.java?rev=1537781&r1=1537780&r2=1537781&view=diff
==============================================================================
--- hive/branches/tez/hbase-handler/src/test/org/apache/hadoop/hive/hbase/HBaseQTestUtil.java (original)
+++ hive/branches/tez/hbase-handler/src/test/org/apache/hadoop/hive/hbase/HBaseQTestUtil.java Fri Nov 1 00:38:11 2013
@@ -18,13 +18,14 @@
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.
*/
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);
Modified: hive/branches/tez/hbase-handler/src/test/templates/TestHBaseCliDriver.vm
URL: http://svn.apache.org/viewvc/hive/branches/tez/hbase-handler/src/test/templates/TestHBaseCliDriver.vm?rev=1537781&r1=1537780&r2=1537781&view=diff
==============================================================================
--- hive/branches/tez/hbase-handler/src/test/templates/TestHBaseCliDriver.vm (original)
+++ hive/branches/tez/hbase-handler/src/test/templates/TestHBaseCliDriver.vm Fri Nov 1 00:38:11 2013
@@ -24,6 +24,7 @@ import junit.framework.TestSuite;
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 @@ public class $className extends TestCase
@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();
Modified: hive/branches/tez/hbase-handler/src/test/templates/TestHBaseNegativeCliDriver.vm
URL: http://svn.apache.org/viewvc/hive/branches/tez/hbase-handler/src/test/templates/TestHBaseNegativeCliDriver.vm?rev=1537781&r1=1537780&r2=1537781&view=diff
==============================================================================
--- hive/branches/tez/hbase-handler/src/test/templates/TestHBaseNegativeCliDriver.vm (original)
+++ hive/branches/tez/hbase-handler/src/test/templates/TestHBaseNegativeCliDriver.vm Fri Nov 1 00:38:11 2013
@@ -25,6 +25,7 @@ import junit.framework.TestSuite;
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 @@ public class $className extends TestCase
@Override
protected void setUp() {
- try {
- String miniMR = "$clusterMode";
- qt = new HBaseQTestUtil((HIVE_ROOT + "$resultsDir"), (HIVE_ROOT + "$logDir"), miniMR, setup);
+ MiniClusterType miniMR = MiniClusterType.valueForString("$clusterMode");
+ try {
+ qt = new HBaseQTestUtil((HIVE_ROOT + "$resultsDir"), (HIVE_ROOT + "$logDir"), miniMR, setup);
} catch (Exception e) {
System.err.println("Exception: " + e.getMessage());
e.printStackTrace();
Modified: hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java?rev=1537781&r1=1537780&r2=1537781&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java (original)
+++ hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java Fri Nov 1 00:38:11 2013
@@ -127,7 +127,6 @@ public class QTestUtil {
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 class QTestUtil {
}
public QTestUtil(String outDir, String logDir) throws Exception {
- this(outDir, logDir, "", "0.20");
+ this(outDir, logDir, MiniClusterType.none, "0.20");
}
public String getOutputDirectory() {
@@ -289,26 +288,35 @@ public class QTestUtil {
}
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<String, String>();
qSkipSet = new HashSet<String>();
qSortSet = new HashSet<String>();
HadoopShims shims = null;
- MiniClusterType clusterType = MiniClusterType.valueOf(miniMr);
switch (clusterType) {
- case miniMr:
+ case mr:
shims = ShimLoader.getHadoopShims();
break;
@@ -321,14 +329,20 @@ public class QTestUtil {
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 @@ public class QTestUtil {
{
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();
}
Modified: hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/TestLocationQueries.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/TestLocationQueries.java?rev=1537781&r1=1537780&r2=1537781&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/TestLocationQueries.java (original)
+++ hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/TestLocationQueries.java Fri Nov 1 00:38:11 2013
@@ -24,6 +24,8 @@ import java.io.FileReader;
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 @@ public class TestLocationQueries extends
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 @@ public class TestLocationQueries extends
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();
}
Modified: hive/branches/tez/ql/src/test/templates/TestCliDriver.vm
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/templates/TestCliDriver.vm?rev=1537781&r1=1537780&r2=1537781&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/templates/TestCliDriver.vm (original)
+++ hive/branches/tez/ql/src/test/templates/TestCliDriver.vm Fri Nov 1 00:38:11 2013
@@ -25,6 +25,7 @@ import java.io.*;
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 @@ public class $className extends TestCase
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
Modified: hive/branches/tez/ql/src/test/templates/TestNegativeCliDriver.vm
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/templates/TestNegativeCliDriver.vm?rev=1537781&r1=1537780&r2=1537781&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/templates/TestNegativeCliDriver.vm (original)
+++ hive/branches/tez/ql/src/test/templates/TestNegativeCliDriver.vm Fri Nov 1 00:38:11 2013
@@ -25,6 +25,7 @@ import java.io.*;
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 @@ public class $className extends TestCase
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
Modified: hive/branches/tez/ql/src/test/templates/TestParse.vm
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/templates/TestParse.vm?rev=1537781&r1=1537780&r2=1537781&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/templates/TestParse.vm (original)
+++ hive/branches/tez/ql/src/test/templates/TestParse.vm Fri Nov 1 00:38:11 2013
@@ -25,16 +25,18 @@ import java.io.*;
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 {
private static final String HIVE_ROOT = QTestUtil.ensurePathEndsInSlash(System.getProperty("hive.root"));
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);
qt.init(null);
Modified: hive/branches/tez/ql/src/test/templates/TestParseNegative.vm
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/templates/TestParseNegative.vm?rev=1537781&r1=1537780&r2=1537781&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/templates/TestParseNegative.vm (original)
+++ hive/branches/tez/ql/src/test/templates/TestParseNegative.vm Fri Nov 1 00:38:11 2013
@@ -25,6 +25,7 @@ import java.io.*;
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 @@ public class $className extends TestCase
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) {