Skip to content

(WIP) *: merge active-active to master#66020

Draft
lcwangchao wants to merge 63 commits intomasterfrom
feature/active-active
Draft

(WIP) *: merge active-active to master#66020
lcwangchao wants to merge 63 commits intomasterfrom
feature/active-active

Conversation

@lcwangchao
Copy link
Collaborator

@lcwangchao lcwangchao commented Feb 4, 2026

What problem does this PR solve?

Issue Number: ref #64281

Problem Summary:

What changed and how does it work?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No need to test
    • I checked and no code files have been changed.

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

lcwangchao and others added 30 commits November 21, 2025 06:00
@lcwangchao
*: tidb txn supports to setting WithReturnCommitTS (#64538)
b334095 
close #64537
@time-and-fate
meta: add metadata for the new _tidb_commit_ts hidden column (#64787)
521a1ce 
close #64281
@time-and-fate
planner, executor: planner support the _tidb_commit_ts new hidden c…
a1d4bf0 
…olumn (#64610)

ref #64281
@tiancaiamao
*: support _tidb_commit_ts for PointGet/BatchPointGet executor (#64720)
b3870a0 
close #64721
@xhebox
ddl, parser: add active acitve and softdelete options (#64856)
eabe311 
ref #64281
@time-and-fate
planner, executor: support INSERT statements for softdelete table s…
dd5e886 
…emantic in planner (#64892)

ref #64281
@time-and-fate
executor, planner: code cleanup (#64913)
09b17ae 
ref #64281
@tiancaiamao
*: set kv.CommitWaitUntilTSO for current transaction when updating an…
e227f59 
… old row with _tidb_origin_ts not null (#64901)

close #64893
@tiancaiamao
executor: support soft delete table's insert executor (#64702)
2442ae7 
close #64701
@time-and-fate
planner, expression: support hidden columns for SELECT statement an…
c4f6d4c 
…d softdelete filters (#64918)

ref #64281
@time-and-fate
executor, planner: allow _tidb_commit_ts appear in `ON DUPLICATE UP…
b20f139 
…DATE` expression in `INSERT` statements (#64964)

ref #64281
@xhebox
ddl: refine syntax details (#64962)
db93e0f 
ref #64281
@time-and-fate
planner, executor, table: add tidb_translate_softdelete_sql support…
fa74cff 
… and fix the point get fast path in planner (#64993)

ref #64281
@tiancaiamao
executor: tiny fix for softdelete handling multiple unique keys (#64961)
2b042d7 
ref #64281, close #64960
@time-and-fate
planner: refactor buildUpdate and buildDelete to reduce code repe…
6899949 
…tition and prepare for later changes (#65033)

ref #64281
@time-and-fate
planner: support DELETE statement rewrite for softdelete tables (#6…
7b1eb54 
…5013)

ref #64281
@time-and-fate
planner: add the new tidb_translate_softdelete_sql variable into th…
e352f59 
…e plan cache key (#65053)

ref #64281
@xhebox
column: set correct flen and decimal for softdelete column (#65057)
80799aa 
ref #64281
@tiancaiamao
unistore: support return _tidb_commit_ts for coprocessor request (#65107
2ce7639 
)

close #65106
@time-and-fate
planner: ban usage of _tidb_softdelete_time when `tidb_translate_so…
04dbcb1 
…ftdelete_sql` is off (#65199)

ref #64281
@tiancaiamao
test: move a test case and cover _tidb_origin_ts for replace (#65238)
d82f666 
ref #64281
@tiancaiamao
executor: add a test case for point-get with FOR UPDATE for softdelet…
12f27c7 
…e table (#65194)

close #65171
@tiancaiamao
sessionctx,executor: introduce @@tidb_active_active_sync_stats variab…
ae24f3d 
…le for TiCDC (#65270)

ref #65269
@tiancaiamao
executor: return _tidb_commit_ts in 'select for update' (#65174)
b443e38 
ref #64281
@xhebox
ddl: hide softdelete indexes in show create, forbidden constraints (#…
b403c30 
…65354)

close #64919
@tiancaiamao
test: add non_transaction_dml test for active-active table (#65428)
463ee80 
close #65427
@time-and-fate
*: add RECOVER VALUES statements for softdelete tables (#65389)
c64016c 
ref #64281
@tiancaiamao
test: add test for pipelined DML on softdelete table (#65470)
a7a57ef 
close #65469
@tiancaiamao
planner,executor: support load data for softdelete table (#65347)
35b4545 
close #65346
@tiancaiamao
ddl: disallow creating softdelete table on cached table (#65443)
f9ed6bb 
close #65442
lcwangchao and others added 23 commits January 26, 2026 16:47
@lcwangchao
fix conflict of basic packages
60b7bb2
@lcwangchao
*: fix ddl, metrics conflict
c4cbf73
@lcwangchao
fix tidb.json
39c0f24
@lcwangchao
resolve some planner conflict
7147132
@lcwangchao
fix build error
24b940d
@lcwangchao
*: fix _tidb_commit_ts bugs for cached table, temporary table, pessim…
5edb91b 
…istic lock and lock table (#65830)

ref #64281
@lcwangchao
fix tests in tests/integrationtest
4965c33
@lcwangchao
fix some go tests
92dc9fc
@xhebox
ttl: check ticdc progress table for consistency (#65638)
0198ecf 
ref #64281
@xhebox
ddl: refine active-active corner cases (#65827)
f687417 
close #64281
@lcwangchao
executor/metrics: add softdelete implicit delete rows metric and expo…
b2d04cb 
…se stats in INSERT runtime (#65905)

ref #64281
@time-and-fate
resolve conflicts
0c76e76
@time-and-fate
Merge remote-tracking branch 'upstream/feature/active-active' into fe…
e142e10 
…ature_aa_merge_master
@time-and-fate
fix merge errors
8bd16d0
@time-and-fate
fix type mismatch
52d7b96
@time-and-fate
fix flaky test
8490bcb
@time-and-fate
update checksum
6d53588
@time-and-fate
update test result
1802686
@time-and-fate
update
54293b0 
1. update a test result to correct result
2. remove a test case that is expected to only work on the master branch
3. remove an assert on commit ts because a row inserted in a txn doesn't have a commit ts
@ti-chi-bot
*: Merge branch 'master' into feature/active_active (#65768)
3cf9e5f 
ref #64281
@lcwangchao
Merge branch 'master' into aa_merge_master_2
91c63e0
@lcwangchao
metrics: Add new charts in Grafana for SoftDelete Implicit Delete Row…
1e7c67b 
…s | tidb-test= fc7090b4ff2db9ac30fd22036c45f426053b8d28 (#65923)

ref #64281
@ti-chi-bot
*: merge master to feature/active-active (#66011)
c431bfc 
ref #64281
@ti-chi-bot ti-chi-bot bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. component/statistics labels Feb 4, 2026
@ti-chi-bot
Copy link

ti-chi-bot bot commented Feb 4, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign benjamin2037, benmeadowcroft, bornchanger, terry1purcell, zanmato1984, zimulala for approval. For more information see the Code Review Process.
Please ensure that each of them provides their approval before proceeding.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added the sig/planner SIG: Planner label Feb 4, 2026
@lcwangchao lcwangchao marked this pull request as draft February 4, 2026 06:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

component/statistics do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none Denotes a PR that doesn't merit a release note. sig/planner SIG: Planner size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@lcwangchao @time-and-fate @tiancaiamao @xhebox