aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Or <andrew@databricks.com>2015-06-19 17:34:09 -0700
committerYin Huai <yhuai@databricks.com>2015-06-19 17:34:09 -0700
commit093c34838d1db7a9375f36a9a2ab5d96a23ae683 (patch)
tree6e48529750ee071ca640b53bc71762c7be77cbc5
parentb305e377fb0a2ca67d9924b995c51e483a4944ad (diff)
downloadspark-093c34838d1db7a9375f36a9a2ab5d96a23ae683.tar.gz
spark-093c34838d1db7a9375f36a9a2ab5d96a23ae683.tar.bz2
spark-093c34838d1db7a9375f36a9a2ab5d96a23ae683.zip
[SPARK-8498] [SQL] Add regression test for SPARK-8470
**Summary of the problem in SPARK-8470.** When using `HiveContext` to create a data frame of a user case class, Spark throws `scala.reflect.internal.MissingRequirementError` when it tries to infer the schema using reflection. This is caused by `HiveContext` silently overwriting the context class loader containing the user classes. **What this issue is about.** This issue adds regression tests for SPARK-8470, which is already fixed in #6891. We closed SPARK-8470 as a duplicate because it is a different manifestation of the same problem in SPARK-8368. Due to the complexity of the reproduction, this requires us to pre-package a special test jar and include it in the Spark project itself. I tested this with and without the fix in #6891 and verified that it passes only if the fix is present. Author: Andrew Or <andrew@databricks.com> Closes #6909 from andrewor14/SPARK-8498 and squashes the following commits: 5e9d688 [Andrew Or] Add regression test for SPARK-8470
-rw-r--r--sql/hive/src/test/resources/regression-test-SPARK-8498/Main.scala43
-rw-r--r--sql/hive/src/test/resources/regression-test-SPARK-8498/MyCoolClass.scala20
-rw-r--r--sql/hive/src/test/resources/regression-test-SPARK-8498/test.jarbin0 -> 6811 bytes
-rw-r--r--sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSparkSubmitSuite.scala13
4 files changed, 76 insertions, 0 deletions
diff --git a/sql/hive/src/test/resources/regression-test-SPARK-8498/Main.scala b/sql/hive/src/test/resources/regression-test-SPARK-8498/Main.scala
new file mode 100644
index 0000000000..858dd6b5dd
--- /dev/null
+++ b/sql/hive/src/test/resources/regression-test-SPARK-8498/Main.scala
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.spark.{SparkConf, SparkContext}
+import org.apache.spark.sql.hive.HiveContext
+
+/**
+ * Entry point in test application for SPARK-8498.
+ *
+ * This file is not meant to be compiled during tests. It is already included
+ * in a pre-built "test.jar" located in the same directory as this file.
+ * This is included here for reference only and should NOT be modified without
+ * rebuilding the test jar itself.
+ *
+ * This is used in org.apache.spark.sql.hive.HiveSparkSubmitSuite.
+ */
+object Main {
+ def main(args: Array[String]) {
+ println("Running regression test for SPARK-8498.")
+ val sc = new SparkContext("local", "testing")
+ val hc = new HiveContext(sc)
+ // This line should not throw scala.reflect.internal.MissingRequirementError.
+ // See SPARK-8470 for more detail.
+ val df = hc.createDataFrame(Seq(MyCoolClass("1", "2", "3")))
+ df.collect()
+ println("Regression test for SPARK-8498 success!")
+ }
+}
+
diff --git a/sql/hive/src/test/resources/regression-test-SPARK-8498/MyCoolClass.scala b/sql/hive/src/test/resources/regression-test-SPARK-8498/MyCoolClass.scala
new file mode 100644
index 0000000000..a72c063a38
--- /dev/null
+++ b/sql/hive/src/test/resources/regression-test-SPARK-8498/MyCoolClass.scala
@@ -0,0 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** Dummy class used in regression test SPARK-8498. */
+case class MyCoolClass(past: String, present: String, future: String)
+
diff --git a/sql/hive/src/test/resources/regression-test-SPARK-8498/test.jar b/sql/hive/src/test/resources/regression-test-SPARK-8498/test.jar
new file mode 100644
index 0000000000..4f59fba9ea
--- /dev/null
+++ b/sql/hive/src/test/resources/regression-test-SPARK-8498/test.jar
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 7963abf3b9..820af801a7 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
@@ -35,6 +35,8 @@ class HiveSparkSubmitSuite
with ResetSystemProperties
with Timeouts {
+ // TODO: rewrite these or mark them as slow tests to be run sparingly
+
def beforeAll() {
System.setProperty("spark.testing", "true")
}
@@ -65,6 +67,17 @@ class HiveSparkSubmitSuite
runSparkSubmit(args)
}
+ test("SPARK-8498: MissingRequirementError during reflection") {
+ // This test uses a pre-built jar to test SPARK-8498. 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-8498/*scala.
+ val testJar = "sql/hive/src/test/resources/regression-test-SPARK-8498/test.jar"
+ val args = Seq("--class", "Main", testJar)
+ runSparkSubmit(args)
+ }
+
// NOTE: This is an expensive operation in terms of time (10 seconds+). Use sparingly.
// This is copied from org.apache.spark.deploy.SparkSubmitSuite
private def runSparkSubmit(args: Seq[String]): Unit = {