svn commit: r1641613 - in /hive/branches/spark/itests: qtest-spark/pom.xml util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java

[xu...@apache.org]

Author: xuefu
Date: Tue Nov 25 12:59:16 2014
New Revision: 1641613

URL: http://svn.apache.org/r1641613
Log:
HIVE-8959: SparkSession is not closed until JVM exit.[Spark Branch] (Chengxiang via Xuefu)

Modified:
    hive/branches/spark/itests/qtest-spark/pom.xml
    hive/branches/spark/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java

Modified: hive/branches/spark/itests/qtest-spark/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/spark/itests/qtest-spark/pom.xml?rev=1641613&r1=1641612&r2=1641613&view=diff
==============================================================================
--- hive/branches/spark/itests/qtest-spark/pom.xml (original)
+++ hive/branches/spark/itests/qtest-spark/pom.xml Tue Nov 25 12:59:16 2014
@@ -37,7 +37,7 @@
     <qfile></qfile>
     <qfile_regex></qfile_regex>
     <run_disabled>false</run_disabled>
-    <clustermode></clustermode>
+    <clustermode>spark</clustermode>
     <execute.beeline.tests>false</execute.beeline.tests>
     <active.hadoop.version>${hadoop-23.version}</active.hadoop.version>
     <test.dfs.mkdir>-mkdir -p</test.dfs.mkdir>
@@ -356,6 +356,7 @@
                   queryDirectory="${basedir}/${hive.path.to.root}/ql/src/test/queries/clientpositive/"
                   queryFile="${qfile}"
                   queryFileRegex="${qfile_regex}"
+                  clusterMode="${clustermode}"
                   includeQueryFile="${spark.query.files}"
                   runDisabled="${run_disabled}"
                   hiveConfDir="${basedir}/${hive.path.to.root}/data/conf/spark"

Modified: hive/branches/spark/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java?rev=1641613&r1=1641612&r2=1641613&view=diff
==============================================================================
--- hive/branches/spark/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java (original)
+++ hive/branches/spark/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java Tue Nov 25 12:59:16 2014
@@ -222,7 +222,7 @@ public class QTestUtil {
 
   public QTestUtil(String outDir, String logDir, String initScript, String cleanupScript) throws
       Exception {
-    this(outDir, logDir, MiniClusterType.none, null, "0.20", initScript, cleanupScript);
+    this(outDir, logDir, MiniClusterType.spark, null, "0.20", initScript, cleanupScript);
   }
 
   public String getOutputDirectory() {
@@ -280,6 +280,7 @@ public class QTestUtil {
   public enum MiniClusterType {
     mr,
     tez,
+    spark,
     none;
 
     public static MiniClusterType valueForString(String type) {
@@ -287,6 +288,8 @@ public class QTestUtil {
         return mr;
       } else if (type.equals("tez")) {
         return tez;
+      } else if (type.equals("spark")) {
+        return spark;
       } else {
         return none;
       }
@@ -322,7 +325,7 @@ public class QTestUtil {
     HadoopShims shims = ShimLoader.getHadoopShims();
     int numberOfDataNodes = 4;
 
-    if (clusterType != MiniClusterType.none) {
+    if (clusterType != MiniClusterType.none && clusterType != MiniClusterType.spark) {
       dfs = shims.getMiniDfs(conf, numberOfDataNodes, true, null);
       FileSystem fs = dfs.getFileSystem();
       String uriString = WindowsPathUtil.getHdfsUriString(fs.getUri().toString());
@@ -766,7 +769,7 @@ public class QTestUtil {
     ss.setIsSilent(true);
     SessionState oldSs = SessionState.get();
 
-    if (oldSs != null && clusterType == MiniClusterType.tez) {
+    if (oldSs != null && (clusterType == MiniClusterType.tez || clusterType == MiniClusterType.spark)) {
       oldSs.close();
     }
 
@@ -800,7 +803,7 @@ public class QTestUtil {
     ss.err = System.out;
 
     SessionState oldSs = SessionState.get();
-    if (oldSs != null && clusterType == MiniClusterType.tez) {
+    if (oldSs != null && (clusterType == MiniClusterType.tez || clusterType == MiniClusterType.spark)) {
       oldSs.close();
     }
     if (oldSs != null && oldSs.out != null && oldSs.out != System.out) {
@@ -1500,7 +1503,7 @@ public class QTestUtil {
   {
     QTestUtil[] qt = new QTestUtil[qfiles.length];
     for (int i = 0; i < qfiles.length; i++) {
-      qt[i] = new QTestUtil(resDir, logDir, MiniClusterType.none, null, "0.20", "", "");
+      qt[i] = new QTestUtil(resDir, logDir, MiniClusterType.spark, null, "0.20", "", "");
       qt[i].addFile(qfiles[i]);
       qt[i].clearTestSideEffects();
     }