fix: revert getJoinSide JoinSideBoth change and fix uniform estimation#23745
Merged
mergify[bot] merged 2 commits intomatrixorigin:mainfrom Feb 13, 2026
Merged
fix: revert getJoinSide JoinSideBoth change and fix uniform estimation#23745mergify[bot] merged 2 commits intomatrixorigin:mainfrom
mergify[bot] merged 2 commits intomatrixorigin:mainfrom
Conversation
aptend
requested review from
XuPeng-SH,
aunjgr,
gouhongshen,
heni02 and
ouyuanning
as code owners
aunjgr
approved these changes
Feb 12, 2026
XuPeng-SH
approved these changes
Feb 12, 2026
heni02
approved these changes
Feb 12, 2026
Contributor
Merge Queue StatusRule:
This pull request spent 5 seconds in the queue, with no time running CI. Required conditions to merge
|
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
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 type of PR is this?
Which issue(s) this PR fixes:
issue #23724
What this PR does / why we need it:
Problem: The main branch TPCH 1t test hit OOM (commit f864d27). The change "fix: getJoinSide return JoinSideBoth when column not in either join subtree" (#23719) introduced incorrect behavior that led to this regression.
Solution:
Revert the problematic getJoinSide change: Remove the logic that returns
JoinSideBothwhen a column's RelPos is not in leftTags or rightTags. This reverts the behavior that caused the OOM.Fix uniform estimation in ShuffleRange.Eval(): Correct the uniform density calculation:
globalDensity := float64(s.Sz) / s.SampleRatio / (s.Max - s.Min)to account for sampling ratio when computing densitys.Uniform = min(0.999, globalDensity/s.Uniform)wheres.Uniformholds max local density during iterationactualSamplingRatioto ShuffleRanges after stats collectionSampling adjustments: Increase MaxSampleObjects (2000→5000) and target sampling ratio (2%→10%) for better stats accuracy on large tables.