Skip to content

Spark: Restore 4.2 commit history - #17967

Open
manuzhang wants to merge 5 commits into
apache:mainfrom
manuzhang:spark42-history-replay
Open

Spark: Restore 4.2 commit history#17967
manuzhang wants to merge 5 commits into
apache:mainfrom
manuzhang:spark42-history-replay

Conversation

@manuzhang

@manuzhang manuzhang commented Sep 6, 2026

Copy link
Copy Markdown
Member

Summary

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.TestRewriteDataFilesAction
  • git diff --check upstream/main...HEAD
  • Verified spark/v4.1 is unchanged from upstream/main

AI Disclosure

  • Model: GPT-5
  • Platform/Tool: Codex
  • Human Oversight: partially reviewed
  • Prompt Summary: Revert the squashed Spark 4.2 commits and replay the original commits from PR Spark: Add support for 4.2.0 #14984 while preserving current Spark 4.2 compatibility.

@github-actions github-actions Bot added the spark label Sep 6, 2026
@manuzhang

Copy link
Copy Markdown
Member Author

@szehon-ho @huaxingao @nssalian This is to fix the Spark 4.2 commit history and should be Rebase and merge. Here are the detailed changes. We'd better move fast to avoid further conflicts and complexity. Please take a look. Thanks!

Summary

The cleanup from #17952 remains present because the replay starts from the current Spark 4.1 sources.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant