This is an automated email from the ASF dual-hosted git repository. xianjingfeng pushed a commit to branch branch-0.8 in repository https://gitbox.apache.org/repos/asf/incubator-uniffle.git
commit e7cf955bf6171ead2d1e86efac68401900b87fea Author: xianjingfeng <[email protected]> AuthorDate: Tue Oct 31 10:56:46 2023 +0800 [#1274] feat: add shaded module for spark2 client (#1280) ### What changes were proposed in this pull request? add shaded module for spark2 client ### Why are the changes needed? Fix: #1274 ### Does this PR introduce any user-facing change? spark2 shaded jar is renamed to rss-client-spark2-shaded-${version}.jar ### How was this patch tested? CI (cherry picked from commit 576f7cb65f336dadd999de57dd8b644f21f055e4) --- build_distribution.sh | 2 +- client-spark/{spark2 => spark2-shaded}/pom.xml | 66 +------ .../src/main/resources/META-INF/LICENSE | 202 +++++++++++++++++++++ .../src/main/resources/META-INF/NOTICE | 7 + client-spark/spark2/pom.xml | 127 ------------- pom.xml | 3 +- 6 files changed, 220 insertions(+), 187 deletions(-) diff --git a/build_distribution.sh b/build_distribution.sh index 6f8e3d1a7..a15f0ae9a 100755 --- a/build_distribution.sh +++ b/build_distribution.sh @@ -190,7 +190,7 @@ echo -e "\$ ${BUILD_COMMAND_SPARK2[@]}\n" SPARK_CLIENT2_JAR_DIR="${CLIENT_JAR_DIR}/spark2" mkdir -p $SPARK_CLIENT2_JAR_DIR -SPARK_CLIENT2_JAR="${RSS_HOME}/client-spark/spark2/target/shaded/rss-client-spark2-${VERSION}-shaded.jar" +SPARK_CLIENT2_JAR="${RSS_HOME}/client-spark/spark2-shaded/target/rss-client-spark2-shaded-${VERSION}.jar" echo "copy $SPARK_CLIENT2_JAR to ${SPARK_CLIENT2_JAR_DIR}" cp $SPARK_CLIENT2_JAR ${SPARK_CLIENT2_JAR_DIR} diff --git a/client-spark/spark2/pom.xml b/client-spark/spark2-shaded/pom.xml similarity index 78% copy from client-spark/spark2/pom.xml copy to client-spark/spark2-shaded/pom.xml index e5ba9d220..471926234 100644 --- a/client-spark/spark2/pom.xml +++ b/client-spark/spark2-shaded/pom.xml @@ -15,75 +15,27 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="http://maven.apache.org/POM/4.0.0"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<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.uniffle</groupId> <artifactId>uniffle-parent</artifactId> - <version>0.8.0</version> + <version>0.9.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>rss-client-spark2</artifactId> + <artifactId>rss-client-spark2-shaded</artifactId> <packaging>jar</packaging> - <name>Apache Uniffle Client (Spark 2)</name> + <name>Apache Uniffle Shaded Client (Spark 2)</name> <dependencies> <dependency> <groupId>org.apache.uniffle</groupId> - <artifactId>rss-client</artifactId> - </dependency> - <dependency> - <groupId>org.apache.uniffle</groupId> - <artifactId>rss-client-spark-common</artifactId> + <artifactId>rss-client-spark2</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.spark</groupId> - <artifactId>spark-core_${scala.binary.version}</artifactId> - <version>${spark.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-inline</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </dependency> - <dependency> - <groupId>org.apache.uniffle</groupId> - <artifactId>shuffle-storage</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.uniffle</groupId> - <artifactId>rss-client-spark-common</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - <version>${jackson.version}</version> - <scope>test</scope> - </dependency> </dependencies> <build> @@ -93,14 +45,12 @@ <artifactId>maven-shade-plugin</artifactId> <executions> <execution> - <id>rss-client-spark2-jar</id> + <id>rss-client-spark2-shaded-jar</id> <phase>package</phase> <goals> <goal>shade</goal> </goals> <configuration> - <outputDirectory>${project.build.directory}/shaded</outputDirectory> - <shadedArtifactAttached>true</shadedArtifactAttached> <artifactSet> <includes> <include>org.apache.uniffle:*</include> diff --git a/client-spark/spark2-shaded/src/main/resources/META-INF/LICENSE b/client-spark/spark2-shaded/src/main/resources/META-INF/LICENSE new file mode 100644 index 000000000..d64569567 --- /dev/null +++ b/client-spark/spark2-shaded/src/main/resources/META-INF/LICENSE @@ -0,0 +1,202 @@ + + 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. diff --git a/client-spark/spark2-shaded/src/main/resources/META-INF/NOTICE b/client-spark/spark2-shaded/src/main/resources/META-INF/NOTICE new file mode 100644 index 000000000..2cfb9fb7c --- /dev/null +++ b/client-spark/spark2-shaded/src/main/resources/META-INF/NOTICE @@ -0,0 +1,7 @@ +Apache Uniffle (incubating) +Copyright 2022 and onwards The Apache Software Foundation. + +This product includes software developed at +The Apache Software Foundation (https://www.apache.org/). + +The initial codebase was donated to the ASF by Tencent, copyright 2020-2022. diff --git a/client-spark/spark2/pom.xml b/client-spark/spark2/pom.xml index e5ba9d220..62ecce27c 100644 --- a/client-spark/spark2/pom.xml +++ b/client-spark/spark2/pom.xml @@ -85,131 +85,4 @@ <scope>test</scope> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <executions> - <execution> - <id>rss-client-spark2-jar</id> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/shaded</outputDirectory> - <shadedArtifactAttached>true</shadedArtifactAttached> - <artifactSet> - <includes> - <include>org.apache.uniffle:*</include> - <include>com.google.protobuf:*</include> - <include>com.google.code.gson:gson</include> - <include>io.grpc:*</include> - <include>com.google.android:annotations</include> - <include>io.perfmark:perfmark-api</include> - <include>io.netty:netty-all</include> - <include>com.google.api.grpc:proto-google-common-protos</include> - <include>org.codehaus.mojo:animal-sniffer-annotations</include> - <include>com.google.guava:*</include> - <include>com.fasterxml.jackson.core:jackson-databind</include> - <include>com.fasterxml.jackson.core:jackson-core</include> - <include>com.fasterxml.jackson.core:jackson-annotations</include> - <include>org.roaringbitmap:RoaringBitmap</include> - <include>org.roaringbitmap:shims</include> - </includes> - </artifactSet> - <finalName>${project.artifactId}-${project.version}</finalName> - <transformers> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/> - </transformers> - <filters> - <filter> - <artifact>*:*</artifact> - <excludes> - <exclude>LICENSE</exclude> - <exclude>META-INF/*.SF</exclude> - <exclude>META-INF/*.DSA</exclude> - <exclude>META-INF/*.RSA</exclude> - </excludes> - </filter> - </filters> - <relocations> - <relocation> - <pattern>com.google.protobuf</pattern> - <shadedPattern>${rss.shade.packageName}.com.google.protobuf</shadedPattern> - </relocation> - <relocation> - <pattern>com.google.common</pattern> - <shadedPattern>${rss.shade.packageName}.com.google.common</shadedPattern> - </relocation> - <relocation> - <pattern>google.protobuf</pattern> - <shadedPattern>${rss.shade.packageName}.google.protobuf</shadedPattern> - </relocation> - <relocation> - <pattern>com.fasterxml.jackson.core</pattern> - <shadedPattern>${rss.shade.packageName}.jackson.core</shadedPattern> - </relocation> - <relocation> - <pattern>com.fasterxml.jackson.databind</pattern> - <shadedPattern>${rss.shade.packageName}.jackson.databind</shadedPattern> - </relocation> - <relocation> - <pattern>com.fasterxml.jackson.annotation</pattern> - <shadedPattern>${rss.shade.packageName}.jackson.annotation</shadedPattern> - </relocation> - <relocation> - <pattern>io.netty</pattern> - <shadedPattern>${rss.shade.packageName}.io.netty</shadedPattern> - </relocation> - <relocation> - <pattern>org.roaringbitmap</pattern> - <shadedPattern>${rss.shade.packageName}.org.roaringbitmap</shadedPattern> - </relocation> - </relocations> - </configuration> - </execution> - <!-- shade the native netty libs as well --> - <execution> - <id>unpack</id> - <phase>package</phase> - <configuration> - <target> - <echo message="Shade netty native libraries to ${rss.shade.packageName}" /> - <unzip src="${project.artifactId}-${project.version}.jar" dest="${project.build.directory}/unpacked/" /> - <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="lib${rss.shade.packageName}_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="lib${rss.shade.packageName}_shaded_netty_transport_native_epoll_aarch_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_kqueue_x86_64.jnilib" - to="lib${rss.shade.packageName}_shaded_netty_transport_native_kqueue_x86_64.jnilib" - type="glob"></mapper> - </move> - <echo message="repackaging netty jar"></echo> - <jar destfile="${project.artifactId}-${project.version}.jar" basedir="${project.build.directory}/unpacked" /> - </target> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> </project> diff --git a/pom.xml b/pom.xml index 38beb7810..73d12279f 100644 --- a/pom.xml +++ b/pom.xml @@ -121,7 +121,6 @@ <module>client</module> <module>integration-test/common</module> <module>cli</module> - <module>client-spark/spark3-shaded</module> </modules> <dependencies> @@ -1203,6 +1202,7 @@ <modules> <module>client-spark/common</module> <module>client-spark/spark2</module> + <module>client-spark/spark2-shaded</module> <module>integration-test/spark-common</module> <module>integration-test/spark2</module> </modules> @@ -1262,6 +1262,7 @@ <modules> <module>client-spark/common</module> <module>client-spark/spark2</module> + <module>client-spark/spark2-shaded</module> <module>integration-test/spark-common</module> </modules> <dependencyManagement>
