Repository: spark
Updated Branches:
refs/heads/master b34890119 -> df05fb63a
[SPARK-23743][SQL] Changed a comparison logic from containing 'slf4j' to
starting with 'org.slf4j'
## What changes were proposed in this pull request?
isSharedClass returns if some classes can/should be shared or not. It checks if
the classes names have some keywords or start with some names. Following the
logic, it can occur unintended behaviors when a custom package has `slf4j`
inside the package or class name. As I guess, the first intention seems to
figure out the class containing `org.slf4j`. It would be better to change the
comparison logic to `name.startsWith("org.slf4j")`
## How was this patch tested?
This patch should pass all of the current tests and keep all of the current
behaviors. In my case, I'm using ProtobufDeserializer to get a table schema
from hive tables. Thus some Protobuf packages and names have `slf4j` inside.
Without this patch, it cannot be resolved because of ClassCastException from
different classloaders.
Author: Jongyoul Lee <jongy...@gmail.com>
Closes #20860 from jongyoul/SPARK-23743.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/df05fb63
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/df05fb63
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/df05fb63
Branch: refs/heads/master
Commit: df05fb63abe6018ccbe572c34cf65fc3ecbf1166
Parents: b348901
Author: Jongyoul Lee <jongy...@gmail.com>
Authored: Fri Mar 30 14:07:35 2018 +0800
Committer: jerryshao <ss...@hortonworks.com>
Committed: Fri Mar 30 14:07:35 2018 +0800
----------------------------------------------------------------------
.../org/apache/spark/sql/hive/client/IsolatedClientLoader.scala | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/df05fb63/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/IsolatedClientLoader.scala
----------------------------------------------------------------------
diff --git
a/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/IsolatedClientLoader.scala
b/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/IsolatedClientLoader.scala
index 12975bc..c2690ec 100644
---
a/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/IsolatedClientLoader.scala
+++
b/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/IsolatedClientLoader.scala
@@ -179,8 +179,9 @@ private[hive] class IsolatedClientLoader(
val isHadoopClass =
name.startsWith("org.apache.hadoop.") &&
!name.startsWith("org.apache.hadoop.hive.")
- name.contains("slf4j") ||
- name.contains("log4j") ||
+ name.startsWith("org.slf4j") ||
+ name.startsWith("org.apache.log4j") || // log4j1.x
+ name.startsWith("org.apache.logging.log4j") || // log4j2
name.startsWith("org.apache.spark.") ||
(sharesHadoopClasses && isHadoopClass) ||
name.startsWith("scala.") ||
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
