Skip to content

Commit

Permalink
Add regression test for SPARK-8470
Browse files Browse the repository at this point in the history
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. This test jar is then used in HiveSparkSubmitSuite.
  • Loading branch information
Andrew Or committed Jun 19, 2015
1 parent 54976e5 commit 5e9d688
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 0 deletions.
43 changes: 43 additions & 0 deletions sql/hive/src/test/resources/regression-test-SPARK-8498/Main.scala
Original file line number Diff line number Diff line change
@@ -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!")
}
}

Original file line number Diff line number Diff line change
@@ -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)

Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down Expand Up @@ -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 = {
Expand Down

0 comments on commit 5e9d688

Please sign in to comment.