Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

*: fix a bug that update statement uses point get and update plan with different tblInfo #54183

Merged
merged 3 commits into from
Jun 26, 2024

Conversation

zimulala
Copy link
Contributor

@zimulala zimulala commented Jun 24, 2024

What problem does this PR solve?

Issue Number: close #53634

Problem Summary:

Case

Init SQLs:

CREATE TABLE stock ( a int NOT NULL, b char(30) NOT NULL,  c int, d char(64), PRIMARY KEY(a,b)) ;
insert into stock values(1, 'a', 11, 'x'), (2, 'b', 22, 'y');
alter table stock add column cct_1 int default 10;
alter table stock modify cct_1 json;
alter table stock add column adc_1 smallint;
  • Step1. using conn1
    prepare statements:
    begin;
    SELECT a, c, d from stock where (a, b) IN ((?, ?),(?, ?)) FOR UPDATE;
    UPDATE stock SET c = ? WHERE a= ? AND b = 'a';
    UPDATE stock SET c = ?, d = 'z' WHERE a= ? AND b = 'b';
    commit;

run a statement:
begin;

  • Step2. using conn2
    do DDL:
    alter table stock drop column cct_1;
  • Step3. using conn1
    When the DDL is in Write-Only state
    exec statements:
    SELECT a, c, d from stock where (a, b) IN ((?, ?),(?, ?)) FOR UPDATE;
    UPDATE stock SET c = ? WHERE a= ? AND b = 'a';
    UPDATE stock SET c = ?, d = 'z' WHERE a= ? AND b = 'b';
    commit;
  • Step4. using conn1
    Check the result
    select * from stock;

  • Statement execution order table

conn1 conn2
step1. prepare stmts
step1. begin;
step2. alter table stock drop column cct_1; (state public -> write-only)
step3. exec stmts write-only
step2. alter table stock drop column cct_1; (finish)
step4. select * from stock;

Conclusion

The update statement in step3 uses point get and update plan, but the tblInfo used by the two plans is inconsistent, resulting in incorrect data in real storage.

  • After executing step3. select statement, the stock is locked in GetRelatedTableForMDL, so stmt.tbls[i].Meta().Revision != newTbl.Meta().Revision is false. It means schemaNotMatch is false. So we needn't to Preprocess.

    newTbl, err := tryLockMDLAndUpdateSchemaIfNecessary(sctx.GetPlanCtx(), stmt.dbName[i], stmt.tbls[i], is)
    if err != nil {
    schemaNotMatch = true
    continue
    }
    if stmt.tbls[i].Meta().Revision != newTbl.Meta().Revision {

  • Step3. update statement using tblName.TableInfo(get it when preparing statements, cct_1 is public) in newPointGetPlan.

    tbl := tblName.TableInfo

  • Step3. update statement using t gets from is.TableByID(tbl.ID)( cct_1 is write-only)

    updatePlan.names = pointPlan.OutputNames()
    is := ctx.GetInfoSchema().(infoschema.InfoSchema)
    t, _ := is.TableByID(tbl.ID)
    updatePlan.tblID2Table = map[int64]table.Table{
    tbl.ID: t,
    }

What changed and how does it work?

Add the Revision field comparison of tbl(get from txn infoschema) and newTbl to confirm whether reprocess is required.

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.

Fix an issue where improper use of metadata locks in some scenarios could cause abnormal data to be written when using the plan cache.

@ti-chi-bot ti-chi-bot bot added release-note-none do-not-merge/needs-triage-completed sig/planner SIG: Planner size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 24, 2024
Copy link

tiprow bot commented Jun 24, 2024

Hi @zimulala. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Copy link

codecov bot commented Jun 24, 2024

Codecov Report

Attention: Patch coverage is 89.80892% with 16 lines in your changes missing coverage. Please review.

Project coverage is 56.3875%. Comparing base (f4ae757) to head (22ad2cd).
Report is 42 commits behind head on master.

Additional details and impacted files
@@                Coverage Diff                @@
##             master     #54183         +/-   ##
=================================================
- Coverage   72.8112%   56.3875%   -16.4237%     
=================================================
  Files          1519       1642        +123     
  Lines        434856     614373     +179517     
=================================================
+ Hits         316624     346430      +29806     
- Misses        98607     244567     +145960     
- Partials      19625      23376       +3751     
Flag Coverage Δ
integration 37.1267% <100.0000%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
dumpling 52.9656% <ø> (ø)
parser ∅ <ø> (∅)
br 52.5393% <ø> (+6.4174%) ⬆️

@hawkingrei
Copy link
Member

/ok-to-test

@pingcap pingcap deleted a comment from ti-chi-bot bot Jun 24, 2024
@pingcap pingcap deleted a comment from ti-chi-bot bot Jun 24, 2024
@zimulala zimulala force-pushed the zimuxia/mdl branch 2 times, most recently from ccd113f to 376973b Compare June 24, 2024 14:18
@pingcap pingcap deleted a comment from ti-chi-bot bot Jun 24, 2024
@pingcap pingcap deleted a comment from ti-chi-bot bot Jun 25, 2024
@pingcap pingcap deleted a comment from tiprow bot Jun 25, 2024
@JaySon-Huang
Copy link
Contributor

Great to see the root cause is located and fixed! :)

Copy link

ti-chi-bot bot commented Jun 26, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: qw4990, wjhuang2016

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

The pull request process is described here

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 approved label Jun 26, 2024
Copy link

ti-chi-bot bot commented Jun 26, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-06-25 05:08:46.32904351 +0000 UTC m=+696252.814532341: ☑️ agreed by wjhuang2016.
  • 2024-06-26 09:17:26.428894262 +0000 UTC m=+797572.914383095: ☑️ agreed by qw4990.

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-8.2: #54255.

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-8.1: #54256.

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.5: #54257.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Jun 27, 2024
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Jun 27, 2024
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.1: #54258.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Jun 27, 2024
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.5: #54259.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

The real data type does not match the current column type
6 participants