This is an automated email from the ASF dual-hosted git repository. SteNicholas pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/celeborn.git
commit 5f49ed90f7fefcde81876ea056241dd9340b7788 Author: Nicholas Jiang <[email protected]> AuthorDate: Tue Jun 23 20:44:31 2026 +0800 [CELEBORN-2367] Remove Flink 1.16 and 1.17 client support ### What changes were proposed in this pull request? This PR removes Flink 1.16 and Flink 1.17 client support from Celeborn. Specifically: - Delete the `client-flink/flink-1.16`, `client-flink/flink-1.16-shaded`, `client-flink/flink-1.17`, and `client-flink/flink-1.17-shaded` modules, including their shims (`CelebornFlinkShimV116`/`CelebornFlinkShimV117`), service descriptors, license/notice resources, and test suites. - Remove the `flink-1.16` and `flink-1.17` Maven profiles from `pom.xml` and the `Flink116`/`Flink117` SBT projects from `project/CelebornBuild.scala`. - Drop `flink-1.16`/`flink-1.17` from the build and release scripts (`build/make-distribution.sh`, `build/release/release.sh`, `dev/dependencies.sh`, `dev/reformat`) and from CI workflows (`deps.yml`, `license.yml`, `maven.yml`, `sbt.yml`, `style.yml`). - Remove the `v1_16`/`v1_17` entries from the `FlinkVersion` test enum. - Update documentation (`README.md`, `docs/README.md`, `docs/deploy.md`, `docs/developers/overview.md`, `docs/developers/sbt.md`) to reflect the supported Flink versions (1.18/1.19/1.20/2.0/2.1/2.2). ### Why are the changes needed? Flink 1.16 and 1.17 are older releases that are no longer maintained upstream. Dropping them reduces the build/test matrix, maintenance burden, and release artifacts, allowing the project to focus on currently supported Flink versions (1.18 and above). ### Does this PR resolve a correctness bug? - [ ] Yes ### Does this PR introduce _any_ user-facing change? - [x] Yes Celeborn no longer ships or builds Flink 1.16/1.17 client jars. Users running Flink 1.16 or 1.17 must either upgrade to a supported Flink version (1.18+) or stay on a previous Celeborn release. ### How was this patch tested? Existing CI for the remaining Flink versions (1.18/1.19/1.20/2.0/2.1/2.2) via the updated Maven/SBT/style/license/deps workflows. No new functionality is introduced; the change only removes code, build profiles, and references. Closes #3742 from SteNicholas/CELEBORN-2367. Authored-by: Nicholas Jiang <[email protected]> Signed-off-by: Nicholas Jiang <[email protected]> --- .github/workflows/deps.yml | 4 - .github/workflows/license.yml | 2 - .github/workflows/maven.yml | 2 - .github/workflows/sbt.yml | 2 - .github/workflows/style.yml | 2 - README.md | 7 +- build/make-distribution.sh | 4 - build/release/release.sh | 6 - client-flink/flink-1.16-shaded/pom.xml | 150 ------------- .../src/main/resources/META-INF/LICENSE | 248 --------------------- .../src/main/resources/META-INF/NOTICE | 45 ---- .../META-INF/licenses/LICENSE-protobuf.txt | 42 ---- client-flink/flink-1.16/pom.xml | 82 ------- .../plugin/flink/CelebornFlinkShimV116.java | 155 ------------- ....apache.celeborn.plugin.flink.CelebornFlinkShim | 16 -- .../flink/RemoteShuffleMasterSuiteJV116.java | 20 -- ...oteShuffleResultPartitionFactorySuiteJV116.java | 22 -- .../RemoteShuffleResultPartitionSuiteJV116.java | 20 -- .../RemoteShuffleServiceFactorySuiteJV116.java | 20 -- .../flink/ShuffleResourceTrackerSuiteJV116.java | 20 -- client-flink/flink-1.17-shaded/pom.xml | 150 ------------- .../src/main/resources/META-INF/LICENSE | 248 --------------------- .../src/main/resources/META-INF/NOTICE | 45 ---- .../META-INF/licenses/LICENSE-protobuf.txt | 42 ---- client-flink/flink-1.17/pom.xml | 82 ------- .../plugin/flink/CelebornFlinkShimV117.java | 164 -------------- ....apache.celeborn.plugin.flink.CelebornFlinkShim | 16 -- .../flink/RemoteShuffleMasterSuiteJV117.java | 20 -- ...oteShuffleResultPartitionFactorySuiteJV117.java | 22 -- .../RemoteShuffleResultPartitionSuiteJV117.java | 20 -- .../RemoteShuffleServiceFactorySuiteJV117.java | 20 -- .../flink/ShuffleResourceTrackerSuiteJV117.java | 20 -- dev/dependencies.sh | 8 - dev/reformat | 2 - docs/README.md | 4 +- docs/deploy.md | 2 +- docs/developers/overview.md | 2 +- docs/developers/sbt.md | 26 +-- pom.xml | 38 ---- project/CelebornBuild.scala | 29 --- .../apache/celeborn/tests/flink/FlinkVersion.java | 6 - 41 files changed, 18 insertions(+), 1817 deletions(-) diff --git a/.github/workflows/deps.yml b/.github/workflows/deps.yml index efa28a2eb..d2e8cc53c 100644 --- a/.github/workflows/deps.yml +++ b/.github/workflows/deps.yml @@ -48,8 +48,6 @@ jobs: - 'spark-3.3' - 'spark-3.4' - 'spark-3.5' - - 'flink-1.16' - - 'flink-1.17' - 'flink-1.18' - 'flink-1.19' - 'flink-1.20' @@ -80,8 +78,6 @@ jobs: - 'spark-3.3' - 'spark-3.4' - 'spark-3.5' - - 'flink-1.16' - - 'flink-1.17' - 'flink-1.18' - 'flink-1.19' - 'flink-1.20' diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml index 38a861762..a5bf485f7 100644 --- a/.github/workflows/license.yml +++ b/.github/workflows/license.yml @@ -43,8 +43,6 @@ jobs: cache: 'maven' check-latest: false - run: | - build/mvn org.apache.rat:apache-rat-plugin:check -Pgoogle-mirror,flink-1.16 - build/mvn org.apache.rat:apache-rat-plugin:check -Pgoogle-mirror,flink-1.17 build/mvn org.apache.rat:apache-rat-plugin:check -Pgoogle-mirror,flink-1.18 build/mvn org.apache.rat:apache-rat-plugin:check -Pgoogle-mirror,flink-1.19 build/mvn org.apache.rat:apache-rat-plugin:check -Pgoogle-mirror,flink-1.20 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index a6bdd2846..ef6de95ca 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -199,8 +199,6 @@ jobs: - 8 - 11 flink: - - '1.16' - - '1.17' - '1.18' - '1.19' - '1.20' diff --git a/.github/workflows/sbt.yml b/.github/workflows/sbt.yml index 0fa378d8a..875d2108d 100644 --- a/.github/workflows/sbt.yml +++ b/.github/workflows/sbt.yml @@ -248,8 +248,6 @@ jobs: - 8 - 11 flink: - - '1.16' - - '1.17' - '1.18' - '1.19' - '1.20' diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index ecc8b5fad..b85bcc448 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -47,8 +47,6 @@ jobs: cache: 'maven' check-latest: false - run: | - build/mvn spotless:check -Pgoogle-mirror,flink-1.16 - build/mvn spotless:check -Pgoogle-mirror,flink-1.17 build/mvn spotless:check -Pgoogle-mirror,flink-1.18 build/mvn spotless:check -Pgoogle-mirror,flink-1.19 build/mvn spotless:check -Pgoogle-mirror,flink-1.20 diff --git a/README.md b/README.md index 9b55d187d..2188626b7 100644 --- a/README.md +++ b/README.md @@ -41,12 +41,12 @@ Celeborn Worker's slot count is decided by `total usable disk size / average shu Celeborn worker's slot count decreases when a partition is allocated and increments when a partition is freed. ## Build -1. Celeborn supports Spark 2.4/3.0/3.1/3.2/3.3/3.4/3.5/4.0, Flink 1.16/1.17/1.18/1.19/1.20 and Hadoop MapReduce 2/3. +1. Celeborn supports Spark 2.4/3.0/3.1/3.2/3.3/3.4/3.5/4.0, Flink 1.18/1.19/1.20/2.0/2.1/2.2 and Hadoop MapReduce 2/3. 2. Celeborn tested under Scala 2.11/2.12/2.13 and Java 8/11/17 environment. Build Celeborn via `make-distribution.sh`: ```shell -./build/make-distribution.sh -Pspark-2.4/-Pspark-3.0/-Pspark-3.1/-Pspark-3.2/-Pspark-3.3/-Pspark-3.4/-Pspark-3.5/-Pspark-4.0/-Pspark-4.1/-Pflink-1.16/-Pflink-1.17/-Pflink-1.18/-Pflink-1.19/-Pflink-1.20/-Pflink-2.0/-Pflink-2.1/-Pflink-2.2/-Pmr +./build/make-distribution.sh -Pspark-2.4/-Pspark-3.0/-Pspark-3.1/-Pspark-3.2/-Pspark-3.3/-Pspark-3.4/-Pspark-3.5/-Pspark-4.0/-Pspark-4.1/-Pflink-1.18/-Pflink-1.19/-Pflink-1.20/-Pflink-2.0/-Pflink-2.1/-Pflink-2.2/-Pmr ``` Package `apache-celeborn-${project.version}-bin.tgz` will be generated. @@ -64,8 +64,6 @@ Package `apache-celeborn-${project.version}-bin.tgz` will be generated. | Spark 3.5 | ❌ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | | Spark 4.0 | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ✔ | | Spark 4.1 | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ✔ | -| Flink 1.16 | ❌ | ✔ | ✔ | ❌ | ❌ | ❌ | ❌ | -| Flink 1.17 | ❌ | ✔ | ✔ | ❌ | ❌ | ❌ | ❌ | | Flink 1.18 | ❌ | ✔ | ✔ | ❌ | ❌ | ❌ | ❌ | | Flink 1.19 | ❌ | ✔ | ✔ | ❌ | ❌ | ❌ | ❌ | | Flink 1.20 | ❌ | ✔ | ✔ | ❌ | ❌ | ❌ | ❌ | @@ -135,7 +133,6 @@ Celeborn server is compatible with all clients inside various engines. However, Celeborn clients must be consistent with the version of the specified engine. For example, if you are running Spark 2.4, you must compile Celeborn client with -Pspark-2.4; if you are running Spark 3.2, you must compile Celeborn client with -Pspark-3.2; -if you are running flink 1.16, you must compile Celeborn client with -Pflink-1.16. ## Usage Celeborn cluster composes of Master and Worker nodes, the Master supports both single and HA mode(Raft-based) deployments. diff --git a/build/make-distribution.sh b/build/make-distribution.sh index 67e97017e..1b2eb72bd 100755 --- a/build/make-distribution.sh +++ b/build/make-distribution.sh @@ -381,8 +381,6 @@ if [ "$SBT_ENABLED" == "true" ]; then sbt_build_client -Pspark-4.0 sbt_build_client -Pspark-4.1 export JAVA_HOME=$JAVA8_HOME - sbt_build_client -Pflink-1.16 - sbt_build_client -Pflink-1.17 sbt_build_client -Pflink-1.18 sbt_build_client -Pflink-1.19 sbt_build_client -Pflink-1.20 @@ -425,8 +423,6 @@ else build_spark_client -Pspark-4.0 build_spark_client -Pspark-4.1 export JAVA_HOME=$JAVA8_HOME - build_flink_client -Pflink-1.16 - build_flink_client -Pflink-1.17 build_flink_client -Pflink-1.18 build_flink_client -Pflink-1.19 build_flink_client -Pflink-1.20 diff --git a/build/release/release.sh b/build/release/release.sh index b3954c333..ef6dfff85 100755 --- a/build/release/release.sh +++ b/build/release/release.sh @@ -118,12 +118,6 @@ upload_nexus_staging() { ${PROJECT_DIR}/build/sbt -Pspark-4.1 "clean;celeborn-client-spark-4-shaded/publishSigned" export JAVA_HOME=$JAVA8_HOME - echo "Deploying celeborn-client-flink-1.16-shaded_2.12" - ${PROJECT_DIR}/build/sbt -Pflink-1.16 "clean;celeborn-client-flink-1_16-shaded/publishSigned" - - echo "Deploying celeborn-client-flink-1.17-shaded_2.12" - ${PROJECT_DIR}/build/sbt -Pflink-1.17 "clean;celeborn-client-flink-1_17-shaded/publishSigned" - echo "Deploying celeborn-client-flink-1.18-shaded_2.12" ${PROJECT_DIR}/build/sbt -Pflink-1.18 "clean;celeborn-client-flink-1_18-shaded/publishSigned" diff --git a/client-flink/flink-1.16-shaded/pom.xml b/client-flink/flink-1.16-shaded/pom.xml deleted file mode 100644 index c856b1108..000000000 --- a/client-flink/flink-1.16-shaded/pom.xml +++ /dev/null @@ -1,150 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -~ Licensed to the Apache Software Foundation (ASF) under one or more -~ contributor license agreements. See the NOTICE file distributed with -~ this work for additional information regarding copyright ownership. -~ The ASF licenses this file to You under the Apache License, Version 2.0 -~ (the "License"); you may not use this file except in compliance with -~ the License. You may obtain a copy of the License at -~ -~ http://www.apache.org/licenses/LICENSE-2.0 -~ -~ Unless required by applicable law or agreed to in writing, software -~ distributed under the License is distributed on an "AS IS" BASIS, -~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -~ See the License for the specific language governing permissions and -~ limitations under the License. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.celeborn</groupId> - <artifactId>celeborn-parent_${scala.binary.version}</artifactId> - <version>${project.version}</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <artifactId>celeborn-client-flink-1.16-shaded_${scala.binary.version}</artifactId> - <packaging>jar</packaging> - <name>Celeborn Shaded Client for Flink 1.16</name> - - <dependencies> - <dependency> - <groupId>org.apache.celeborn</groupId> - <artifactId>celeborn-client-flink-1.16_${scala.binary.version}</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <configuration> - <relocations> - <relocation> - <pattern>com.google.protobuf</pattern> - <shadedPattern>${shading.prefix}.com.google.protobuf</shadedPattern> - </relocation> - <relocation> - <pattern>com.google.common</pattern> - <shadedPattern>${shading.prefix}.com.google.common</shadedPattern> - </relocation> - <relocation> - <pattern>io.netty</pattern> - <shadedPattern>${shading.prefix}.io.netty</shadedPattern> - </relocation> - <relocation> - <pattern>org.apache.commons</pattern> - <shadedPattern>${shading.prefix}.org.apache.commons</shadedPattern> - </relocation> - <relocation> - <pattern>org.roaringbitmap</pattern> - <shadedPattern>${shading.prefix}.org.roaringbitmap</shadedPattern> - </relocation> - </relocations> - <artifactSet> - <includes> - <include>org.apache.celeborn:*</include> - <include>com.google.protobuf:protobuf-java</include> - <include>com.google.guava:guava</include> - <include>com.google.guava:failureaccess</include> - <include>io.netty:*</include> - <include>org.apache.commons:commons-lang3</include> - <include>org.roaringbitmap:RoaringBitmap</include> - </includes> - </artifactSet> - <filters> - <filter> - <artifact>*:*</artifact> - <excludes> - <exclude>**/*.proto</exclude> - <exclude>META-INF/*.SF</exclude> - <exclude>META-INF/*.DSA</exclude> - <exclude>META-INF/*.RSA</exclude> - <exclude>**/log4j.properties</exclude> - <exclude>META-INF/LICENSE.txt</exclude> - <exclude>META-INF/NOTICE.txt</exclude> - <exclude>LICENSE.txt</exclude> - <exclude>NOTICE.txt</exclude> - </excludes> - </filter> - </filters> - <transformers> - <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"></transformer> - </transformers> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>${maven.plugin.antrun.version}</version> - <executions> - <execution> - <id>rename-native-library</id> - <goals> - <goal>run</goal> - </goals> - <phase>package</phase> - <configuration> - <target> - <echo message="unpacking netty jar"></echo> - <unzip dest="${project.build.directory}/unpacked/" src="${project.build.directory}/${artifactId}-${version}.jar"></unzip> - <echo message="renaming native epoll library"></echo> - <move includeemptydirs="false" todir="${project.build.directory}/unpacked/META-INF/native"> - <fileset dir="${project.build.directory}/unpacked/META-INF/native"></fileset> - <mapper from="libnetty_transport_native_epoll_x86_64.so" to="liborg_apache_celeborn_shaded_netty_transport_native_epoll_x86_64.so" type="glob"></mapper> - </move> - <move includeemptydirs="false" todir="${project.build.directory}/unpacked/META-INF/native"> - <fileset dir="${project.build.directory}/unpacked/META-INF/native"></fileset> - <mapper from="libnetty_transport_native_epoll_aarch_64.so" to="liborg_apache_celeborn_shaded_netty_transport_native_epoll_aarch_64.so" type="glob"></mapper> - </move> - <echo message="renaming native kqueue library"></echo> - <move includeemptydirs="false" todir="${project.build.directory}/unpacked/META-INF/native"> - <fileset dir="${project.build.directory}/unpacked/META-INF/native"></fileset> - <mapper from="libnetty_transport_native_kqueue_x86_64.jnilib" to="liborg_apache_celeborn_shaded_netty_transport_native_kqueue_x86_64.jnilib" type="glob"></mapper> - </move> - <move includeemptydirs="false" todir="${project.build.directory}/unpacked/META-INF/native"> - <fileset dir="${project.build.directory}/unpacked/META-INF/native"></fileset> - <mapper from="libnetty_transport_native_kqueue_aarch_64.jnilib" to="liborg_apache_celeborn_shaded_netty_transport_native_kqueue_aarch_64.jnilib" type="glob"></mapper> - </move> - <echo message="renaming native dns resolver library"></echo> - <move includeemptydirs="false" todir="${project.build.directory}/unpacked/META-INF/native"> - <fileset dir="${project.build.directory}/unpacked/META-INF/native"></fileset> - <mapper from="libnetty_resolver_dns_native_macos_aarch_64.jnilib" to="liborg_apache_celeborn_shaded_netty_resolver_dns_native_macos_aarch_64.jnilib" type="glob"></mapper> - </move> - <move includeemptydirs="false" todir="${project.build.directory}/unpacked/META-INF/native"> - <fileset dir="${project.build.directory}/unpacked/META-INF/native"></fileset> - <mapper from="libnetty_resolver_dns_native_macos_x86_64.jnilib" to="liborg_apache_celeborn_shaded_netty_resolver_dns_native_macos_x86_64.jnilib" type="glob"></mapper> - </move> - <echo message="repackaging netty jar"></echo> - <jar basedir="${project.build.directory}/unpacked" destfile="${project.build.directory}/${artifactId}-${version}.jar"></jar> - </target> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/client-flink/flink-1.16-shaded/src/main/resources/META-INF/LICENSE b/client-flink/flink-1.16-shaded/src/main/resources/META-INF/LICENSE deleted file mode 100644 index 924ef2c85..000000000 --- a/client-flink/flink-1.16-shaded/src/main/resources/META-INF/LICENSE +++ /dev/null @@ -1,248 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - ------------------------------------------------------------------------------------- -This project bundles the following dependencies under the Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt): - - -Apache License 2.0 --------------------------------------- - -com.google.guava:failureaccess -com.google.guava:guava -io.netty:netty-all -io.netty:netty-buffer -io.netty:netty-codec -io.netty:netty-codec-dns -io.netty:netty-codec-haproxy -io.netty:netty-codec-http -io.netty:netty-codec-http2 -io.netty:netty-codec-memcache -io.netty:netty-codec-mqtt -io.netty:netty-codec-redis -io.netty:netty-codec-smtp -io.netty:netty-codec-socks -io.netty:netty-codec-stomp -io.netty:netty-codec-xml -io.netty:netty-common -io.netty:netty-handler -io.netty:netty-handler-proxy -io.netty:netty-resolver -io.netty:netty-resolver-dns -io.netty:netty-transport -io.netty:netty-transport-classes-epoll -io.netty:netty-transport-classes-kqueue -io.netty:netty-transport-native-epoll -io.netty:netty-transport-native-kqueue -io.netty:netty-transport-native-unix-common -io.netty:netty-transport-rxtx -io.netty:netty-transport-sctp -io.netty:netty-transport-udt -org.apache.commons:commons-lang3 -org.roaringbitmap:RoaringBitmap - - -BSD 3-clause ------------- -See licenses/LICENSE-protobuf.txt for details. -com.google.protobuf:protobuf-java diff --git a/client-flink/flink-1.16-shaded/src/main/resources/META-INF/NOTICE b/client-flink/flink-1.16-shaded/src/main/resources/META-INF/NOTICE deleted file mode 100644 index 43452a38a..000000000 --- a/client-flink/flink-1.16-shaded/src/main/resources/META-INF/NOTICE +++ /dev/null @@ -1,45 +0,0 @@ - -Apache Celeborn -Copyright 2022-2024 The Apache Software Foundation. - -This product includes software developed at -The Apache Software Foundation (https://www.apache.org/). - -Apache Spark -Copyright 2014 and onwards The Apache Software Foundation - -Apache Kyuubi -Copyright 2021-2023 The Apache Software Foundation - -Apache Iceberg -Copyright 2017-2022 The Apache Software Foundation - -Apache Parquet MR -Copyright 2014-2024 The Apache Software Foundation - -This project includes code from Kite, developed at Cloudera, Inc. with -the following copyright notice: - -| Copyright 2013 Cloudera Inc. -| -| Licensed under the Apache License, Version 2.0 (the "License"); -| you may not use this file except in compliance with the License. -| You may obtain a copy of the License at -| -| http://www.apache.org/licenses/LICENSE-2.0 -| -| Unless required by applicable law or agreed to in writing, software -| distributed under the License is distributed on an "AS IS" BASIS, -| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -| See the License for the specific language governing permissions and -| limitations under the License. - -Remote Shuffle Service for Flink -Copyright 2021 The Flink Remote Shuffle Project - -============================================================================= -= NOTICE file corresponding to section 4d of the Apache License Version 2.0 = -============================================================================= - -Apache Commons Lang -Copyright 2001-2021 The Apache Software Foundation diff --git a/client-flink/flink-1.16-shaded/src/main/resources/META-INF/licenses/LICENSE-protobuf.txt b/client-flink/flink-1.16-shaded/src/main/resources/META-INF/licenses/LICENSE-protobuf.txt deleted file mode 100644 index b4350ec83..000000000 --- a/client-flink/flink-1.16-shaded/src/main/resources/META-INF/licenses/LICENSE-protobuf.txt +++ /dev/null @@ -1,42 +0,0 @@ -This license applies to all parts of Protocol Buffers except the following: - - - Atomicops support for generic gcc, located in - src/google/protobuf/stubs/atomicops_internals_generic_gcc.h. - This file is copyrighted by Red Hat Inc. - - - Atomicops support for AIX/POWER, located in - src/google/protobuf/stubs/atomicops_internals_aix.h. - This file is copyrighted by Bloomberg Finance LP. - -Copyright 2014, Google Inc. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -Code generated by the Protocol Buffer compiler is owned by the owner -of the input file used when generating it. This code is not -standalone and requires a support library to be linked with it. This -support library is itself covered by the above license. \ No newline at end of file diff --git a/client-flink/flink-1.16/pom.xml b/client-flink/flink-1.16/pom.xml deleted file mode 100644 index 6835fc6bf..000000000 --- a/client-flink/flink-1.16/pom.xml +++ /dev/null @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -~ Licensed to the Apache Software Foundation (ASF) under one or more -~ contributor license agreements. See the NOTICE file distributed with -~ this work for additional information regarding copyright ownership. -~ The ASF licenses this file to You under the Apache License, Version 2.0 -~ (the "License"); you may not use this file except in compliance with -~ the License. You may obtain a copy of the License at -~ -~ http://www.apache.org/licenses/LICENSE-2.0 -~ -~ Unless required by applicable law or agreed to in writing, software -~ distributed under the License is distributed on an "AS IS" BASIS, -~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -~ See the License for the specific language governing permissions and -~ limitations under the License. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.celeborn</groupId> - <artifactId>celeborn-parent_${scala.binary.version}</artifactId> - <version>${project.version}</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <artifactId>celeborn-client-flink-1.16_${scala.binary.version}</artifactId> - <packaging>jar</packaging> - <name>Celeborn Client for Flink 1.16</name> - - <dependencies> - <dependency> - <groupId>org.apache.celeborn</groupId> - <artifactId>celeborn-common_${scala.binary.version}</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.celeborn</groupId> - <artifactId>celeborn-client_${scala.binary.version}</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.celeborn</groupId> - <artifactId>celeborn-client-flink-common_${scala.binary.version}</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-runtime</artifactId> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>org.xerial.snappy</groupId> - <artifactId>snappy-java</artifactId> - </exclusion> - </exclusions> - </dependency> - <!-- Test dependencies --> - <dependency> - <groupId>org.apache.celeborn</groupId> - <artifactId>celeborn-client-flink-common_${scala.binary.version}</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-1.2-api</artifactId> - <scope>test</scope> - </dependency> - </dependencies> -</project> diff --git a/client-flink/flink-1.16/src/main/java/org/apache/celeborn/plugin/flink/CelebornFlinkShimV116.java b/client-flink/flink-1.16/src/main/java/org/apache/celeborn/plugin/flink/CelebornFlinkShimV116.java deleted file mode 100644 index 4271a6e6e..000000000 --- a/client-flink/flink-1.16/src/main/java/org/apache/celeborn/plugin/flink/CelebornFlinkShimV116.java +++ /dev/null @@ -1,155 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.celeborn.plugin.flink; - -import java.net.InetAddress; -import java.time.Duration; -import java.util.Map; - -import org.apache.flink.api.java.tuple.Tuple2; -import org.apache.flink.configuration.Configuration; -import org.apache.flink.configuration.NettyShuffleEnvironmentOptions; -import org.apache.flink.core.memory.MemorySegmentProvider; -import org.apache.flink.metrics.Counter; -import org.apache.flink.metrics.SimpleCounter; -import org.apache.flink.runtime.checkpoint.channel.ChannelStateWriter; -import org.apache.flink.runtime.clusterframework.types.ResourceID; -import org.apache.flink.runtime.deployment.InputGateDeploymentDescriptor; -import org.apache.flink.runtime.deployment.SubpartitionIndexRange; -import org.apache.flink.runtime.io.network.ConnectionID; -import org.apache.flink.runtime.io.network.LocalConnectionManager; -import org.apache.flink.runtime.io.network.buffer.Buffer; -import org.apache.flink.runtime.io.network.buffer.BufferCompressor; -import org.apache.flink.runtime.io.network.buffer.BufferDecompressor; -import org.apache.flink.runtime.io.network.partition.ResultPartitionID; -import org.apache.flink.runtime.io.network.partition.ResultPartitionType; -import org.apache.flink.runtime.io.network.partition.consumer.InputChannel; -import org.apache.flink.runtime.io.network.partition.consumer.RemoteInputChannel; -import org.apache.flink.runtime.io.network.partition.consumer.SingleInputGate; -import org.apache.flink.runtime.jobgraph.IntermediateDataSetID; -import org.apache.flink.runtime.jobgraph.IntermediateResultPartitionID; -import org.apache.flink.runtime.shuffle.PartitionDescriptor; -import org.apache.flink.runtime.shuffle.TaskInputsOutputsDescriptor; -import org.apache.flink.runtime.taskmanager.TaskManagerLocation; -import org.apache.flink.runtime.throughput.ThroughputCalculator; -import org.apache.flink.util.clock.SystemClock; - -import org.apache.celeborn.plugin.flink.utils.ReflectionUtils; - -public class CelebornFlinkShimV116 extends CelebornFlinkShim { - @Override - protected BufferCompressor createBufferCompressorImpl( - int networkBufferSize, String compressionCodec) { - return new BufferCompressor(networkBufferSize, compressionCodec); - } - - @Override - protected BufferDecompressor createBufferDecompressorImpl( - int networkBufferSize, String compressionCodec) { - return new BufferDecompressor(networkBufferSize, compressionCodec); - } - - @Override - protected Duration getRequestSegmentsTimeoutImpl(Configuration configuration) { - return Duration.ofMillis( - configuration.get( - NettyShuffleEnvironmentOptions.NETWORK_EXCLUSIVE_BUFFERS_REQUEST_TIMEOUT_MILLISECONDS)); - } - - @Override - protected InputChannel createFakeChannelImpl( - RemoteShuffleInputGateDelegation inputGateDelegation, int channelIndex) { - return new RemoteInputChannel( - new SingleInputGate( - inputGateDelegation.getTaskName(), - inputGateDelegation.getGateIndex(), - new IntermediateDataSetID(), - ResultPartitionType.BLOCKING, - new SubpartitionIndexRange(0, 1), - 1, - (a, b, c) -> {}, - () -> null, - null, - ReflectionUtils.createEmptyImplementation(MemorySegmentProvider.class), - 0, - new ThroughputCalculator(SystemClock.getInstance()), - null), - channelIndex, - new ResultPartitionID(), - 0, - new ConnectionID( - new TaskManagerLocation(ResourceID.generate(), InetAddress.getLoopbackAddress(), 1), 0), - new LocalConnectionManager(), - 0, - 0, - 0, - new SimpleCounter(), - new SimpleCounter(), - ReflectionUtils.createEmptyImplementation(ChannelStateWriter.class)); - } - - @Override - protected Tuple2<Integer, Integer> getConsumedSubpartitionIndexRangeImpl( - InputGateDeploymentDescriptor gateDescriptor) { - SubpartitionIndexRange indexRange = gateDescriptor.getConsumedSubpartitionIndexRange(); - return Tuple2.of(indexRange.getStartIndex(), indexRange.getEndIndex()); - } - - @Override - protected ResultPartitionBytesCounter createResultPartitionBytesCounterImpl( - RemoteShuffleResultPartition remoteShuffleResultPartition) { - Counter numBytesProduced = - ReflectionUtils.readDeclaredFieldRecursiveNoThrow( - remoteShuffleResultPartition, "numBytesProduced"); - return (bufferWithSubpartition, isBroadcast, readableBytes) -> - numBytesProduced.inc(readableBytes); - } - - @Override - protected Buffer.DataType getEndOfPartitionDataTypeImpl() { - return Buffer.DataType.EVENT_BUFFER; - } - - @Override - protected PartitionDescriptor createPartitionDescriptorImpl( - IntermediateDataSetID intermediateDataSetId, int partitionNum) { - IntermediateResultPartitionID intermediateResultPartitionId = - new IntermediateResultPartitionID(intermediateDataSetId, partitionNum); - return new PartitionDescriptor( - intermediateDataSetId, - 10, - intermediateResultPartitionId, - ResultPartitionType.BLOCKING, - 5, - 1, - false, - false); - } - - @Override - protected TaskInputsOutputsDescriptor createTaskInputsOutputsDescriptorImpl( - int inputGateNums, - Map<IntermediateDataSetID, Integer> inputChannelNums, - Map<IntermediateDataSetID, Integer> partitionReuseCount, - Map<IntermediateDataSetID, Integer> subpartitionNums, - Map<IntermediateDataSetID, ResultPartitionType> inputPartitionTypes, - Map<IntermediateDataSetID, ResultPartitionType> partitionTypes) { - return TaskInputsOutputsDescriptor.from( - inputGateNums, inputChannelNums, partitionReuseCount, partitionTypes); - } -} diff --git a/client-flink/flink-1.16/src/main/resources/META-INF/services/org.apache.celeborn.plugin.flink.CelebornFlinkShim b/client-flink/flink-1.16/src/main/resources/META-INF/services/org.apache.celeborn.plugin.flink.CelebornFlinkShim deleted file mode 100644 index 58a85712d..000000000 --- a/client-flink/flink-1.16/src/main/resources/META-INF/services/org.apache.celeborn.plugin.flink.CelebornFlinkShim +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -org.apache.celeborn.plugin.flink.CelebornFlinkShimV116 \ No newline at end of file diff --git a/client-flink/flink-1.16/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleMasterSuiteJV116.java b/client-flink/flink-1.16/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleMasterSuiteJV116.java deleted file mode 100644 index 2a9a73da8..000000000 --- a/client-flink/flink-1.16/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleMasterSuiteJV116.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.celeborn.plugin.flink; - -public class RemoteShuffleMasterSuiteJV116 extends RemoteShuffleMasterSuiteJ {} diff --git a/client-flink/flink-1.16/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleResultPartitionFactorySuiteJV116.java b/client-flink/flink-1.16/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleResultPartitionFactorySuiteJV116.java deleted file mode 100644 index 7a09c935e..000000000 --- a/client-flink/flink-1.16/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleResultPartitionFactorySuiteJV116.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.celeborn.plugin.flink; - -/** Tests for {@link RemoteShuffleResultPartitionFactory}. */ -public class RemoteShuffleResultPartitionFactorySuiteJV116 - extends RemoteShuffleResultPartitionFactorySuiteJ {} diff --git a/client-flink/flink-1.16/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleResultPartitionSuiteJV116.java b/client-flink/flink-1.16/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleResultPartitionSuiteJV116.java deleted file mode 100644 index dbae0bb86..000000000 --- a/client-flink/flink-1.16/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleResultPartitionSuiteJV116.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.celeborn.plugin.flink; - -public class RemoteShuffleResultPartitionSuiteJV116 extends RemoteShuffleResultPartitionSuiteJ {} diff --git a/client-flink/flink-1.16/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleServiceFactorySuiteJV116.java b/client-flink/flink-1.16/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleServiceFactorySuiteJV116.java deleted file mode 100644 index 090e976e8..000000000 --- a/client-flink/flink-1.16/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleServiceFactorySuiteJV116.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.celeborn.plugin.flink; - -public class RemoteShuffleServiceFactorySuiteJV116 extends RemoteShuffleServiceFactorySuiteJ {} diff --git a/client-flink/flink-1.16/src/test/java/org/apache/celeborn/plugin/flink/ShuffleResourceTrackerSuiteJV116.java b/client-flink/flink-1.16/src/test/java/org/apache/celeborn/plugin/flink/ShuffleResourceTrackerSuiteJV116.java deleted file mode 100644 index a31ade8af..000000000 --- a/client-flink/flink-1.16/src/test/java/org/apache/celeborn/plugin/flink/ShuffleResourceTrackerSuiteJV116.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.celeborn.plugin.flink; - -public class ShuffleResourceTrackerSuiteJV116 extends ShuffleResourceTrackerSuiteJ {} diff --git a/client-flink/flink-1.17-shaded/pom.xml b/client-flink/flink-1.17-shaded/pom.xml deleted file mode 100644 index fd8512fe7..000000000 --- a/client-flink/flink-1.17-shaded/pom.xml +++ /dev/null @@ -1,150 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with - ~ this work for additional information regarding copyright ownership. - ~ The ASF licenses this file to You under the Apache License, Version 2.0 - ~ (the "License"); you may not use this file except in compliance with - ~ the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.celeborn</groupId> - <artifactId>celeborn-parent_${scala.binary.version}</artifactId> - <version>${project.version}</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <artifactId>celeborn-client-flink-1.17-shaded_${scala.binary.version}</artifactId> - <packaging>jar</packaging> - <name>Celeborn Shaded Client for Flink 1.17</name> - - <dependencies> - <dependency> - <groupId>org.apache.celeborn</groupId> - <artifactId>celeborn-client-flink-1.17_${scala.binary.version}</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <configuration> - <relocations> - <relocation> - <pattern>com.google.protobuf</pattern> - <shadedPattern>${shading.prefix}.com.google.protobuf</shadedPattern> - </relocation> - <relocation> - <pattern>com.google.common</pattern> - <shadedPattern>${shading.prefix}.com.google.common</shadedPattern> - </relocation> - <relocation> - <pattern>io.netty</pattern> - <shadedPattern>${shading.prefix}.io.netty</shadedPattern> - </relocation> - <relocation> - <pattern>org.apache.commons</pattern> - <shadedPattern>${shading.prefix}.org.apache.commons</shadedPattern> - </relocation> - <relocation> - <pattern>org.roaringbitmap</pattern> - <shadedPattern>${shading.prefix}.org.roaringbitmap</shadedPattern> - </relocation> - </relocations> - <artifactSet> - <includes> - <include>org.apache.celeborn:*</include> - <include>com.google.protobuf:protobuf-java</include> - <include>com.google.guava:guava</include> - <include>com.google.guava:failureaccess</include> - <include>io.netty:*</include> - <include>org.apache.commons:commons-lang3</include> - <include>org.roaringbitmap:RoaringBitmap</include> - </includes> - </artifactSet> - <filters> - <filter> - <artifact>*:*</artifact> - <excludes> - <exclude>**/*.proto</exclude> - <exclude>META-INF/*.SF</exclude> - <exclude>META-INF/*.DSA</exclude> - <exclude>META-INF/*.RSA</exclude> - <exclude>**/log4j.properties</exclude> - <exclude>META-INF/LICENSE.txt</exclude> - <exclude>META-INF/NOTICE.txt</exclude> - <exclude>LICENSE.txt</exclude> - <exclude>NOTICE.txt</exclude> - </excludes> - </filter> - </filters> - <transformers> - <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"></transformer> - </transformers> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>${maven.plugin.antrun.version}</version> - <executions> - <execution> - <id>rename-native-library</id> - <goals> - <goal>run</goal> - </goals> - <phase>package</phase> - <configuration> - <target> - <echo message="unpacking netty jar"></echo> - <unzip dest="${project.build.directory}/unpacked/" src="${project.build.directory}/${artifactId}-${version}.jar"></unzip> - <echo message="renaming native epoll library"></echo> - <move includeemptydirs="false" todir="${project.build.directory}/unpacked/META-INF/native"> - <fileset dir="${project.build.directory}/unpacked/META-INF/native"></fileset> - <mapper from="libnetty_transport_native_epoll_x86_64.so" to="liborg_apache_celeborn_shaded_netty_transport_native_epoll_x86_64.so" type="glob"></mapper> - </move> - <move includeemptydirs="false" todir="${project.build.directory}/unpacked/META-INF/native"> - <fileset dir="${project.build.directory}/unpacked/META-INF/native"></fileset> - <mapper from="libnetty_transport_native_epoll_aarch_64.so" to="liborg_apache_celeborn_shaded_netty_transport_native_epoll_aarch_64.so" type="glob"></mapper> - </move> - <echo message="renaming native kqueue library"></echo> - <move includeemptydirs="false" todir="${project.build.directory}/unpacked/META-INF/native"> - <fileset dir="${project.build.directory}/unpacked/META-INF/native"></fileset> - <mapper from="libnetty_transport_native_kqueue_x86_64.jnilib" to="liborg_apache_celeborn_shaded_netty_transport_native_kqueue_x86_64.jnilib" type="glob"></mapper> - </move> - <move includeemptydirs="false" todir="${project.build.directory}/unpacked/META-INF/native"> - <fileset dir="${project.build.directory}/unpacked/META-INF/native"></fileset> - <mapper from="libnetty_transport_native_kqueue_aarch_64.jnilib" to="liborg_apache_celeborn_shaded_netty_transport_native_kqueue_aarch_64.jnilib" type="glob"></mapper> - </move> - <echo message="renaming native dns resolver library"></echo> - <move includeemptydirs="false" todir="${project.build.directory}/unpacked/META-INF/native"> - <fileset dir="${project.build.directory}/unpacked/META-INF/native"></fileset> - <mapper from="libnetty_resolver_dns_native_macos_aarch_64.jnilib" to="liborg_apache_celeborn_shaded_netty_resolver_dns_native_macos_aarch_64.jnilib" type="glob"></mapper> - </move> - <move includeemptydirs="false" todir="${project.build.directory}/unpacked/META-INF/native"> - <fileset dir="${project.build.directory}/unpacked/META-INF/native"></fileset> - <mapper from="libnetty_resolver_dns_native_macos_x86_64.jnilib" to="liborg_apache_celeborn_shaded_netty_resolver_dns_native_macos_x86_64.jnilib" type="glob"></mapper> - </move> - <echo message="repackaging netty jar"></echo> - <jar basedir="${project.build.directory}/unpacked" destfile="${project.build.directory}/${artifactId}-${version}.jar"></jar> - </target> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/client-flink/flink-1.17-shaded/src/main/resources/META-INF/LICENSE b/client-flink/flink-1.17-shaded/src/main/resources/META-INF/LICENSE deleted file mode 100644 index 924ef2c85..000000000 --- a/client-flink/flink-1.17-shaded/src/main/resources/META-INF/LICENSE +++ /dev/null @@ -1,248 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - ------------------------------------------------------------------------------------- -This project bundles the following dependencies under the Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt): - - -Apache License 2.0 --------------------------------------- - -com.google.guava:failureaccess -com.google.guava:guava -io.netty:netty-all -io.netty:netty-buffer -io.netty:netty-codec -io.netty:netty-codec-dns -io.netty:netty-codec-haproxy -io.netty:netty-codec-http -io.netty:netty-codec-http2 -io.netty:netty-codec-memcache -io.netty:netty-codec-mqtt -io.netty:netty-codec-redis -io.netty:netty-codec-smtp -io.netty:netty-codec-socks -io.netty:netty-codec-stomp -io.netty:netty-codec-xml -io.netty:netty-common -io.netty:netty-handler -io.netty:netty-handler-proxy -io.netty:netty-resolver -io.netty:netty-resolver-dns -io.netty:netty-transport -io.netty:netty-transport-classes-epoll -io.netty:netty-transport-classes-kqueue -io.netty:netty-transport-native-epoll -io.netty:netty-transport-native-kqueue -io.netty:netty-transport-native-unix-common -io.netty:netty-transport-rxtx -io.netty:netty-transport-sctp -io.netty:netty-transport-udt -org.apache.commons:commons-lang3 -org.roaringbitmap:RoaringBitmap - - -BSD 3-clause ------------- -See licenses/LICENSE-protobuf.txt for details. -com.google.protobuf:protobuf-java diff --git a/client-flink/flink-1.17-shaded/src/main/resources/META-INF/NOTICE b/client-flink/flink-1.17-shaded/src/main/resources/META-INF/NOTICE deleted file mode 100644 index 43452a38a..000000000 --- a/client-flink/flink-1.17-shaded/src/main/resources/META-INF/NOTICE +++ /dev/null @@ -1,45 +0,0 @@ - -Apache Celeborn -Copyright 2022-2024 The Apache Software Foundation. - -This product includes software developed at -The Apache Software Foundation (https://www.apache.org/). - -Apache Spark -Copyright 2014 and onwards The Apache Software Foundation - -Apache Kyuubi -Copyright 2021-2023 The Apache Software Foundation - -Apache Iceberg -Copyright 2017-2022 The Apache Software Foundation - -Apache Parquet MR -Copyright 2014-2024 The Apache Software Foundation - -This project includes code from Kite, developed at Cloudera, Inc. with -the following copyright notice: - -| Copyright 2013 Cloudera Inc. -| -| Licensed under the Apache License, Version 2.0 (the "License"); -| you may not use this file except in compliance with the License. -| You may obtain a copy of the License at -| -| http://www.apache.org/licenses/LICENSE-2.0 -| -| Unless required by applicable law or agreed to in writing, software -| distributed under the License is distributed on an "AS IS" BASIS, -| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -| See the License for the specific language governing permissions and -| limitations under the License. - -Remote Shuffle Service for Flink -Copyright 2021 The Flink Remote Shuffle Project - -============================================================================= -= NOTICE file corresponding to section 4d of the Apache License Version 2.0 = -============================================================================= - -Apache Commons Lang -Copyright 2001-2021 The Apache Software Foundation diff --git a/client-flink/flink-1.17-shaded/src/main/resources/META-INF/licenses/LICENSE-protobuf.txt b/client-flink/flink-1.17-shaded/src/main/resources/META-INF/licenses/LICENSE-protobuf.txt deleted file mode 100644 index b4350ec83..000000000 --- a/client-flink/flink-1.17-shaded/src/main/resources/META-INF/licenses/LICENSE-protobuf.txt +++ /dev/null @@ -1,42 +0,0 @@ -This license applies to all parts of Protocol Buffers except the following: - - - Atomicops support for generic gcc, located in - src/google/protobuf/stubs/atomicops_internals_generic_gcc.h. - This file is copyrighted by Red Hat Inc. - - - Atomicops support for AIX/POWER, located in - src/google/protobuf/stubs/atomicops_internals_aix.h. - This file is copyrighted by Bloomberg Finance LP. - -Copyright 2014, Google Inc. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -Code generated by the Protocol Buffer compiler is owned by the owner -of the input file used when generating it. This code is not -standalone and requires a support library to be linked with it. This -support library is itself covered by the above license. \ No newline at end of file diff --git a/client-flink/flink-1.17/pom.xml b/client-flink/flink-1.17/pom.xml deleted file mode 100644 index 501f420a8..000000000 --- a/client-flink/flink-1.17/pom.xml +++ /dev/null @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with - ~ this work for additional information regarding copyright ownership. - ~ The ASF licenses this file to You under the Apache License, Version 2.0 - ~ (the "License"); you may not use this file except in compliance with - ~ the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.celeborn</groupId> - <artifactId>celeborn-parent_${scala.binary.version}</artifactId> - <version>${project.version}</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <artifactId>celeborn-client-flink-1.17_${scala.binary.version}</artifactId> - <packaging>jar</packaging> - <name>Celeborn Client for Flink 1.17</name> - - <dependencies> - <dependency> - <groupId>org.apache.celeborn</groupId> - <artifactId>celeborn-common_${scala.binary.version}</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.celeborn</groupId> - <artifactId>celeborn-client_${scala.binary.version}</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.celeborn</groupId> - <artifactId>celeborn-client-flink-common_${scala.binary.version}</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.celeborn</groupId> - <artifactId>celeborn-client-flink-common_${scala.binary.version}</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-runtime</artifactId> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>org.xerial.snappy</groupId> - <artifactId>snappy-java</artifactId> - </exclusion> - </exclusions> - </dependency> - <!-- Test dependencies --> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-1.2-api</artifactId> - <scope>test</scope> - </dependency> - </dependencies> -</project> diff --git a/client-flink/flink-1.17/src/main/java/org/apache/celeborn/plugin/flink/CelebornFlinkShimV117.java b/client-flink/flink-1.17/src/main/java/org/apache/celeborn/plugin/flink/CelebornFlinkShimV117.java deleted file mode 100644 index 41e8c49a2..000000000 --- a/client-flink/flink-1.17/src/main/java/org/apache/celeborn/plugin/flink/CelebornFlinkShimV117.java +++ /dev/null @@ -1,164 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.celeborn.plugin.flink; - -import java.net.InetAddress; -import java.time.Duration; -import java.util.Map; - -import org.apache.flink.api.java.tuple.Tuple2; -import org.apache.flink.configuration.Configuration; -import org.apache.flink.configuration.NettyShuffleEnvironmentOptions; -import org.apache.flink.core.memory.MemorySegmentProvider; -import org.apache.flink.metrics.SimpleCounter; -import org.apache.flink.runtime.checkpoint.channel.ChannelStateWriter; -import org.apache.flink.runtime.clusterframework.types.ResourceID; -import org.apache.flink.runtime.deployment.InputGateDeploymentDescriptor; -import org.apache.flink.runtime.executiongraph.IndexRange; -import org.apache.flink.runtime.io.network.ConnectionID; -import org.apache.flink.runtime.io.network.LocalConnectionManager; -import org.apache.flink.runtime.io.network.buffer.Buffer; -import org.apache.flink.runtime.io.network.buffer.BufferCompressor; -import org.apache.flink.runtime.io.network.buffer.BufferDecompressor; -import org.apache.flink.runtime.io.network.partition.ResultPartitionID; -import org.apache.flink.runtime.io.network.partition.ResultPartitionType; -import org.apache.flink.runtime.io.network.partition.consumer.InputChannel; -import org.apache.flink.runtime.io.network.partition.consumer.RemoteInputChannel; -import org.apache.flink.runtime.io.network.partition.consumer.SingleInputGate; -import org.apache.flink.runtime.jobgraph.IntermediateDataSetID; -import org.apache.flink.runtime.jobgraph.IntermediateResultPartitionID; -import org.apache.flink.runtime.shuffle.PartitionDescriptor; -import org.apache.flink.runtime.shuffle.TaskInputsOutputsDescriptor; -import org.apache.flink.runtime.taskmanager.TaskManagerLocation; -import org.apache.flink.runtime.throughput.ThroughputCalculator; -import org.apache.flink.util.clock.SystemClock; - -import org.apache.celeborn.plugin.flink.utils.ReflectionUtils; - -public class CelebornFlinkShimV117 extends CelebornFlinkShim { - @Override - protected BufferCompressor createBufferCompressorImpl( - int networkBufferSize, String compressionCodec) { - return new BufferCompressor(networkBufferSize, compressionCodec); - } - - @Override - protected BufferDecompressor createBufferDecompressorImpl( - int networkBufferSize, String compressionCodec) { - return new BufferDecompressor(networkBufferSize, compressionCodec); - } - - @Override - protected Duration getRequestSegmentsTimeoutImpl(Configuration configuration) { - return Duration.ofMillis( - configuration.get( - NettyShuffleEnvironmentOptions.NETWORK_EXCLUSIVE_BUFFERS_REQUEST_TIMEOUT_MILLISECONDS)); - } - - @Override - protected InputChannel createFakeChannelImpl( - RemoteShuffleInputGateDelegation inputGateDelegation, int channelIndex) { - return new RemoteInputChannel( - new SingleInputGate( - inputGateDelegation.getTaskName(), - inputGateDelegation.getGateIndex(), - new IntermediateDataSetID(), - ResultPartitionType.BLOCKING, - new IndexRange(0, 1), - 1, - (a, b, c) -> {}, - () -> null, - null, - ReflectionUtils.createEmptyImplementation(MemorySegmentProvider.class), - 0, - new ThroughputCalculator(SystemClock.getInstance()), - null), - channelIndex, - new ResultPartitionID(), - 0, - new ConnectionID( - new TaskManagerLocation(ResourceID.generate(), InetAddress.getLoopbackAddress(), 1), 0), - new LocalConnectionManager(), - 0, - 0, - 0, - new SimpleCounter(), - new SimpleCounter(), - ReflectionUtils.createEmptyImplementation(ChannelStateWriter.class)); - } - - @Override - protected Tuple2<Integer, Integer> getConsumedSubpartitionIndexRangeImpl( - InputGateDeploymentDescriptor gateDescriptor) { - IndexRange indexRange = gateDescriptor.getConsumedSubpartitionIndexRange(); - return Tuple2.of(indexRange.getStartIndex(), indexRange.getEndIndex()); - } - - @Override - protected ResultPartitionBytesCounter createResultPartitionBytesCounterImpl( - RemoteShuffleResultPartition remoteShuffleResultPartition) { - org.apache.flink.runtime.io.network.metrics.ResultPartitionBytesCounter resultPartitionBytes = - ReflectionUtils.readDeclaredFieldRecursiveNoThrow( - remoteShuffleResultPartition, "resultPartitionBytes"); - return (bufferWithSubpartition, isBroadcast, readableBytes) -> { - if (isBroadcast) { - resultPartitionBytes.incAll(readableBytes); - } else { - resultPartitionBytes.inc(bufferWithSubpartition.getSubpartitionIndex(), readableBytes); - } - }; - } - - @Override - protected Buffer.DataType getEndOfPartitionDataTypeImpl() { - return Buffer.DataType.EVENT_BUFFER; - } - - @Override - protected PartitionDescriptor createPartitionDescriptorImpl( - IntermediateDataSetID intermediateDataSetId, int partitionNum) { - IntermediateResultPartitionID intermediateResultPartitionId = - new IntermediateResultPartitionID(intermediateDataSetId, partitionNum); - return new PartitionDescriptor( - intermediateDataSetId, - 10, - intermediateResultPartitionId, - ResultPartitionType.BLOCKING, - 5, - 1, - false, - false); - } - - @Override - protected TaskInputsOutputsDescriptor createTaskInputsOutputsDescriptorImpl( - int inputGateNums, - Map<IntermediateDataSetID, Integer> inputChannelNums, - Map<IntermediateDataSetID, Integer> partitionReuseCount, - Map<IntermediateDataSetID, Integer> subpartitionNums, - Map<IntermediateDataSetID, ResultPartitionType> inputPartitionTypes, - Map<IntermediateDataSetID, ResultPartitionType> partitionTypes) { - return TaskInputsOutputsDescriptor.from( - inputGateNums, - inputChannelNums, - partitionReuseCount, - subpartitionNums, - inputPartitionTypes, - partitionTypes); - } -} diff --git a/client-flink/flink-1.17/src/main/resources/META-INF/services/org.apache.celeborn.plugin.flink.CelebornFlinkShim b/client-flink/flink-1.17/src/main/resources/META-INF/services/org.apache.celeborn.plugin.flink.CelebornFlinkShim deleted file mode 100644 index ec0a625df..000000000 --- a/client-flink/flink-1.17/src/main/resources/META-INF/services/org.apache.celeborn.plugin.flink.CelebornFlinkShim +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -org.apache.celeborn.plugin.flink.CelebornFlinkShimV117 \ No newline at end of file diff --git a/client-flink/flink-1.17/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleMasterSuiteJV117.java b/client-flink/flink-1.17/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleMasterSuiteJV117.java deleted file mode 100644 index 1eeef35e3..000000000 --- a/client-flink/flink-1.17/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleMasterSuiteJV117.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.celeborn.plugin.flink; - -public class RemoteShuffleMasterSuiteJV117 extends RemoteShuffleMasterSuiteJ {} diff --git a/client-flink/flink-1.17/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleResultPartitionFactorySuiteJV117.java b/client-flink/flink-1.17/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleResultPartitionFactorySuiteJV117.java deleted file mode 100644 index e4d3bfc5f..000000000 --- a/client-flink/flink-1.17/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleResultPartitionFactorySuiteJV117.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.celeborn.plugin.flink; - -/** Tests for {@link RemoteShuffleResultPartitionFactory}. */ -public class RemoteShuffleResultPartitionFactorySuiteJV117 - extends RemoteShuffleResultPartitionFactorySuiteJ {} diff --git a/client-flink/flink-1.17/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleResultPartitionSuiteJV117.java b/client-flink/flink-1.17/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleResultPartitionSuiteJV117.java deleted file mode 100644 index 7dec6a97f..000000000 --- a/client-flink/flink-1.17/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleResultPartitionSuiteJV117.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.celeborn.plugin.flink; - -public class RemoteShuffleResultPartitionSuiteJV117 extends RemoteShuffleResultPartitionSuiteJ {} diff --git a/client-flink/flink-1.17/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleServiceFactorySuiteJV117.java b/client-flink/flink-1.17/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleServiceFactorySuiteJV117.java deleted file mode 100644 index 7f48b55b4..000000000 --- a/client-flink/flink-1.17/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleServiceFactorySuiteJV117.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.celeborn.plugin.flink; - -public class RemoteShuffleServiceFactorySuiteJV117 extends RemoteShuffleServiceFactorySuiteJ {} diff --git a/client-flink/flink-1.17/src/test/java/org/apache/celeborn/plugin/flink/ShuffleResourceTrackerSuiteJV117.java b/client-flink/flink-1.17/src/test/java/org/apache/celeborn/plugin/flink/ShuffleResourceTrackerSuiteJV117.java deleted file mode 100644 index a3ba4e3c0..000000000 --- a/client-flink/flink-1.17/src/test/java/org/apache/celeborn/plugin/flink/ShuffleResourceTrackerSuiteJV117.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.celeborn.plugin.flink; - -public class ShuffleResourceTrackerSuiteJV117 extends ShuffleResourceTrackerSuiteJ {} diff --git a/dev/dependencies.sh b/dev/dependencies.sh index 2bd5041b1..3f8caf5a7 100755 --- a/dev/dependencies.sh +++ b/dev/dependencies.sh @@ -176,14 +176,6 @@ case "$MODULE" in MVN_MODULES="client-spark/spark-3" SBT_PROJECT="celeborn-client-spark-4" ;; - "flink-1.16") - MVN_MODULES="client-flink/flink-1.16" - SBT_PROJECT="celeborn-client-flink-1_16" - ;; - "flink-1.17") - MVN_MODULES="client-flink/flink-1.17" - SBT_PROJECT="celeborn-client-flink-1_17" - ;; "flink-1.18") MVN_MODULES="client-flink/flink-1.18" SBT_PROJECT="celeborn-client-flink-1_18" diff --git a/dev/reformat b/dev/reformat index b6fe643e0..5e4cb5914 100755 --- a/dev/reformat +++ b/dev/reformat @@ -23,8 +23,6 @@ PROJECT_DIR="$(cd "`dirname "$0"`/.."; pwd)" if [ "$1" == "--web" ]; then ${PROJECT_DIR}/build/mvn clean install -pl web else - ${PROJECT_DIR}/build/mvn spotless:apply -Pflink-1.16 - ${PROJECT_DIR}/build/mvn spotless:apply -Pflink-1.17 ${PROJECT_DIR}/build/mvn spotless:apply -Pflink-1.18 ${PROJECT_DIR}/build/mvn spotless:apply -Pflink-1.19 ${PROJECT_DIR}/build/mvn spotless:apply -Pflink-1.20 diff --git a/docs/README.md b/docs/README.md index 1aa797d0d..4879014f7 100644 --- a/docs/README.md +++ b/docs/README.md @@ -122,7 +122,7 @@ INFO [async-reply] Controller: CommitFiles for local-1690000152711-0 success wit **Important: Only Flink batch jobs are supported for now.** #### Copy Celeborn Client to Flink's lib -Celeborn release binary contains clients for Flink 1.16.x, Flink 1.17.x, Flink 1.18.x, Flink 1.19.x, Flink 1.20.x, Flink 2.0.x, Flink 2.1.x, Flink 2.2.x, copy the corresponding client jar into Flink's +Celeborn release binary contains clients for Flink 1.18.x, Flink 1.19.x, Flink 1.20.x, Flink 2.0.x, Flink 2.1.x, Flink 2.2.x, copy the corresponding client jar into Flink's `lib/` directory: ```shell cp $CELEBORN_HOME/flink/celeborn-client-flink-<flink.version>-shaded_<scala.binary.version>-<celeborn.version>.jar $FLINK_HOME/lib/ @@ -130,7 +130,7 @@ cp $CELEBORN_HOME/flink/celeborn-client-flink-<flink.version>-shaded_<scala.bina #### Add Celeborn configuration to Flink's conf Set `shuffle-service-factory.class` to Celeborn's ShuffleServiceFactory in Flink configuration file: -- Flink 1.16.x, Flink 1.17.x, Flink 1.18.x +- Flink 1.18.x ```shell cd $FLINK_HOME vi conf/flink-conf.yaml diff --git a/docs/deploy.md b/docs/deploy.md index 761ce6e64..09a831928 100644 --- a/docs/deploy.md +++ b/docs/deploy.md @@ -212,7 +212,7 @@ spark.executor.userClassPathFirst false **Important: Only Flink batch jobs are supported for now. Due to the Shuffle Service in Flink is cluster-granularity, if you want to use Celeborn in a session cluster, it will not be able to submit both streaming and batch job to the same cluster. We plan to get rid of this restriction for Hybrid Shuffle mode in a future release.** -Celeborn release binary contains clients for Flink 1.16.x, Flink 1.17.x, Flink 1.18.x, Flink 1.19.x, Flink 1.20.x, Flink 2.0.x, Flink 2.1.x, Flink 2.2.x, copy the corresponding client jar into Flink's +Celeborn release binary contains clients for Flink 1.18.x, Flink 1.19.x, Flink 1.20.x, Flink 2.0.x, Flink 2.1.x, Flink 2.2.x, copy the corresponding client jar into Flink's `lib/` directory: Copy `$CELEBORN_HOME/flink/celeborn-client-flink-<flink.version>-shaded_<scala.binary.version>-<celeborn.version>.jar` to `$FLINK_HOME/lib/`. diff --git a/docs/developers/overview.md b/docs/developers/overview.md index d9f9a2452..f5a054384 100644 --- a/docs/developers/overview.md +++ b/docs/developers/overview.md @@ -89,7 +89,7 @@ Celeborn's primary components(i.e. Master, Worker, Client) are engine irrelevant and easy to implement plugins for various engines. Currently, Celeborn officially supports [Spark](https://spark.apache.org/)(both Spark 2.x, Spark 3.x and Spark 4.x), -[Flink](https://flink.apache.org/)(1.16/1.17/1.18/1.19/1.20/2.0/2.1/2.2), +[Flink](https://flink.apache.org/)(1.18/1.19/1.20/2.0/2.1/2.2), [Gluten](https://github.com/apache/gluten) and [Auron](https://github.com/apache/auron). Also, developers are integrating Celeborn with other engines, for example [MR3](https://mr3docs.datamonad.com/docs/mr3/). diff --git a/docs/developers/sbt.md b/docs/developers/sbt.md index 60617f86a..e7e404bc5 100644 --- a/docs/developers/sbt.md +++ b/docs/developers/sbt.md @@ -37,8 +37,6 @@ The following table indicates the compatibility of Celeborn Spark and Flink clie | Spark 3.5 | ❌ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | | Spark 4.0 | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ✔ | | Spark 4.1 | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ✔ | -| Flink 1.16 | ❌ | ✔ | ✔ | ❌ | ❌ | ❌ | ❌ | -| Flink 1.17 | ❌ | ✔ | ✔ | ❌ | ❌ | ❌ | ❌ | | Flink 1.18 | ❌ | ✔ | ✔ | ❌ | ❌ | ❌ | ❌ | | Flink 1.19 | ❌ | ✔ | ✔ | ❌ | ❌ | ❌ | ❌ | | Flink 1.20 | ❌ | ✔ | ✔ | ❌ | ❌ | ❌ | ❌ | @@ -84,17 +82,17 @@ We have adopted the Maven-style profile management for our Client module. For ex [info] celeborn-worker ``` -To enable the Flink 1.16 client module, add `-Pflink-1.16`: +To enable the Flink 1.18 client module, add `-Pflink-1.18`: ``` -# ./build/sbt -Pflink-1.16 projects +# ./build/sbt -Pflink-1.18 projects [info] set current project to celeborn (in build file:/root/celeborn/) [info] In file:/root/celeborn/ [info] * celeborn [info] celeborn-client -[info] celeborn-client-flink-1_16 -[info] celeborn-client-flink-1_16-shaded +[info] celeborn-client-flink-1_18 +[info] celeborn-client-flink-1_18-shaded [info] celeborn-common [info] celeborn-flink-common [info] celeborn-flink-group @@ -119,15 +117,15 @@ $ # Or, you can use sbt directly with the `-Pspark-3.3` profile: $ ./build/sbt -Pspark-3.3 celeborn-client-spark-3-shaded/assembly ``` -Similarly, you can build the Flink 1.16 client assembly jar using the following commands: +Similarly, you can build the Flink 1.18 client assembly jar using the following commands: ```shell -$ ./build/sbt -Pflink-1.16 -> project celeborn-client-flink-1_16-shaded +$ ./build/sbt -Pflink-1.18 +> project celeborn-client-flink-1_18-shaded > assembly -$ # Or, you can use sbt directly with the `-Pflink-1.16` profile: -$ ./build/sbt -Pflink-1.16 celeborn-client-flink-1_16-shaded/assembly +$ # Or, you can use sbt directly with the `-Pflink-1.18` profile: +$ ./build/sbt -Pflink-1.18 celeborn-client-flink-1_18-shaded/assembly ``` By executing these commands, you will create assembly jar files for the respective Spark and Flink client modules. The assembly jar bundles all the dependencies, allowing the client module to be used independently with all required dependencies included. @@ -165,13 +163,13 @@ $ # only run spark client related modules tests $ ./build/sbt -Pspark-3.3 celeborn-spark-group/test ``` -Similarly, to run the test cases for the Flink 1.16 client, use the following command: +Similarly, to run the test cases for the Flink 1.18 client, use the following command: ```shell -$ ./build/sbt -Pflink-1.16 test +$ ./build/sbt -Pflink-1.18 test $ # only run flink client related modules tests -$ ./build/sbt -Pflink-1.16 celeborn-flink-group/test +$ ./build/sbt -Pflink-1.18 celeborn-flink-group/test ``` ### Running Individual Tests diff --git a/pom.xml b/pom.xml index 3631871be..51205ff86 100644 --- a/pom.xml +++ b/pom.xml @@ -1865,44 +1865,6 @@ </build> </profile> - <profile> - <id>flink-1.16</id> - <modules> - <module>client-flink/common</module> - <module>client-flink/flink-1.16</module> - <module>client-flink/flink-1.16-shaded</module> - <module>tests/flink-it</module> - </modules> - <properties> - <flink.version>1.16.3</flink.version> - <flink.binary.version>1.16</flink.binary.version> - <scala.binary.version>2.12</scala.binary.version> - <celeborn.flink.plugin.artifact>celeborn-client-flink-1.16_${scala.binary.version}</celeborn.flink.plugin.artifact> - <flink.streaming.artifact>flink-streaming-java</flink.streaming.artifact> - <flink.clients.artifact>flink-clients</flink.clients.artifact> - <flink.runtime.web.artifact>flink-runtime-web</flink.runtime.web.artifact> - </properties> - </profile> - - <profile> - <id>flink-1.17</id> - <modules> - <module>client-flink/common</module> - <module>client-flink/flink-1.17</module> - <module>client-flink/flink-1.17-shaded</module> - <module>tests/flink-it</module> - </modules> - <properties> - <flink.version>1.17.2</flink.version> - <flink.binary.version>1.17</flink.binary.version> - <scala.binary.version>2.12</scala.binary.version> - <celeborn.flink.plugin.artifact>celeborn-client-flink-1.17_${scala.binary.version}</celeborn.flink.plugin.artifact> - <flink.streaming.artifact>flink-streaming-java</flink.streaming.artifact> - <flink.clients.artifact>flink-clients</flink.clients.artifact> - <flink.runtime.web.artifact>flink-runtime-web</flink.runtime.web.artifact> - </properties> - </profile> - <profile> <id>flink-1.18</id> <modules> diff --git a/project/CelebornBuild.scala b/project/CelebornBuild.scala index 28108b062..f4aca0c2a 100644 --- a/project/CelebornBuild.scala +++ b/project/CelebornBuild.scala @@ -535,8 +535,6 @@ object Utils { val FLINK_VERSION = profiles.filter(_.startsWith("flink")).headOption lazy val flinkClientProjects = FLINK_VERSION match { - case Some("flink-1.16") => Some(Flink116) - case Some("flink-1.17") => Some(Flink117) case Some("flink-1.18") => Some(Flink118) case Some("flink-1.19") => Some(Flink119) case Some("flink-1.20") => Some(Flink120) @@ -1239,30 +1237,6 @@ trait SparkClientProjects { // Flink Client // //////////////////////////////////////////////////////// -object Flink116 extends FlinkClientProjects { - val flinkVersion = "1.16.3" - - // note that SBT does not allow using the period symbol (.) in project names. - val flinkClientProjectPath = "client-flink/flink-1.16" - val flinkClientProjectName = "celeborn-client-flink-1_16" - val flinkClientShadedProjectPath: String = "client-flink/flink-1.16-shaded" - val flinkClientShadedProjectName: String = "celeborn-client-flink-1_16-shaded" - - override val dependOnCommonTiered: Boolean = false -} - -object Flink117 extends FlinkClientProjects { - val flinkVersion = "1.17.2" - - // note that SBT does not allow using the period symbol (.) in project names. - val flinkClientProjectPath = "client-flink/flink-1.17" - val flinkClientProjectName = "celeborn-client-flink-1_17" - val flinkClientShadedProjectPath: String = "client-flink/flink-1.17-shaded" - val flinkClientShadedProjectName: String = "celeborn-client-flink-1_17-shaded" - - override val dependOnCommonTiered: Boolean = false -} - object Flink118 extends FlinkClientProjects { val flinkVersion = "1.18.1" @@ -1363,11 +1337,8 @@ trait FlinkClientProjects { // 1.20.3 -> 1.20 // 1.19.3 -> 1.19 // 1.18.1 -> 1.18 - // 1.17.2 -> 1.17 - // 1.16.3 -> 1.16 lazy val flinkMajorVersion: String = flinkVersion.split("\\.").take(2).reduce(_ + "." + _) - // the output would be something like: celeborn-client-flink-1.17-shaded_2.12-0.4.0-SNAPSHOT.jar def flinkClientShadeJarName( revision: String, artifact: Artifact, diff --git a/tests/flink-it/src/test/java/org/apache/celeborn/tests/flink/FlinkVersion.java b/tests/flink-it/src/test/java/org/apache/celeborn/tests/flink/FlinkVersion.java index ddf40c993..43fee92f6 100644 --- a/tests/flink-it/src/test/java/org/apache/celeborn/tests/flink/FlinkVersion.java +++ b/tests/flink-it/src/test/java/org/apache/celeborn/tests/flink/FlinkVersion.java @@ -23,8 +23,6 @@ import org.apache.flink.annotation.Public; /** All supported flink versions. */ @Public public enum FlinkVersion { - v1_16("1.16"), - v1_17("1.17"), v1_18("1.18"), v1_19("1.19"), v1_20("1.20"), @@ -40,10 +38,6 @@ public enum FlinkVersion { public static FlinkVersion fromVersionStr(String versionStr) { switch (versionStr) { - case "1.16": - return v1_16; - case "1.17": - return v1_17; case "1.18": return v1_18; case "1.19":
