fix: reconcile auto-increment state for copy and clone - #26197
Conversation
Qodo reviews are paused for this user.Troubleshooting steps vary by plan Learn more → On a Teams plan? Using GitHub Enterprise Server, GitLab Self-Managed, or Bitbucket Data Center? |
|
Resolved the current merge conflict in 202a547 by normally merging upstream/main at a55820b. The only content conflict was in pkg/sql/compile/alter_test.go, where this PR added the AUTO_INCREMENT reset-cleanup test and upstream added the IVF INCLUDE-column affected-index test at the same location. The resolution keeps both complete tests unchanged. Validation passed: affected package tests, focused race tests for both conflict-adjacent paths, git diff checks, index-plugin domain guards, full self-review, and exact-head preflight. The PR remains Ready; fresh CI is running. |
Co-authored-by: ULookup <CHBulookup@outlook.com>
202a547 to
6b1bb91
Compare
|
The Ubuntu UT failure on The branch was four commits behind Validation on new head
Fresh CI is now running on the rebased head. |
XuPeng-SH
left a comment
There was a problem hiding this comment.
Deep-reviewed exact head 6b1bb91fa0.
Verified visible allocator reconciliation (max(requested, copied max, source offset)), stable ColId/name mapping, hidden fake-PK isolation, fulltext/partition hidden-index allocator mapping, rollback cleanup, result lifecycle, integer bounds, snapshot/account handling, and DDL-only performance impact. The previously reported fulltext hidden-table gap is fixed on this head.
Local affected-package tests pass, and exact-head CI/BVT/SCA/coverage are green. No blocking production issue found.
|
Queued — the merge queue status continues in this comment ↓. |
|
Merge Queue Status🛑 Queue command has been cancelled |
Merge Queue Status
This pull request spent 1 hour 55 minutes 42 seconds in the queue, with no time running CI. Waiting for
All conditions
ReasonPull request #26197 has been dequeued Pull request from fork cannot be queued. This pull request comes from a fork, and Mergify needs the author's permission to update its branch.
Failing checks:
HintYou should look at the reason for the failure and decide if the pull request needs to be fixed or if you want to requeue it. Tick the box to put this pull request back in the merge queue (same as
|
issue #23143
What type of PR is this?
What this PR does / why we need it:
This is the next serial prerequisite in the #25883 split. It makes COPY/CLONE allocator reconciliation independently correct before the user-facing
ALTER TABLE ... AUTO_INCREMENT=Nentry is enabled.Invariant:
max(requested offset, copied-row maximum, source allocator offset);ColId, preserving rename/reorder and preventing a dropped-and-readded same-name column from inheriting old state;Changes
SetOffset;Non-goals
ALTER TABLE ... AUTO_INCREMENT=NSQL entry;Testing
go test ./pkg/incrservice ./pkg/sql/colexec/table_clone ./pkg/sql/compile -count=1-raceruns for the new incrservice, table_clone, and compile testsgo test ./pkg/... -run '^$'issue_23143_copy_auto_incrementdistributed regression added; fresh CI execution is pending for the current headgit diff --checkmo-self-review: PASSmo-pr-preflight-review:PASS review=PASS validation=PENDINGfor6b1bb91fa0c292ab056adab3a8ba34935125e9fcDiff size
+416/-99+689/-4Dependency
Depends on the merged epoch fence (#26027) and transactional allocator reset (#26085). The next split item will start from
mainonly after this PR merges.