to 3.0: fix(sql/plan): prebuild composite-unique lock column mapping for INSERT#23763
Merged
mergify[bot] merged 5 commits intomatrixorigin:3.0-devfrom Feb 25, 2026
Conversation
XuPeng-SH
approved these changes
Feb 25, 2026
ouyuanning
approved these changes
Feb 25, 2026
matrix-meow
added
size/M
Contributor
Merge Queue StatusRule:
This pull request spent 9 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
4 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 ##23759
What this PR does / why we need it:
This PR fixes a lock-target mapping issue for INSERT on tables with composite unique keys (e.g. UNIQUE KEY (a, b)), which could lead to missed conflict detection on CN.
Problem:
During lock target construction, colName2Idx could miss __mo_index_idx_col for composite unique indexes.
The previous logic then effectively used an incorrect column index path, so CN might lock the wrong column instead of the composite unique key value.
Root cause:
__mo_index_idx_col mapping for composite unique keys was not guaranteed to be materialized before lock target generation.
Fix:
Pre-materialize the composite unique lock key (serial(...)) before lock target construction.
Populate colName2Idx for indexTable.__mo_index_idx_col in advance.
Add explicit map-hit checks when reading lock target column indexes, returning an internal error if missing (instead of silently proceeding).
Why this is better:
Moves lock-key readiness earlier in the pipeline, so lock target building reads a complete mapping.
Avoids implicit/default index behavior.
Keeps lock behavior deterministic for composite unique keys.