Skip to content

[SPARK-50166][SQL][BUILD] Fix shade and relocation rule of sql/core module #48675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
LuciferYang wants to merge 9 commits into from
Closed

[SPARK-50166][SQL][BUILD] Fix shade and relocation rule of sql/core module #48675

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b12ad0c
fix
LuciferYang Oct 28, 2024
0a038f0
maven test
LuciferYang Oct 28, 2024
1ad36dd
Merge branch 'apache:master' into sql-core-shade
LuciferYang Oct 30, 2024
123e851
revert maven test
LuciferYang Oct 30, 2024
439c3c6
Merge branch 'apache:master' into sql-core-shade
LuciferYang Oct 30, 2024
3e9956c
fix more
LuciferYang Oct 30, 2024
9f3ac6b
re test maven
LuciferYang Oct 30, 2024
5acd5c8
use combine.self = override
LuciferYang Oct 30, 2024
42a6400
Revert maven test
LuciferYang Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions sql/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,27 +272,24 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<configuration>
<configuration combine.self = "override">
<shadedArtifactAttached>false</shadedArtifactAttached>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<artifactSet>
<includes>
<include>com.google.protobuf:*</include>
<include>org.spark-project.spark:unused</include>
</includes>
</artifactSet>
<relocations>
<relocation>
<pattern>com.google</pattern>
<shadedPattern>${spark.shade.packageName}.com.google</shadedPattern>
<excludes>
<!-- Guava is relocated to ${spark.shade.packageName}.connect.guava -->
<exclude>com.google.common.**</exclude>
</excludes>
<pattern>com.google.common</pattern>
Copy link
Contributor Author

@LuciferYang LuciferYang Oct 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @pan3793

Copy link
Member

@pan3793 pan3793 Oct 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the effective relocation rules are very confusing, seems to be affected by parent pom

Copy link
Contributor Author

@LuciferYang LuciferYang Oct 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can use combine.self = "override" to resolve this issue.

<shadedPattern>${spark.shade.packageName}.guava</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.protobuf</pattern>
<shadedPattern>${spark.shade.packageName}.spark_core.protobuf</shadedPattern>
</relocation>
</relocations>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
</transformers>
</configuration>
</plugin>
<!--
Expand Down