Skip to content

chore: remove the Spark 3.4 shim source sets - #7560

Open
andygrove wants to merge 6 commits into
apache:mainfrom
andygrove:remove-spark-3.4-shims
Open

andygrove wants to merge 6 commits into
apache:mainfrom
andygrove:remove-spark-3.4-shims

Conversation

@andygrove

@andygrove andygrove commented Nov 7, 2026 •

Copy link
Copy Markdown
Member

Which issue does this PR close?

Part of #4329.

Rationale for this change

#7521 removes the spark-3.4 Maven profile and stops running Spark 3.4 in CI, but leaves the Spark 3.4 shim source sets behind. Nothing builds them now, so they are dead code that has to be kept in step with the other shims. This is the follow-up that deletes them.

What changes are included in this PR?

  • Delete spark/src/main/spark-3.4/ and spark/src/test/spark-3.4/. Every file in them has a counterpart in spark-3.5/ or is a 3.5-only addition there, so the spark-3.5, spark-3.x and spark-4.x source sets are unchanged.
  • Remove the spark-3.4 path entries from dev/ci/compute-changes.py. They only excluded edits to the deleted directory from triggering other jobs.
  • Update comments that described 3.4 (ShimCometMapInBatch, GenerateDocs).
  • Update the contributor and user docs that described Spark 3.4 behavior or listed spark-3.4 as a shim directory, and redraw shim_pattern.svg with the 3.5 and 4.x editions.

Deliberately not touched:

How are these changes tested?

  • python3 dev/ci/check-ci-config.py, check-versioned-source-parity.py and check-suites.py pass.
  • prettier --check passes on the changed Markdown, and shim_pattern.svg parses as XML.
  • Not run: a Maven build. No remaining profile compiles the deleted directories, and the only Scala changes are comments. CI on this PR exercises the remaining profiles.

Delete spark/src/main/spark-3.4 and spark/src/test/spark-3.4, which no profile builds since the spark-3.4 profile was removed, and update the CI path filters and docs that referenced them.
@andygrove
andygrove marked this pull request as ready for review November 9, 2026 12:55
@andygrove
andygrove requested a review from manuzhang November 9, 2026 12:55
@andygrove
andygrove added this pull request to the merge queue Nov 9, 2026

@mbutrovich mbutrovich left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @andygrove!

@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to no response for status checks Nov 9, 2026
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.

3 participants