From 4d9a66f9f67484d3c83ac77890017cfadd3bd877 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Tue, 22 Aug 2023 14:12:52 +0800 Subject: [PATCH 1/3] Remove Guava from shared classes from IsolatedClientLoader --- .../apache/spark/sql/hive/client/IsolatedClientLoader.scala | 4 +--- 1 file changed, 1 insertion(+), 3 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 74b33e6437fb..af092fa3d329 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,8 +124,7 @@ private[hive] object IsolatedClientLoader extends Logging { } val hiveArtifacts = version.extraDeps ++ Seq("hive-metastore", "hive-exec", "hive-common", "hive-serde") - .map(a => s"org.apache.hive:$a:${version.fullVersion}") ++ - Seq("com.google.guava:guava:14.0.1") ++ hadoopJarNames + .map(a => s"org.apache.hive:$a:${version.fullVersion}") ++ hadoopJarNames implicit val printStream: PrintStream = SparkSubmit.printStream val classpaths = quietly { @@ -207,7 +206,6 @@ private[hive] class IsolatedClientLoader( name.startsWith("org.apache.spark.") || isHadoopClass || name.startsWith("scala.") || - (name.startsWith("com.google") && !name.startsWith("com.google.cloud")) || name.startsWith("java.") || name.startsWith("javax.sql.") || sharedPrefixes.exists(name.startsWith) From 45d0f8c3bca95fc549afb2fff4f416d2377781c0 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Wed, 23 Aug 2023 09:36:18 +0800 Subject: [PATCH 2/3] add back guava 14 as extra deps --- .../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 af092fa3d329..de47c814fd29 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,8 @@ private[hive] object IsolatedClientLoader extends Logging { } val hiveArtifacts = version.extraDeps ++ Seq("hive-metastore", "hive-exec", "hive-common", "hive-serde") - .map(a => s"org.apache.hive:$a:${version.fullVersion}") ++ hadoopJarNames + .map(a => s"org.apache.hive:$a:${version.fullVersion}") ++ + Seq("com.google.guava:guava:14.0.1") ++ hadoopJarNames implicit val printStream: PrintStream = SparkSubmit.printStream val classpaths = quietly { From 537b1df90305b04b36ac262180f247b7b7e73a79 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Mon, 25 Sep 2023 00:19:32 +0800 Subject: [PATCH 3/3] Revert "add back guava 14 as extra deps" This reverts commit 75e3c367050d9c4e3a0a96efbeecaae1beaa44ca. --- .../apache/spark/sql/hive/client/IsolatedClientLoader.scala | 3 +-- 1 file changed, 1 insertion(+), 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 de47c814fd29..af092fa3d329 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,8 +124,7 @@ private[hive] object IsolatedClientLoader extends Logging { } val hiveArtifacts = version.extraDeps ++ Seq("hive-metastore", "hive-exec", "hive-common", "hive-serde") - .map(a => s"org.apache.hive:$a:${version.fullVersion}") ++ - Seq("com.google.guava:guava:14.0.1") ++ hadoopJarNames + .map(a => s"org.apache.hive:$a:${version.fullVersion}") ++ hadoopJarNames implicit val printStream: PrintStream = SparkSubmit.printStream val classpaths = quietly {