Skip to content

Commit

Permalink
Clean up unused and duplicated 'org/roaringbitmap' folder
Browse files Browse the repository at this point in the history
To fix: #11175

Clean up unused and duplicated 'org/roaringbitmap' in the spark320 shim folder to work around for the JACOCO error 'different class with same name', after we drop 31x shims and change the default shim to spark320

Signed-off-by: Tim Liu <[email protected]>
  • Loading branch information
NvTimLiu committed Jul 12, 2024
1 parent 38ed9ae commit bd27713
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion jenkins/spark-premerge-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ mvn_verify() {
# extract the .class files in udf jar and replace the existing ones in spark3xx-ommon and spark$SPK_VER
# because the class files in udf jar will be modified in aggregator's shade phase
jar xf "$UDF_JAR" com/nvidia/spark/udf
rm -rf com/nvidia/shaded/ org/openucx/ spark-shared/com/nvidia/spark/udf/ spark${SPK_VER}/com/nvidia/spark/udf/
# TODO Should clean up unused and duplicated 'org/roaringbitmap' in the spark3xx shim folders, https://github.com/NVIDIA/spark-rapids/issues/11175
rm -rf com/nvidia/shaded/ org/openucx/ spark${SPK_VER}/META-INF/versions/*/org/roaringbitmap/ spark-shared/com/nvidia/spark/udf/ spark${SPK_VER}/com/nvidia/spark/udf/
popd

# Triggering here until we change the jenkins file
Expand Down

0 comments on commit bd27713

Please sign in to comment.