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 d96457909 [CELEBORN-1911] Move multipart-uploader to
multipart-uploader/multipart-uploader-s3 for extensibility
d96457909 is described below
commit d96457909db5fccae47a6eb1fcc702091d2a1c3f
Author: veli.yang <[email protected]>
AuthorDate: Fri Mar 14 22:34:32 2025 +0800
[CELEBORN-1911] Move multipart-uploader to
multipart-uploader/multipart-uploader-s3 for extensibility
### What changes were proposed in this pull request?
- close [CELEBORN-1911](https://issues.apache.org/jira/browse/CELEBORN-1911)
This PR refactors the project structure by moving the multipart-uploader
module into multipart-uploader/multipart-uploader-s3.
### Why are the changes needed?
This change improves modularity and enables future extensions, such as
multipart-uploader/multipart-uploader-oss, allowing better support for multiple
object storage backends.
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
Deployment integration testing has been completed in the local environment.
Closes #3153 from shouwangyw/optimize/mpu-s3.
Authored-by: veli.yang <[email protected]>
Signed-off-by: mingji <[email protected]>
---
multipart-uploader/{ => multipart-uploader-s3}/pom.xml | 6 +++---
.../src/main/java/org/apache/celeborn/S3MultipartUploadHandler.java | 0
pom.xml | 2 +-
project/CelebornBuild.scala | 2 +-
worker/pom.xml | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/multipart-uploader/pom.xml
b/multipart-uploader/multipart-uploader-s3/pom.xml
similarity index 92%
rename from multipart-uploader/pom.xml
rename to multipart-uploader/multipart-uploader-s3/pom.xml
index 15ffeb8dc..999e9a438 100644
--- a/multipart-uploader/pom.xml
+++ b/multipart-uploader/multipart-uploader-s3/pom.xml
@@ -21,12 +21,12 @@
<groupId>org.apache.celeborn</groupId>
<artifactId>celeborn-parent_${scala.binary.version}</artifactId>
<version>${project.version}</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>celeborn-multipart-uploader_${scala.binary.version}</artifactId>
+
<artifactId>celeborn-multipart-uploader-s3_${scala.binary.version}</artifactId>
<packaging>jar</packaging>
- <name>Celeborn Multipart Uploader</name>
+ <name>Celeborn Multipart Uploader S3</name>
<dependencies>
<dependency>
diff --git
a/multipart-uploader/src/main/java/org/apache/celeborn/S3MultipartUploadHandler.java
b/multipart-uploader/multipart-uploader-s3/src/main/java/org/apache/celeborn/S3MultipartUploadHandler.java
similarity index 100%
rename from
multipart-uploader/src/main/java/org/apache/celeborn/S3MultipartUploadHandler.java
rename to
multipart-uploader/multipart-uploader-s3/src/main/java/org/apache/celeborn/S3MultipartUploadHandler.java
diff --git a/pom.xml b/pom.xml
index 081033fbf..e5ad162d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1345,7 +1345,7 @@
<profile>
<id>aws</id>
<modules>
- <module>multipart-uploader</module>
+ <module>multipart-uploader/multipart-uploader-s3</module>
</modules>
<properties>
<aws-deps>true</aws-deps>
diff --git a/project/CelebornBuild.scala b/project/CelebornBuild.scala
index d29e3ce27..c45ba1dba 100644
--- a/project/CelebornBuild.scala
+++ b/project/CelebornBuild.scala
@@ -569,7 +569,7 @@ object CeleborMPU {
lazy val hadoopAwsDependencies = Seq(Dependencies.hadoopAws,
Dependencies.awsS3)
- lazy val celeborMPU = Project("celeborn-multipart-uploader",
file("multipart-uploader"))
+ lazy val celeborMPU = Project("celeborn-multipart-uploader-s3",
file("multipart-uploader/multipart-uploader-s3"))
.dependsOn(CelebornService.service % "test->test;compile->compile")
.settings (
commonSettings,
diff --git a/worker/pom.xml b/worker/pom.xml
index 12aed185b..12dc7c941 100644
--- a/worker/pom.xml
+++ b/worker/pom.xml
@@ -148,7 +148,7 @@
<dependencies>
<dependency>
<groupId>org.apache.celeborn</groupId>
-
<artifactId>celeborn-multipart-uploader_${scala.binary.version}</artifactId>
+
<artifactId>celeborn-multipart-uploader-s3_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>