Skip to content

[SPARK-23831][SQL] Add org.apache.derby to IsolatedClientLoader #20944

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
wangyum wants to merge 4 commits into from
Closed

[SPARK-23831][SQL] Add org.apache.derby to IsolatedClientLoader #20944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7d5cc71
Add org.apache.derby to IsolatedClientLoader
wangyum Mar 30, 2018
1c801f1
Remove com.sun. and sun.reflect.
wangyum Apr 9, 2018
da36564
Merge remote-tracking branch 'upstream/master' into SPARK-23831
wangyum Jun 21, 2018
7133d7a
Add test case
wangyum Jun 21, 2018
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
1 change: 1 addition & 0 deletions 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 @@ -182,6 +182,7 @@ private[hive] class IsolatedClientLoader(
name.startsWith("org.slf4j") ||
name.startsWith("org.apache.log4j") || // log4j1.x
name.startsWith("org.apache.logging.log4j") || // log4j2
name.startsWith("org.apache.derby.") ||
Copy link
Copy Markdown
Contributor

@holdenk holdenk Jul 13, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So to clarify, this adds derby to the "shared" classes (we might want to mention this above on L139) and presumably this fix is for cases where we have an existing derby version on the class-path which may differ and if that happens we end up with strangeness on the metastore? cc @gatorsmile ?

Like I said, I've run into this issue so I'd like to see a fix :)

name.startsWith("org.apache.spark.") ||
(sharesHadoopClasses && isHadoopClass) ||
name.startsWith("scala.") ||
Expand Down
6 changes: 6 additions & 0 deletions sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveExternalCatalogSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,10 @@ class HiveExternalCatalogSuite extends ExternalCatalogSuite {
catalog.createDatabase(newDb("dbWithNullDesc").copy(description = null), ignoreIfExists = false)
assert(catalog.getDatabase("dbWithNullDesc").description == "")
}

test("SPARK-23831: Add org.apache.derby to IsolatedClientLoader") {
val client1 = HiveUtils.newClientForMetadata(new SparkConf, new Configuration)
val client2 = HiveUtils.newClientForMetadata(new SparkConf, new Configuration)
assert(!client1.equals(client2))
}
}