Spark: Restore 4.2 commit history - #17967
Open
manuzhang wants to merge 5 commits into
Open
Conversation
Generated-by: Codex
manuzhang
force-pushed
the
spark42-history-replay
branch
from
September 6, 2026 02:11
8c4fb18 to
ceb5000
Compare
Member
Author
|
@szehon-ho @huaxingao @nssalian This is to fix the Spark 4.2 commit history and should be
|
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.
Summary
031135677395a3fbc90a2e33f58a9fa3983335f5) and its follow-up cleanup (e76d63584d7f83b102026749e1ae0f91813cb78e).spark/v4.1tospark/v4.2, copy it back, and add Spark 4.2 support. The support commit includes all follow-up fixes.StreamingOffsetJSON generation (Core, Hive, Spark: Auto close JsonGenerator using try-with-resources #17931).TableInfoAPI changes from Spark 4.1: Mark overrides of deprecated Spark API as deprecated #16028 out of Spark 4.2, where the requiredCatalogV2Utilsignatures are unavailable.The cleanup from #17952 remains present because the replay starts from the current Spark 4.1 sources.
Merge Requirement
This PR must not be squash-merged because squashing would discard the commit and rename history it restores. Please use a merge commit or rebase merge.
Validation
./gradlew --no-daemon :iceberg-spark:iceberg-spark-4.2_2.13:assemble :iceberg-spark:iceberg-spark-extensions-4.2_2.13:assemble :iceberg-spark:iceberg-spark-runtime-4.2_2.13:assemble./gradlew --no-daemon :iceberg-spark:iceberg-spark-4.2_2.13:test --tests org.apache.iceberg.spark.TestSparkExecutorCache --tests org.apache.iceberg.spark.actions.TestRewriteDataFilesActiongit diff --check upstream/main...HEADspark/v4.1is unchanged fromupstream/mainAI Disclosure