aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorDongjoon Hyun <dongjoon@apache.org>2016-03-16 09:05:53 +0000
committerSean Owen <sowen@cloudera.com>2016-03-16 09:05:53 +0000
commit431a3d04b437df4ab323fd925f57873aa6b8a0c8 (patch)
treefff23119aebe9c8d594fa630d6fd0e098ae41655 /sql
parent92024797a4fad594b5314f3f3be5c6be2434de8a (diff)
downloadspark-431a3d04b437df4ab323fd925f57873aa6b8a0c8.tar.gz
spark-431a3d04b437df4ab323fd925f57873aa6b8a0c8.tar.bz2
spark-431a3d04b437df4ab323fd925f57873aa6b8a0c8.zip
[SPARK-12653][SQL] Re-enable test "SPARK-8489: MissingRequirementError during reflection"
## What changes were proposed in this pull request? The purpose of [SPARK-12653](https://issues.apache.org/jira/browse/SPARK-12653) is re-enabling a regression test. Historically, the target regression test is added by [SPARK-8498](https://github.com/apache/spark/commit/093c34838d1db7a9375f36a9a2ab5d96a23ae683), but is temporarily disabled by [SPARK-12615](https://github.com/apache/spark/commit/8ce645d4eeda203cf5e100c4bdba2d71edd44e6a) due to binary compatibility error. The following is the current error message at the submitting spark job with the pre-built `test.jar` file in the target regression test. ``` Exception in thread "main" java.lang.NoSuchMethodError: org.apache.spark.SparkContext$.$lessinit$greater$default$6()Lscala/collection/Map; ``` Simple rebuilding `test.jar` can not recover the purpose of testcase since we need to support both Scala 2.10 and 2.11 for a while. For example, we will face the following Scala 2.11 error if we use `test.jar` built by Scala 2.10. ``` Exception in thread "main" java.lang.NoSuchMethodError: scala.reflect.api.JavaUniverse.runtimeMirror(Ljava/lang/ClassLoader;)Lscala/reflect/api/JavaMirrors$JavaMirror; ``` This PR replace the existing `test.jar` with `test-2.10.jar` and `test-2.11.jar` and improve the regression test to use the suitable jar file. ## How was this patch tested? Pass the existing Jenkins test. Author: Dongjoon Hyun <dongjoon@apache.org> Closes #11744 from dongjoon-hyun/SPARK-12653.
Diffstat (limited to 'sql')
-rw-r--r--sql/hive/src/test/resources/regression-test-SPARK-8489/test-2.10.jarbin0 -> 6873 bytes
-rw-r--r--sql/hive/src/test/resources/regression-test-SPARK-8489/test-2.11.jarbin0 -> 7039 bytes
-rw-r--r--sql/hive/src/test/resources/regression-test-SPARK-8489/test.jarbin6828 -> 0 bytes
-rw-r--r--sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSparkSubmitSuite.scala9
4 files changed, 7 insertions, 2 deletions
diff --git a/sql/hive/src/test/resources/regression-test-SPARK-8489/test-2.10.jar b/sql/hive/src/test/resources/regression-test-SPARK-8489/test-2.10.jar
new file mode 100644
index 0000000000..26d410f330
--- /dev/null
+++ b/sql/hive/src/test/resources/regression-test-SPARK-8489/test-2.10.jar
Binary files differ
diff --git a/sql/hive/src/test/resources/regression-test-SPARK-8489/test-2.11.jar b/sql/hive/src/test/resources/regression-test-SPARK-8489/test-2.11.jar
new file mode 100644
index 0000000000..f34784752f
--- /dev/null
+++ b/sql/hive/src/test/resources/regression-test-SPARK-8489/test-2.11.jar
Binary files differ
diff --git a/sql/hive/src/test/resources/regression-test-SPARK-8489/test.jar b/sql/hive/src/test/resources/regression-test-SPARK-8489/test.jar
deleted file mode 100644
index 5944aa6076..0000000000
--- a/sql/hive/src/test/resources/regression-test-SPARK-8489/test.jar
+++ /dev/null
Binary files differ
diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSparkSubmitSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSparkSubmitSuite.scala
index 12a5542bd4..c14c94f4c9 100644
--- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSparkSubmitSuite.scala
+++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSparkSubmitSuite.scala
@@ -22,6 +22,7 @@ import java.sql.Timestamp
import java.util.Date
import scala.collection.mutable.ArrayBuffer
+import scala.tools.nsc.Properties
import org.scalatest.{BeforeAndAfterEach, Matchers}
import org.scalatest.concurrent.Timeouts
@@ -87,13 +88,17 @@ class HiveSparkSubmitSuite
runSparkSubmit(args)
}
- ignore("SPARK-8489: MissingRequirementError during reflection") {
+ test("SPARK-8489: MissingRequirementError during reflection") {
// This test uses a pre-built jar to test SPARK-8489. In a nutshell, this test creates
// a HiveContext and uses it to create a data frame from an RDD using reflection.
// Before the fix in SPARK-8470, this results in a MissingRequirementError because
// the HiveContext code mistakenly overrides the class loader that contains user classes.
// For more detail, see sql/hive/src/test/resources/regression-test-SPARK-8489/*scala.
- val testJar = "sql/hive/src/test/resources/regression-test-SPARK-8489/test.jar"
+ val version = Properties.versionNumberString match {
+ case v if v.startsWith("2.10") || v.startsWith("2.11") => v.substring(0, 4)
+ case x => throw new Exception(s"Unsupported Scala Version: $x")
+ }
+ val testJar = s"sql/hive/src/test/resources/regression-test-SPARK-8489/test-$version.jar"
val args = Seq(
"--conf", "spark.ui.enabled=false",
"--conf", "spark.master.rest.enabled=false",