fix: harden prepare long data parsing#23980
Merged
mergify[bot] merged 5 commits intomatrixorigin:mainfrom Mar 28, 2026
Merged
Conversation
XuPeng-SH
force-pushed
the
fix-prepare-long-data-and-bounds
branch
from
8411217 to
ec5e517
Compare
ouyuanning
approved these changes
Mar 28, 2026
XuPeng-SH
force-pushed
the
fix-prepare-long-data-and-bounds
branch
from
ec5e517 to
d37b220
Compare
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
PreInsert.refreshAutoIncrementTableID wrote directly to the shared *plan.TableDef.TblId, which is the same pointer held by MultiUpdate. When both operators run Prepare() concurrently in the ants worker pool, the race detector fires. Store the refreshed TblId in a local container field (ctr.tblId) instead of mutating the shared plan object. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
PartitionInsert and PartitionDelete temporarily mutated the shared ObjRef.ObjName during their partition iteration loop (save/restore via defer). PartitionMultiUpdate.writeTable directly mutated shared MultiUpdateCtx entries unlike the writeS3 path which already cloned. These mutations are safe today (merge scope is single-threaded), but are fragile: any future concurrent reader of the same ObjRef/TableDef would race. Use stack copies (Insert/Delete) or clone() (MultiUpdate) to keep shared plan objects immutable. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
Merge Queue Status
This pull request spent 7 seconds in the queue, with no time running CI. Required conditions to merge
|
7 tasks
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
3 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 #23979
What this PR does / why we need it:
This PR fixes three categories of issues:
1. Harden prepared-statement binary protocol edges
2. Fix data race on shared TableDef.TblId (detected by -race in TestDeleteAndSelect)
3. Harden partition operators against shared plan object mutations