This is an automated email from the ASF dual-hosted git repository.
ethanfeng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/celeborn.git
The following commit(s) were added to refs/heads/main by this push:
new 7188e845f [CELEBORN-1327][FOLLOWUP] Simplify DirectByteBuffer
constructor lookup logic
7188e845f is described below
commit 7188e845f764b546d5e2b30b0f47cdcf715c70fe
Author: SteNicholas <[email protected]>
AuthorDate: Fri Jun 7 16:23:32 2024 +0800
[CELEBORN-1327][FOLLOWUP] Simplify DirectByteBuffer constructor lookup logic
### What changes were proposed in this pull request?
Simplify `DirectByteBuffer` constructor lookup logic in `Platform`.
Meanwhile, bump `commons-lang3` version from `3.12.0` to `3.13.0`.
### Why are the changes needed?
`try-catch` statement is not needed because we know version number already.
Backport:
- https://github.com/apache/spark/pull/41780
- https://github.com/apache/spark/pull/42269
- https://github.com/apache/spark/pull/44444
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
GA.
Closes #2544 from SteNicholas/CELEBORN-1327.
Authored-by: SteNicholas <[email protected]>
Signed-off-by: mingji <[email protected]>
---
.../java/org/apache/celeborn/common/unsafe/Platform.java | 13 ++++---------
dev/deps/dependencies-client-flink-1.14 | 2 +-
dev/deps/dependencies-client-flink-1.15 | 2 +-
dev/deps/dependencies-client-flink-1.17 | 2 +-
dev/deps/dependencies-client-flink-1.18 | 2 +-
dev/deps/dependencies-client-flink-1.19 | 2 +-
dev/deps/dependencies-client-mr | 2 +-
dev/deps/dependencies-client-spark-2.4 | 2 +-
dev/deps/dependencies-client-spark-3.0 | 2 +-
dev/deps/dependencies-client-spark-3.1 | 2 +-
dev/deps/dependencies-client-spark-3.2 | 2 +-
dev/deps/dependencies-client-spark-3.3 | 2 +-
dev/deps/dependencies-client-spark-3.4 | 2 +-
dev/deps/dependencies-client-spark-3.5 | 2 +-
dev/deps/dependencies-server | 2 +-
pom.xml | 2 +-
project/CelebornBuild.scala | 2 +-
17 files changed, 20 insertions(+), 25 deletions(-)
diff --git
a/common/src/main/java/org/apache/celeborn/common/unsafe/Platform.java
b/common/src/main/java/org/apache/celeborn/common/unsafe/Platform.java
index 278630e4f..d281ff33e 100644
--- a/common/src/main/java/org/apache/celeborn/common/unsafe/Platform.java
+++ b/common/src/main/java/org/apache/celeborn/common/unsafe/Platform.java
@@ -90,15 +90,10 @@ public final class Platform {
}
try {
Class<?> cls = Class.forName("java.nio.DirectByteBuffer");
- Constructor<?> constructor;
- try {
- constructor = cls.getDeclaredConstructor(Long.TYPE, Integer.TYPE);
- } catch (NoSuchMethodException e) {
- // DirectByteBuffer(long,int) was removed in
- //
https://github.com/openjdk/jdk/commit/a56598f5a534cc9223367e7faa8433ea38661db9
- constructor = cls.getDeclaredConstructor(Long.TYPE, Long.TYPE);
- }
-
+ Constructor<?> constructor =
+ SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_21)
+ ? cls.getDeclaredConstructor(Long.TYPE, Long.TYPE)
+ : cls.getDeclaredConstructor(Long.TYPE, Integer.TYPE);
Field cleanerField = cls.getDeclaredField("cleaner");
try {
constructor.setAccessible(true);
diff --git a/dev/deps/dependencies-client-flink-1.14
b/dev/deps/dependencies-client-flink-1.14
index 9c2fc4476..663a7ee65 100644
--- a/dev/deps/dependencies-client-flink-1.14
+++ b/dev/deps/dependencies-client-flink-1.14
@@ -18,7 +18,7 @@
RoaringBitmap/1.0.6//RoaringBitmap-1.0.6.jar
commons-crypto/1.0.0//commons-crypto-1.0.0.jar
commons-io/2.13.0//commons-io-2.13.0.jar
-commons-lang3/3.12.0//commons-lang3-3.12.0.jar
+commons-lang3/3.13.0//commons-lang3-3.13.0.jar
commons-logging/1.1.3//commons-logging-1.1.3.jar
failureaccess/1.0.2//failureaccess-1.0.2.jar
guava/33.1.0-jre//guava-33.1.0-jre.jar
diff --git a/dev/deps/dependencies-client-flink-1.15
b/dev/deps/dependencies-client-flink-1.15
index 9c2fc4476..663a7ee65 100644
--- a/dev/deps/dependencies-client-flink-1.15
+++ b/dev/deps/dependencies-client-flink-1.15
@@ -18,7 +18,7 @@
RoaringBitmap/1.0.6//RoaringBitmap-1.0.6.jar
commons-crypto/1.0.0//commons-crypto-1.0.0.jar
commons-io/2.13.0//commons-io-2.13.0.jar
-commons-lang3/3.12.0//commons-lang3-3.12.0.jar
+commons-lang3/3.13.0//commons-lang3-3.13.0.jar
commons-logging/1.1.3//commons-logging-1.1.3.jar
failureaccess/1.0.2//failureaccess-1.0.2.jar
guava/33.1.0-jre//guava-33.1.0-jre.jar
diff --git a/dev/deps/dependencies-client-flink-1.17
b/dev/deps/dependencies-client-flink-1.17
index 9c2fc4476..663a7ee65 100644
--- a/dev/deps/dependencies-client-flink-1.17
+++ b/dev/deps/dependencies-client-flink-1.17
@@ -18,7 +18,7 @@
RoaringBitmap/1.0.6//RoaringBitmap-1.0.6.jar
commons-crypto/1.0.0//commons-crypto-1.0.0.jar
commons-io/2.13.0//commons-io-2.13.0.jar
-commons-lang3/3.12.0//commons-lang3-3.12.0.jar
+commons-lang3/3.13.0//commons-lang3-3.13.0.jar
commons-logging/1.1.3//commons-logging-1.1.3.jar
failureaccess/1.0.2//failureaccess-1.0.2.jar
guava/33.1.0-jre//guava-33.1.0-jre.jar
diff --git a/dev/deps/dependencies-client-flink-1.18
b/dev/deps/dependencies-client-flink-1.18
index 9c2fc4476..663a7ee65 100644
--- a/dev/deps/dependencies-client-flink-1.18
+++ b/dev/deps/dependencies-client-flink-1.18
@@ -18,7 +18,7 @@
RoaringBitmap/1.0.6//RoaringBitmap-1.0.6.jar
commons-crypto/1.0.0//commons-crypto-1.0.0.jar
commons-io/2.13.0//commons-io-2.13.0.jar
-commons-lang3/3.12.0//commons-lang3-3.12.0.jar
+commons-lang3/3.13.0//commons-lang3-3.13.0.jar
commons-logging/1.1.3//commons-logging-1.1.3.jar
failureaccess/1.0.2//failureaccess-1.0.2.jar
guava/33.1.0-jre//guava-33.1.0-jre.jar
diff --git a/dev/deps/dependencies-client-flink-1.19
b/dev/deps/dependencies-client-flink-1.19
index 9c2fc4476..663a7ee65 100644
--- a/dev/deps/dependencies-client-flink-1.19
+++ b/dev/deps/dependencies-client-flink-1.19
@@ -18,7 +18,7 @@
RoaringBitmap/1.0.6//RoaringBitmap-1.0.6.jar
commons-crypto/1.0.0//commons-crypto-1.0.0.jar
commons-io/2.13.0//commons-io-2.13.0.jar
-commons-lang3/3.12.0//commons-lang3-3.12.0.jar
+commons-lang3/3.13.0//commons-lang3-3.13.0.jar
commons-logging/1.1.3//commons-logging-1.1.3.jar
failureaccess/1.0.2//failureaccess-1.0.2.jar
guava/33.1.0-jre//guava-33.1.0-jre.jar
diff --git a/dev/deps/dependencies-client-mr b/dev/deps/dependencies-client-mr
index 82dc2cb11..ac08f3ae6 100644
--- a/dev/deps/dependencies-client-mr
+++ b/dev/deps/dependencies-client-mr
@@ -31,7 +31,7 @@ commons-configuration2/2.8.0//commons-configuration2-2.8.0.jar
commons-crypto/1.0.0//commons-crypto-1.0.0.jar
commons-daemon/1.0.13//commons-daemon-1.0.13.jar
commons-io/2.13.0//commons-io-2.13.0.jar
-commons-lang3/3.12.0//commons-lang3-3.12.0.jar
+commons-lang3/3.13.0//commons-lang3-3.13.0.jar
commons-logging/1.1.3//commons-logging-1.1.3.jar
commons-math3/3.1.1//commons-math3-3.1.1.jar
commons-net/3.9.0//commons-net-3.9.0.jar
diff --git a/dev/deps/dependencies-client-spark-2.4
b/dev/deps/dependencies-client-spark-2.4
index 72cd055c0..ffd8784d5 100644
--- a/dev/deps/dependencies-client-spark-2.4
+++ b/dev/deps/dependencies-client-spark-2.4
@@ -18,7 +18,7 @@
RoaringBitmap/1.0.6//RoaringBitmap-1.0.6.jar
commons-crypto/1.0.0//commons-crypto-1.0.0.jar
commons-io/2.13.0//commons-io-2.13.0.jar
-commons-lang3/3.12.0//commons-lang3-3.12.0.jar
+commons-lang3/3.13.0//commons-lang3-3.13.0.jar
commons-logging/1.1.3//commons-logging-1.1.3.jar
failureaccess/1.0.2//failureaccess-1.0.2.jar
guava/33.1.0-jre//guava-33.1.0-jre.jar
diff --git a/dev/deps/dependencies-client-spark-3.0
b/dev/deps/dependencies-client-spark-3.0
index edd9f4264..7f8229cf7 100644
--- a/dev/deps/dependencies-client-spark-3.0
+++ b/dev/deps/dependencies-client-spark-3.0
@@ -18,7 +18,7 @@
RoaringBitmap/1.0.6//RoaringBitmap-1.0.6.jar
commons-crypto/1.0.0//commons-crypto-1.0.0.jar
commons-io/2.13.0//commons-io-2.13.0.jar
-commons-lang3/3.12.0//commons-lang3-3.12.0.jar
+commons-lang3/3.13.0//commons-lang3-3.13.0.jar
commons-logging/1.1.3//commons-logging-1.1.3.jar
failureaccess/1.0.2//failureaccess-1.0.2.jar
guava/33.1.0-jre//guava-33.1.0-jre.jar
diff --git a/dev/deps/dependencies-client-spark-3.1
b/dev/deps/dependencies-client-spark-3.1
index 9372233f7..45b114c51 100644
--- a/dev/deps/dependencies-client-spark-3.1
+++ b/dev/deps/dependencies-client-spark-3.1
@@ -18,7 +18,7 @@
RoaringBitmap/1.0.6//RoaringBitmap-1.0.6.jar
commons-crypto/1.0.0//commons-crypto-1.0.0.jar
commons-io/2.13.0//commons-io-2.13.0.jar
-commons-lang3/3.12.0//commons-lang3-3.12.0.jar
+commons-lang3/3.13.0//commons-lang3-3.13.0.jar
commons-logging/1.1.3//commons-logging-1.1.3.jar
failureaccess/1.0.2//failureaccess-1.0.2.jar
guava/33.1.0-jre//guava-33.1.0-jre.jar
diff --git a/dev/deps/dependencies-client-spark-3.2
b/dev/deps/dependencies-client-spark-3.2
index 3913a6fc1..1a0240918 100644
--- a/dev/deps/dependencies-client-spark-3.2
+++ b/dev/deps/dependencies-client-spark-3.2
@@ -18,7 +18,7 @@
RoaringBitmap/1.0.6//RoaringBitmap-1.0.6.jar
commons-crypto/1.0.0//commons-crypto-1.0.0.jar
commons-io/2.13.0//commons-io-2.13.0.jar
-commons-lang3/3.12.0//commons-lang3-3.12.0.jar
+commons-lang3/3.13.0//commons-lang3-3.13.0.jar
commons-logging/1.1.3//commons-logging-1.1.3.jar
failureaccess/1.0.2//failureaccess-1.0.2.jar
guava/33.1.0-jre//guava-33.1.0-jre.jar
diff --git a/dev/deps/dependencies-client-spark-3.3
b/dev/deps/dependencies-client-spark-3.3
index 945c35808..3757d7575 100644
--- a/dev/deps/dependencies-client-spark-3.3
+++ b/dev/deps/dependencies-client-spark-3.3
@@ -18,7 +18,7 @@
RoaringBitmap/1.0.6//RoaringBitmap-1.0.6.jar
commons-crypto/1.0.0//commons-crypto-1.0.0.jar
commons-io/2.13.0//commons-io-2.13.0.jar
-commons-lang3/3.12.0//commons-lang3-3.12.0.jar
+commons-lang3/3.13.0//commons-lang3-3.13.0.jar
commons-logging/1.1.3//commons-logging-1.1.3.jar
failureaccess/1.0.2//failureaccess-1.0.2.jar
guava/33.1.0-jre//guava-33.1.0-jre.jar
diff --git a/dev/deps/dependencies-client-spark-3.4
b/dev/deps/dependencies-client-spark-3.4
index 6652a37cb..7d048d852 100644
--- a/dev/deps/dependencies-client-spark-3.4
+++ b/dev/deps/dependencies-client-spark-3.4
@@ -18,7 +18,7 @@
RoaringBitmap/1.0.6//RoaringBitmap-1.0.6.jar
commons-crypto/1.0.0//commons-crypto-1.0.0.jar
commons-io/2.13.0//commons-io-2.13.0.jar
-commons-lang3/3.12.0//commons-lang3-3.12.0.jar
+commons-lang3/3.13.0//commons-lang3-3.13.0.jar
commons-logging/1.1.3//commons-logging-1.1.3.jar
failureaccess/1.0.2//failureaccess-1.0.2.jar
guava/33.1.0-jre//guava-33.1.0-jre.jar
diff --git a/dev/deps/dependencies-client-spark-3.5
b/dev/deps/dependencies-client-spark-3.5
index a2cffa8a4..d82ac0f97 100644
--- a/dev/deps/dependencies-client-spark-3.5
+++ b/dev/deps/dependencies-client-spark-3.5
@@ -18,7 +18,7 @@
RoaringBitmap/1.0.6//RoaringBitmap-1.0.6.jar
commons-crypto/1.0.0//commons-crypto-1.0.0.jar
commons-io/2.13.0//commons-io-2.13.0.jar
-commons-lang3/3.12.0//commons-lang3-3.12.0.jar
+commons-lang3/3.13.0//commons-lang3-3.13.0.jar
commons-logging/1.1.3//commons-logging-1.1.3.jar
failureaccess/1.0.2//failureaccess-1.0.2.jar
guava/33.1.0-jre//guava-33.1.0-jre.jar
diff --git a/dev/deps/dependencies-server b/dev/deps/dependencies-server
index d3f491677..edc800ee2 100644
--- a/dev/deps/dependencies-server
+++ b/dev/deps/dependencies-server
@@ -23,7 +23,7 @@ classgraph/4.8.138//classgraph-4.8.138.jar
commons-cli/1.5.0//commons-cli-1.5.0.jar
commons-crypto/1.0.0//commons-crypto-1.0.0.jar
commons-io/2.13.0//commons-io-2.13.0.jar
-commons-lang3/3.12.0//commons-lang3-3.12.0.jar
+commons-lang3/3.13.0//commons-lang3-3.13.0.jar
commons-logging/1.1.3//commons-logging-1.1.3.jar
failureaccess/1.0.2//failureaccess-1.0.2.jar
guava/33.1.0-jre//guava-33.1.0-jre.jar
diff --git a/pom.xml b/pom.xml
index 7d9374d00..2f4b95eba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,7 +75,7 @@
the link to metrics.dropwizard.io in docs/monitoring.md.
-->
<codahale.metrics.version>4.2.25</codahale.metrics.version>
- <commons-lang3.version>3.12.0</commons-lang3.version>
+ <commons-lang3.version>3.13.0</commons-lang3.version>
<commons-io.version>2.13.0</commons-io.version>
<commons-crypto.version>1.0.0</commons-crypto.version>
<!-- last version to support compilation in java 8. See
https://errorprone.info/docs/installation#:~:text=you%20are%20using.-,JDK%208,-Error%20Prone%202.10.0
-->
diff --git a/project/CelebornBuild.scala b/project/CelebornBuild.scala
index 9b0f794bf..9c7d54b75 100644
--- a/project/CelebornBuild.scala
+++ b/project/CelebornBuild.scala
@@ -43,7 +43,7 @@ object Dependencies {
val commonsCryptoVersion = "1.0.0"
val commonsIoVersion = "2.13.0"
val commonsLoggingVersion = "1.1.3"
- val commonsLang3Version = "3.12.0"
+ val commonsLang3Version = "3.13.0"
val findbugsVersion = "1.3.9"
val guavaVersion = "33.1.0-jre"
val hadoopVersion = "3.3.6"
