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

ddl: support modify column for multi-schema change #36040

Merged
merged 13 commits into from
Jul 12, 2022

Conversation

tangenta
Copy link
Contributor

@tangenta tangenta commented Jul 8, 2022

What problem does this PR solve?

Issue Number: ref #14766

Problem Summary:

This PR supports modify multiple columns in one DDL statement.

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

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

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jul 8, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • hawkingrei
  • wjhuang2016

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

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

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jul 8, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Jul 8, 2022

ddl/rollingback.go Show resolved Hide resolved
ddl/ddl_api.go Outdated Show resolved Hide resolved
ddl/index.go Outdated
type indexesToChange struct {
indexInfo *model.IndexInfo
offset int // column offset in idxInfo.Columns
isTemp bool // this is a temp index created by a previous modify column job.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMHO it's better to add more details to the 'temp' index in the comment. The logic here is not easy to follow.

The descriptions in https://pingcap.feishu.cn/docx/doxcn53f2eGAxYPZPW01drDmLRf?from=from_lark_index_search is clear. How about putting them in the comment?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. I have updated it in the comment.

ddl/index.go Outdated
}
}
}
return idxInfos, offsets
// Overwrite if the index has the corresponding temporary index. For example,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto for the comments here, please add more description on the meaning of $ when you use it in the comment("$i($a,...")

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated.

ddl/column.go Outdated Show resolved Hide resolved
ddl/column.go Outdated Show resolved Hide resolved
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 11, 2022
@@ -4479,7 +4449,7 @@ func (d *ddl) getModifiableColumnJob(ctx context.Context, sctx sessionctx.Contex
Location: &model.TimeZoneLocation{Name: tzName, Offset: tzOffset},
},
CtxVars: []interface{}{needChangeColData},
Args: []interface{}{&newCol, originalColName, spec.Position, modifyColumnTp, newAutoRandBits},
Args: []interface{}{&newCol.ColumnInfo, originalColName, spec.Position, modifyColumnTp, newAutoRandBits},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why change this arg's type?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using newCol can bring some unnecessary type conversions.

It is compatible because the decoding part use *model.ColumnInfo to receive it.

ddl/index.go Outdated Show resolved Hide resolved
ddl/index.go Outdated
offsets = append(offsets, i)
break
// indexesToChange is used to store the indexes that need to be changed during modifying column.
type indexesToChange struct {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is an index, so indexToChange is better? Besides, would a noun make more sense? Such as changingIndex .

ddl/column.go Outdated Show resolved Hide resolved
defer clean()
tk := testkit.NewTestKit(t, store)
tk.MustExec("use test;")

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we add a test for modifying the same column, like modify column a ..., modify column a ...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.

ddl/column.go Outdated Show resolved Hide resolved
tangenta and others added 2 commits July 11, 2022 17:48
Co-authored-by: Lynn <zimu_xia@126.com>
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jul 12, 2022
@tangenta
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 5427fcd

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 12, 2022
@tangenta
Copy link
Contributor Author

/run-mysql-test

@ti-chi-bot ti-chi-bot merged commit 9c3cf3f into pingcap:master Jul 12, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Jul 12, 2022

TiDB MergeCI notify

🔴 Bad News! New failing [3] after this pr merged.
These new failed integration tests seem to be caused by the current PR, please try to fix these new failed integration tests, thanks!

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci/integration-cdc-test 🟥 failed 4, success 32, total 36 24 min New failing
idc-jenkins-ci-tidb/integration-common-test 🟥 21 min New failing
idc-jenkins-ci-tidb/integration-ddl-test 🟥 16 min New failing
idc-jenkins-ci-tidb/common-test 🟢 all 12 tests passed 16 min Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 6 min 36 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 5 min 33 sec Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 5 min 5 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 3 min 31 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 3 min 12 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants