From 192ce305f05d4280c5c35b94a3666d313dab2733 Mon Sep 17 00:00:00 2001 From: Jongyoul Lee Date: Tue, 20 Mar 2018 10:45:44 +0900 Subject: [PATCH 1/2] Changed a comparison logic from containing 'slf4j' to starting with 'org.slf4j' --- .../org/apache/spark/sql/hive/client/IsolatedClientLoader.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 12975bc85b97..3b585de09fb4 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,7 +179,7 @@ private[hive] class IsolatedClientLoader( val isHadoopClass = name.startsWith("org.apache.hadoop.") && !name.startsWith("org.apache.hadoop.hive.") - name.contains("slf4j") || + name.startsWith("org.slf4j") || name.contains("log4j") || name.startsWith("org.apache.spark.") || (sharesHadoopClasses && isHadoopClass) || From 2ea9b7a58279d0e5d7cdfad8d67ab9227983be1a Mon Sep 17 00:00:00 2001 From: Jongyoul Lee Date: Fri, 23 Mar 2018 16:16:59 +0900 Subject: [PATCH 2/2] Changed a comparison logic from containing 'log4j' to starting with 'org.apache.*log4j' --- .../apache/spark/sql/hive/client/IsolatedClientLoader.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 3b585de09fb4..c2690ec32b9e 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 @@ -180,7 +180,8 @@ private[hive] class IsolatedClientLoader( name.startsWith("org.apache.hadoop.") && !name.startsWith("org.apache.hadoop.hive.") name.startsWith("org.slf4j") || - name.contains("log4j") || + name.startsWith("org.apache.log4j") || // log4j1.x + name.startsWith("org.apache.logging.log4j") || // log4j2 name.startsWith("org.apache.spark.") || (sharesHadoopClasses && isHadoopClass) || name.startsWith("scala.") ||