test: dedupe redundant Spark 4.2 TPC-DS plan-stability golden files#4243
Merged
andygrove merged 1 commit intoapache:mainfrom May 6, 2026
Merged
Conversation
The fallback-chain prune step in CometPlanStabilitySuite was added in apache#4129 along with a regen for spark3_5/spark4_0/spark4_1, but the spark4_2 directory (added earlier in apache#4126) was never re-regenerated against the prune logic. Most spark4_2 query directories on main are byte-identical duplicates of either approved-plans-v1_4-spark4_1 or the base approved-plans-v1_4, and at read time the suite's fallback chain already resolves to the appropriate copy. This commit runs the full regen and prunes the duplicate spark4_2 entries. Net change: 262 extended.txt files removed across approved-plans-v1_4-spark4_2 and approved-plans-v2_7-spark4_2. The remaining spark4_2 entries (q2, q5, q54 in v1_4 and 2 in v2_7) are the queries whose plans actually differ from the spark4_1 fallback.
mbutrovich
approved these changes
May 6, 2026
Contributor
mbutrovich
left a comment
mbutrovich
left a comment
There was a problem hiding this comment.
You love to see it. Thanks @andygrove!
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
2 participants
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?
Closes #.
Rationale for this change
The fallback-chain prune step in
CometPlanStabilitySuitewas added in #4129 along with a regen forspark3_5,spark4_0, andspark4_1, but thespark4_2directory (added earlier in #4126) was never re-regenerated against the prune logic. As a result, most query directories underapproved-plans-v1_4-spark4_2/andapproved-plans-v2_7-spark4_2/are byte-identical duplicates of either thespark4_1directory or the baseapproved-plans-v1_4/approved-plans-v2_7directory. At read time the suite's fallback chain ingetDirForTestalready resolves to the appropriate copy, so these duplicates only add maintenance cost without changing test behavior.What changes are included in this PR?
Re-runs
./dev/regenerate-golden-files.sh(all Spark versions) on a clean checkout ofapache/mainand commits the resulting deletions. Net change: 262extended.txtfiles removed acrossapproved-plans-v1_4-spark4_2/andapproved-plans-v2_7-spark4_2/. No other directories changed.The remaining
spark4_2entries are queries whose plans actually differ from thespark4_1fallback:approved-plans-v1_4-spark4_2/: q2, q5, q54 (each with.native_datafusionand.native_iceberg_compatvariants).approved-plans-v2_7-spark4_2/: 2 entries.How are these changes tested?
./dev/regenerate-golden-files.shran for all five Spark versions (3.4, 3.5, 4.0, 4.1, 4.2) withCometTPCDSV1_4_PlanStabilitySuiteandCometTPCDSV2_7_PlanStabilitySuite, all passing. The deletions reflect the suite'spruneDuplicateQueryDirsstep, so the same suites continue to pass on the result.