From 3abe66c8c3e23e619e8b8414f66c3b5a3f4d729a Mon Sep 17 00:00:00 2001 From: WangTaoTheTonic Date: Tue, 4 Aug 2015 20:52:43 +0800 Subject: [PATCH 1/3] treat hadoop classes as shared one --- .../apache/spark/sql/hive/client/IsolatedClientLoader.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 a7d5a991948d9..1bb9697e3ad10 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 @@ -124,10 +124,10 @@ private[hive] class IsolatedClientLoader( name.contains("slf4j") || name.contains("log4j") || name.startsWith("org.apache.spark.") || + name.startsWith("org.apache.hadoop.") || name.startsWith("scala.") || (name.startsWith("com.google") && !name.startsWith("com.google.cloud")) || - name.startsWith("java.lang.") || - name.startsWith("java.net") || + name.startsWith("java.") || sharedPrefixes.exists(name.startsWith) /** True if `name` refers to a spark class that must see specific version of Hive. */ From cdfbe2439fe389e572ebe7beaee2875cc5404a74 Mon Sep 17 00:00:00 2001 From: WangTaoTheTonic Date: Wed, 5 Aug 2015 18:13:17 +0800 Subject: [PATCH 2/3] just add hadoop --- .../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 1bb9697e3ad10..232392db89440 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 @@ -127,7 +127,8 @@ private[hive] class IsolatedClientLoader( name.startsWith("org.apache.hadoop.") || name.startsWith("scala.") || (name.startsWith("com.google") && !name.startsWith("com.google.cloud")) || - name.startsWith("java.") || + name.startsWith("java.lang.") || + name.startsWith("java.net") || sharedPrefixes.exists(name.startsWith) /** True if `name` refers to a spark class that must see specific version of Hive. */ From 42ea1b57836d4ae6e01d5c6b0d1262e4c34906f0 Mon Sep 17 00:00:00 2001 From: WangTaoTheTonic Date: Thu, 6 Aug 2015 09:51:08 +0800 Subject: [PATCH 3/3] exclude hive classes --- .../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 232392db89440..1a20c188226ea 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 @@ -124,7 +124,7 @@ private[hive] class IsolatedClientLoader( name.contains("slf4j") || name.contains("log4j") || name.startsWith("org.apache.spark.") || - name.startsWith("org.apache.hadoop.") || + (name.startsWith("org.apache.hadoop.") && !name.startsWith("org.apache.hadoop.hive.")) || name.startsWith("scala.") || (name.startsWith("com.google") && !name.startsWith("com.google.cloud")) || name.startsWith("java.lang.") ||