This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 36d57f8a2973 [SPARK-45874][SQL] Remove Java version check from
`IsolatedClientLoader`
36d57f8a2973 is described below
commit 36d57f8a29736c91b241d2dfa7d7062a6ea8027d
Author: yangjie01 <yangji...@baidu.com>
AuthorDate: Sun Nov 12 14:43:08 2023 -0800
[SPARK-45874][SQL] Remove Java version check from `IsolatedClientLoader`
### What changes were proposed in this pull request?
This pr remove unnecessary Java version check from `IsolatedClientLoader`.
### Why are the changes needed?
Apache Spark 4.0.0 has a minimum requirement of Java 17, so the version
check for Java 9 is not necessary.
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
Pass GitHub Actions
### Was this patch authored or co-authored using generative AI tooling?
No
Closes #43747 from LuciferYang/SPARK-45874.
Authored-by: yangjie01 <yangji...@baidu.com>
Signed-off-by: Dongjoon Hyun <dh...@apple.com>
---
.../sql/hive/client/IsolatedClientLoader.scala | 27 ++++++++--------------
1 file changed, 10 insertions(+), 17 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 4027cd94d415..74b33e6437fb 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
@@ -25,7 +25,6 @@ import java.util
import scala.util.Try
import org.apache.commons.io.{FileUtils, IOUtils}
-import org.apache.commons.lang3.{JavaVersion, SystemUtils}
import org.apache.hadoop.conf.Configuration
import org.apache.hadoop.hive.conf.HiveConf.ConfVars
import org.apache.hadoop.hive.shims.ShimLoader
@@ -233,22 +232,16 @@ private[hive] class IsolatedClientLoader(
private[hive] val classLoader: MutableURLClassLoader = {
val isolatedClassLoader =
if (isolationOn) {
- val rootClassLoader: ClassLoader =
- if (SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9)) {
- // In Java 9, the boot classloader can see few JDK classes. The
intended parent
- // classloader for delegation is now the platform classloader.
- // See http://java9.wtf/class-loading/
- val platformCL =
- classOf[ClassLoader].getMethod("getPlatformClassLoader").
- invoke(null).asInstanceOf[ClassLoader]
- // Check to make sure that the root classloader does not know
about Hive.
-
assert(Try(platformCL.loadClass("org.apache.hadoop.hive.conf.HiveConf")).isFailure)
- platformCL
- } else {
- // The boot classloader is represented by null (the instance
itself isn't accessible)
- // and before Java 9 can see all JDK classes
- null
- }
+ val rootClassLoader: ClassLoader = {
+ // In Java 9, the boot classloader can see few JDK classes. The
intended parent
+ // classloader for delegation is now the platform classloader.
+ // See http://java9.wtf/class-loading/
+ val platformCL =
classOf[ClassLoader].getMethod("getPlatformClassLoader")
+ .invoke(null).asInstanceOf[ClassLoader]
+ // Check to make sure that the root classloader does not know about
Hive.
+
assert(Try(platformCL.loadClass("org.apache.hadoop.hive.conf.HiveConf")).isFailure)
+ platformCL
+ }
new URLClassLoader(allJars, rootClassLoader) {
override def loadClass(name: String, resolve: Boolean): Class[_] = {
val loaded = findLoadedClass(name)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
