Skip to content

[SPARK-7853] [SQL] Fix bug of class loader issue in Spark SQL #6396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
chenghao-intel wants to merge 2 commits into from
Closed

[SPARK-7853] [SQL] Fix bug of class loader issue in Spark SQL #6396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd78775
workaround for classloader of IsolatedClientLoader
chenghao-intel May 26, 2015
fd26533
scalastyle
chenghao-intel May 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added sql/hive-thriftserver/src/test/resources/data/files/hive-hcatalog-core-0.13.1.jar
View file
Open in desktop
Binary file not shown.
16 changes: 16 additions & 0 deletions sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/CliSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,4 +151,20 @@ class CliSuite extends FunSuite with BeforeAndAfter with Logging {
-> "hive_test"
)
}

test("Single command with --jars") {
val jarFile =
Thread.currentThread().getContextClassLoader
.getResource("data/files/hive-hcatalog-core-0.13.1.jar")
runCliWithin(1.minute,
Seq(
"--jars",
s"$jarFile",
"-e",
"""CREATE TABLE t1(a string, b string) ROW FORMAT
| SERDE 'org.apache.hive.hcatalog.data.JsonSerDe';""".stripMargin))(
""
-> "OK"
)
}
}
2 changes: 1 addition & 1 deletion sql/hive/src/main/scala/org/apache/spark/sql/hive/TableReader.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class HadoopTableReader(
makeRDDForTable(
hiveTable,
Class.forName(
relation.tableDesc.getSerdeClassName, true, Utils.getSparkClassLoader)
relation.tableDesc.getSerdeClassName, true, Utils.getContextOrSparkClassLoader)
.asInstanceOf[Class[Deserializer]],
filterOpt = None)

Expand Down
6 changes: 5 additions & 1 deletion sql/hive/src/main/scala/org/apache/spark/sql/hive/client/IsolatedClientLoader.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ private[hive] class IsolatedClientLoader(
name.startsWith("com.google") ||
name.startsWith("java.lang.") ||
name.startsWith("java.net") ||
name.startsWith("org.apache.hadoop.conf") ||
name.startsWith("org.apache.hadoop.hive.serde") || // TODO keep adding?
sharedPrefixes.exists(name.startsWith)

/** True if `name` refers to a spark class that must see specific version of Hive. */
Expand All @@ -150,7 +152,9 @@ private[hive] class IsolatedClientLoader(
defineClass(name, bytes, 0, bytes.length)
} else if (!isSharedClass(name)) {
logDebug(s"hive class: $name - ${getResource(classToPath(name))}")
super.loadClass(name, resolve)
try super.loadClass(name, resolve) catch {
case _: ClassNotFoundException => baseClassLoader.loadClass(name)
}
} else {
logDebug(s"shared class: $name")
baseClassLoader.loadClass(name)
Expand Down