[CORE] Fix Delta 4.0 Spark 4.1 package build#12078
Open
malinjawi wants to merge 1 commit into
Open
Conversation
malinjawi
force-pushed
the
fix/delta40-nightly-package
branch
from
0560d84 to
f8e7c1f
Compare
malinjawi
changed the title
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
What changes were proposed in this pull request?
This PR fixes the nightly package failure for the Spark 4.1 + Delta 4.0 Velox build path.
Changes:
Loggingplus explicitSparkMDC.of(...)calls in Delta 4.0 logging code so the code compiles across Spark 4.0, Spark 4.1, Delta 4.0, and Delta 4.1.CheckpointFileManagerandMemoryStreampackages.Why are the changes needed?
The nightly package build compiles Spark 4.1 with
-Pdelta, but PR CI only covered Delta on the Spark 4.0 fast-build path. Spark 4.1 changed the logging MDC shape and moved streaming APIs used by Delta 4.0, so the issue only surfaced in nightly packaging.Delta 4.1 also drops the
org.apache.spark.internal.LoggingShimsclass that Delta 4.0 published, so using SparkLoggingkeeps this copied Delta 4.0 source compatible with the newer Delta artifact line as well.How was this patch tested?
./build/mvn -ntp -pl shims/spark41 clean install -Pspark-4.1 -Pscala-2.13 -Pjava-21 -DskipTests -Dmaven.source.skip./build/mvn -ntp -pl backends-velox -am clean install -Pspark-4.1 -Pscala-2.13 -Pjava-21 -Pbackends-velox -Pceleborn -Puniffle -Pdelta -DskipTests -Dmaven.source.skip./build/mvn -ntp -pl backends-velox -am clean install -Pspark-4.0 -Pscala-2.13 -Pjava-21 -Pbackends-velox -Pceleborn -Puniffle -Piceberg -Phudi -Pdelta -Ppaimon -DskipTests -Dmaven.source.skip./build/mvn -ntp -pl backends-velox -am clean test-compile -Pspark-4.1 -Pscala-2.13 -Pjava-21 -Pbackends-velox -Pceleborn -Puniffle -Pdelta -Ddelta.package.name=delta-spark_4.1 -Ddelta.version=4.1.0 -Ddelta.binary.version=40 -DskipTests -Dmaven.source.skip./build/mvn -ntp -pl backends-velox -am clean test-compile -Pspark-4.1 -Pscala-2.13 -Pjava-21 -Pbackends-velox -Pceleborn -Puniffle -Pdelta -DskipTests -Dmaven.source.skip./build/mvn -ntp -pl backends-velox -am clean test-compile -Pspark-4.0 -Pscala-2.13 -Pjava-21 -Pbackends-velox -Pceleborn -Puniffle -Pdelta -DskipTests -Dmaven.source.skipgit diff --check