Normalize relation order in "are not colocated" detail to fix flaky mixed-version tests#8605
Draft
Copilot wants to merge 3 commits into
Draft
Normalize relation order in "are not colocated" detail to fix flaky mixed-version tests#8605Copilot wants to merge 3 commits into
Copilot wants to merge 3 commits into
Conversation
Copilot
AI
changed the title
[WIP] Fix nondeterministic ordering in DETAIL output for regression tests
Normalize relation order in "are not colocated" detail to fix flaky mixed-version tests
Jun 1, 2026
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #8605 +/- ##
==========================================
+ Coverage 87.99% 88.73% +0.73%
==========================================
Files 288 288
Lines 64382 64385 +3
Branches 8108 8109 +1
==========================================
+ Hits 56650 57129 +479
+ Misses 5381 4912 -469
+ Partials 2351 2344 -7 🚀 New features to boost your workflow:
|
Run ci/normalize_expected.sh so the committed expected .out files match the new normalize.sed rule that collapses the two relation names in the "DETAIL: X and Y are not colocated" message to <relation> placeholders. Fixes the failing check-style step (ci/normalize_expected.sh && git diff --exit-code). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
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.
DESCRIPTION: Normalize relation order in "not colocated" error detail
Mixed-version (N/N‑1) regression runs intermittently diff only on the order of relation names in the colocation error detail:
Why
5a71f0d(#8319) didn't fix itThat commit sorts the two names in C (
ErrorIfUnsupportedShardDistribution), which is correct for single-version runs. But the failing run comes from #8431's mixed-version testing, where the planner emitting the error may run an older Citus library that predates the sort and still prints names in nondeterministic order. The C-level fix can't affect output produced by an older library.Change
src/test/regress/bin/normalize.sedcanonicalizing the two relation names in theDETAIL: X and Y are not colocatedline to placeholders, so both orderings (old and new library) compare equal:Scoped to this message only — leaves the shard-level
Shard N of X and shard M of Y are not colocated.and the foreign-keyrelations are not colocated or not referencing...messages untouched. No production code or expected.outfiles change.