-
Notifications
You must be signed in to change notification settings - Fork 355
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.
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
[CELEBORN-885][SPARK] Shade RoaringBitmap to avoid dependency conflicts #1803
Conversation
sbt should be updated too, cc @cfmcgrady |
Codecov Report
@@ Coverage Diff @@
## main #1803 +/- ##
==========================================
- Coverage 46.60% 46.59% -0.00%
==========================================
Files 162 162
Lines 10079 10078 -1
Branches 928 927 -1
==========================================
- Hits 4696 4695 -1
+ Misses 5073 5072 -1
- Partials 310 311 +1 see 3 files with indirect coverage changes 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
Would you mind updating the file val cp = (assembly / fullClasspath).value
cp filter { v =>
val name = v.data.getName
- !(name.startsWith("celeborn-") || name.startsWith("protobuf-java-") ||
- name.startsWith("guava-") || name.startsWith("netty-") || name.startsWith("commons-lang3-"))
+ !(name.startsWith("celeborn-") ||
+ name.startsWith("protobuf-java-") ||
+ name.startsWith("guava-") ||
+ name.startsWith("netty-") ||
+ name.startsWith("commons-lang3-") ||
+ name.startsWith("RoaringBitmap-"))
}
},
ShadeRule.rename("com.google.protobuf.**" -> "org.apache.celeborn.shaded.com.google.protobuf.@1").inAll,
ShadeRule.rename("com.google.common.**" -> "org.apache.celeborn.shaded.com.google.common.@1").inAll,
ShadeRule.rename("io.netty.**" -> "org.apache.celeborn.shaded.io.netty.@1").inAll,
- ShadeRule.rename("org.apache.commons.**" -> "org.apache.celeborn.shaded.org.apache.commons.@1").inAll
+ ShadeRule.rename("org.apache.commons.**" -> "org.apache.celeborn.shaded.org.apache.commons.@1").inAll,
+ ShadeRule.rename("org.roaringbitmap.**" -> "org.apache.celeborn.shaded.org.roaringbitmap.@1").inAll
),
(assembly / assemblyMergeStrategy) := { |
BTW, NOTICE for the shaded module should be updated too |
OK,I‘ll update it.
RoaringBitmap has no notice and its using Apache Licencese V2. We already contains its license info in LICENSE-binary file.
I'll update it. |
RoarbingBitmap has no notice and its using apache license. We already contains its license info in LICENSE-binary. Is there anything else need to put in NOTICE? |
Not the NOTICE-binary, technically, each jar we published to maven central should contain its own NOTICE file, which reflects the real content itself. For shaded jars, we need to maintain the NOTICE file manually. |
Any reference for bundle notice into jar file? |
What changes were proposed in this pull request?
Shade roaring bitmap to void dependency conflicts.
Why are the changes needed?
Some user reports that celeborn client will introduce roaring bitmap conflicts.
Does this PR introduce any user-facing change?
NO.
How was this patch tested?
GA and cluster.