[fix](enforcer) shuffle if has continuous project or filter on cte consumer #58964
Conversation
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
Contributor
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
Contributor
Author
|
run buildall |
TPC-H: Total hot run time: 35797 ms |
TPC-DS: Total hot run time: 182418 ms |
ClickBench: Total hot run time: 27.26 s |
Contributor
FE Regression Coverage ReportIncrement line coverage |
morrySnow
force-pushed
the
fix_multi_fragment
branch
from
d642552 to
f924bb4
Compare
Contributor
Author
|
run buildall |
TPC-H: Total hot run time: 36495 ms |
TPC-DS: Total hot run time: 178500 ms |
ClickBench: Total hot run time: 27.94 s |
Contributor
FE UT Coverage ReportIncrement line coverage |
Contributor
FE Regression Coverage ReportIncrement line coverage |
1 similar comment
Contributor
FE Regression Coverage ReportIncrement line coverage |
924060929
approved these changes
Dec 12, 2025
github-actions
bot
added
the
approved
Contributor
|
PR approved by at least one committer and no changes requested. |
Contributor
|
PR approved by anyone and no changes requested. |
Contributor
FE Regression Coverage ReportIncrement line coverage |
github-actions bot
pushed a commit
that referenced
this pull request
Dec 15, 2025
…nsumer (#58964) Related PR: #21412 Problem Summary: This pull request improves the handling of distribution properties (specifically "must shuffle") for `PhysicalProject` and `PhysicalFilter` nodes in the query planner, and adds comprehensive unit tests to ensure correctness. The main logic ensures that when certain child nodes require shuffling, the planner correctly adjusts the distribution requirements, especially in the presence of `Project`, `Filter`, and `Limit` nodes. Key changes include: **Distribution Property Handling Enhancements:** * Added logic in `ChildrenPropertiesRegulator` to check if a child node under a `PhysicalProject` or `PhysicalFilter` requires a "must shuffle" distribution, and to adjust the children’s properties accordingly. This is done via the new `mustShuffleUnderProjectOrFilter` method. * Included `PhysicalLimit` in the set of nodes that can trigger a shuffle requirement, by updating imports and logic. **Testing Improvements:** * Added a new test class `ChildrenPropertiesRegulatorTest.java` with detailed unit tests for the handling of "must shuffle" properties under `Project`, `Filter`, and `Limit` nodes. These tests use mocks to simulate various plan trees and assert correct distribution specification propagation. **Regression Test Coverage:** * Added a new regression test in `cte.groovy` to verify correct behavior when multiple `Project` nodes are present on a CTE consumer, ensuring the planner handles such cases as expected. These changes collectively make the planner more robust in handling complex plan trees with respect to distribution requirements, and ensure correctness through thorough testing.
morrySnow
added a commit
to morrySnow/incubator-doris
that referenced
this pull request
Dec 26, 2025
16 tasks
morrySnow
added a commit
to morrySnow/incubator-doris
that referenced
this pull request
Dec 29, 2025
morrySnow
added a commit
that referenced
this pull request
Dec 31, 2025
related PR #58964 Problem Summary: This pull request refactors how child physical plans are accessed in the `ChildrenPropertiesRegulator` class, simplifying the code and improving test clarity. The main change is the removal of the `getChildPhysicalPlan` helper method, replacing its usage with direct access to the plan from the `children` list. The tests are also updated to build child mocks more locally, improving test isolation and readability. Refactoring and Simplification: * Removed the `getChildPhysicalPlan` method from `ChildrenPropertiesRegulator`, and replaced its usage in `visitPhysicalFilter` and `visitPhysicalProject` with direct access to the child plan via `children.get(0).getPlan()`. This simplifies the code by eliminating unnecessary indirection.
github-actions bot
pushed a commit
that referenced
this pull request
Dec 31, 2025
related PR #58964 Problem Summary: This pull request refactors how child physical plans are accessed in the `ChildrenPropertiesRegulator` class, simplifying the code and improving test clarity. The main change is the removal of the `getChildPhysicalPlan` helper method, replacing its usage with direct access to the plan from the `children` list. The tests are also updated to build child mocks more locally, improving test isolation and readability. Refactoring and Simplification: * Removed the `getChildPhysicalPlan` method from `ChildrenPropertiesRegulator`, and replaced its usage in `visitPhysicalFilter` and `visitPhysicalProject` with direct access to the child plan via `children.get(0).getPlan()`. This simplifies the code by eliminating unnecessary indirection.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 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.
What problem does this PR solve?
Related PR: #21412
Problem Summary:
This pull request improves the handling of distribution properties (specifically "must shuffle") for
PhysicalProjectandPhysicalFilternodes in the query planner, and adds comprehensive unit tests to ensure correctness. The main logic ensures that when certain child nodes require shuffling, the planner correctly adjusts the distribution requirements, especially in the presence ofProject,Filter, andLimitnodes.Key changes include:
Distribution Property Handling Enhancements:
ChildrenPropertiesRegulatorto check if a child node under aPhysicalProjectorPhysicalFilterrequires a "must shuffle" distribution, and to adjust the children’s properties accordingly. This is done via the newmustShuffleUnderProjectOrFiltermethod. [1] [2] [3]PhysicalLimitin the set of nodes that can trigger a shuffle requirement, by updating imports and logic. [1] [2]Testing Improvements:
ChildrenPropertiesRegulatorTest.javawith detailed unit tests for the handling of "must shuffle" properties underProject,Filter, andLimitnodes. These tests use mocks to simulate various plan trees and assert correct distribution specification propagation.Regression Test Coverage:
cte.groovyto verify correct behavior when multipleProjectnodes are present on a CTE consumer, ensuring the planner handles such cases as expected.These changes collectively make the planner more robust in handling complex plan trees with respect to distribution requirements, and ensure correctness through thorough testing.
Release note
None
Check List (For Author)
Test
Behavior changed:
Does this need documentation?
Check List (For Reviewer who merge this PR)