[SPARK-40677][CONNECT][FOLLOWUP] Refactor shade relocation/rename rules
#38162
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -655,19 +655,47 @@ object SparkConnect { | |
|
|
||
| (assembly / logLevel) := Level.Info, | ||
|
|
||
| // Exclude `scala-library` from assembly. | ||
| (assembly / assemblyPackageScala / assembleArtifact) := false, | ||
|
|
||
| // Exclude `pmml-model-*.jar`, `scala-collection-compat_*.jar`,`jsr305-*.jar` and | ||
| // `netty-*.jar` and `unused-1.0.0.jar` from assembly. | ||
| (assembly / assemblyExcludedJars) := { | ||
| val cp = (assembly / fullClasspath).value | ||
| cp filter { v => | ||
| val name = v.data.getName | ||
| name.startsWith("pmml-model-") || name.startsWith("scala-collection-compat_") || | ||
| name.startsWith("jsr305-") || name.startsWith("netty-") || name == "unused-1.0.0.jar" | ||
|
Contributor
Author
There was a problem hiding this comment. @HyukjinKwon should we share Netty with Spark?
Contributor
Author
There was a problem hiding this comment. Maybe we need merge #38185 first, otherwise, netty cannot be filtered out here |
||
| } | ||
| }, | ||
|
|
||
| (assembly / assemblyShadeRules) := Seq( | ||
| ShadeRule.rename("io.grpc.**" -> "org.sparkproject.connect.grpc.@0").inAll, | ||
| ShadeRule.rename("com.google.common.**" -> "org.sparkproject.connect.guava.@1").inAll, | ||
| ShadeRule.rename("com.google.thirdparty.**" -> "org.sparkproject.connect.guava.@1").inAll, | ||
| ShadeRule.rename("com.google.protobuf.**" -> "org.sparkproject.connect.protobuf.@1").inAll, | ||
| ShadeRule.rename("android.annotation.**" -> "org.sparkproject.connect.android_annotation.@1").inAll, | ||
|
Contributor
There was a problem hiding this comment. just a nit:
Contributor
Author
There was a problem hiding this comment. No, I think we should follow the existing rules, |
||
| ShadeRule.rename("io.perfmark.**" -> "org.sparkproject.connect.io_perfmark.@1").inAll, | ||
| ShadeRule.rename("org.codehaus.mojo.animal_sniffer.**" -> "org.sparkproject.connect.animal_sniffer.@1").inAll, | ||
| ShadeRule.rename("com.google.j2objc.annotations.**" -> "org.sparkproject.connect.j2objc_annotations.@1").inAll, | ||
| ShadeRule.rename("com.google.errorprone.annotations.**" -> "org.sparkproject.connect.errorprone_annotations.@1").inAll, | ||
| ShadeRule.rename("org.checkerframework.**" -> "org.sparkproject.connect.checkerframework.@1").inAll, | ||
| ShadeRule.rename("com.google.gson.**" -> "org.sparkproject.connect.gson.@1").inAll, | ||
| ShadeRule.rename("com.google.api.**" -> "org.sparkproject.connect.google_protos.api.@1").inAll, | ||
| ShadeRule.rename("com.google.cloud.**" -> "org.sparkproject.connect.google_protos.cloud.@1").inAll, | ||
| ShadeRule.rename("com.google.geo.**" -> "org.sparkproject.connect.google_protos.geo.@1").inAll, | ||
| ShadeRule.rename("com.google.logging.**" -> "org.sparkproject.connect.google_protos.logging.@1").inAll, | ||
| ShadeRule.rename("com.google.longrunning.**" -> "org.sparkproject.connect.google_protos.longrunning.@1").inAll, | ||
| ShadeRule.rename("com.google.rpc.**" -> "org.sparkproject.connect.google_protos.rpc.@1").inAll, | ||
| ShadeRule.rename("com.google.type.**" -> "org.sparkproject.connect.google_protos.type.@1").inAll | ||
| ), | ||
|
|
||
| (assembly / assemblyMergeStrategy) := { | ||
| case m if m.toLowerCase(Locale.ROOT).endsWith("manifest.mf") => MergeStrategy.discard | ||
| // Drop all proto files that are not needed as artifacts of the build. | ||
| case m if m.toLowerCase(Locale.ROOT).endsWith(".proto") => MergeStrategy.discard | ||
| case _ => MergeStrategy.first | ||
| } | ||
| ) | ||
| } | ||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is
scala-collectionpicked up from Scala library itself? I remember there's an option to exclude this (e.g.,includeScala = False)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should be
(assembly / assemblyPackageScala / assembleArtifact) := false, but I foundscala-collectionwas not excluded, let me tryThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@HyukjinKwon The results are the same, from the document, it should be this option, but it only excludes the
scala-library, not the 'scala-collection compat_'.