chore: bump Spark 4.0 to 4.0.4 - #5182
Open
andygrove wants to merge 2 commits into
Open
Conversation
Rename dev/diffs/4.0.2.diff to 4.0.4.diff and regenerate it against the v4.0.4 tag, and point the build, CI workflows, and docs at 4.0.4.
mbutrovich
approved these changes
Jul 31, 2026
mbutrovich
left a comment
Contributor
There was a problem hiding this comment.
Approved pending CI, thanks @andygrove!
# Conflicts: # docs/source/user-guide/latest/installation.md
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
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.
Which issue does this PR close?
N/A — routine patch-version bump within the already-supported Spark 4.0 line.
Rationale for this change
Spark 4.0 support should track the latest Spark 4.0 patch release. Apache Spark
4.0.4 has been released (tag
v4.0.4), so this moves Comet's Spark 4.0 build,CI, and documentation from 4.0.2 to 4.0.4 (skipping 4.0.3).
What changes are included in this PR?
<spark.version>in thespark-4.0Maven profile to 4.0.4. Spark 4.0.4makes no transitive dependency changes relative to 4.0.2 (
scala.version,parquet.version,slf4j.version,jetty.version,hadoop.versionandarrow.versionare all unchanged), so no other profile properties move.dev/diffs/4.0.2.difftodev/diffs/4.0.4.diffand regenerates itagainst the
v4.0.4tag. Three hunks needed manual reapplication, all pureimport-line context drift with no behavioural change:
DataFrameWindowFunctionsSuite.scala— upstream added acatalyst.trees.UnaryLikeimport between the patched neighbours.KeyGroupedPartitioningSuite.scala— upstream addedRDDScanExecto aneighbouring import.
WriteDistributionAndOrderingSuite.scala— upstream addedTransformExpressionto a neighbouring import.HiveUDFDynamicLoadSuitecomment.
hive-test-udfs.jaris still stripped from the 4.0.4 release sourcetag (only a
READMEremains undersql/hive/src/test/noclasspath/), so theIgnoreCometSuitemixin is still required.pysparkpin at 4.0.4,and updates
dev/ci/compute-changes.py'sspark_4_0path filter to the newdiff filename.
compatibility page.
How are these changes tested?
git apply --check dev/diffs/4.0.4.diffagainst a pristinev4.0.4checkoutpasses with no rejects or fuzz.
diff, and that its only content differences from 4.0.2 are the context lines
and comment version strings above.
npx prettier --checkon the modified markdown.(
run-spark-4.0-tests) — that label should be applied before merge.