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.

Sign up for GitHub

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

Jump to bottom

ddl: refactor modify column for multi-schema change #33631

Merged
merged 12 commits into from
Apr 1, 2022
Merged

ddl: refactor modify column for multi-schema change #33631

merged 12 commits into from
Apr 1, 2022

Conversation

tangenta
Copy link
Contributor

@tangenta tangenta commented Mar 31, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: ref #14766

Problem Summary:

This PR refactors the backfilling column-type-change implementation, in order to make it more compatible with multi-schema change.

This PR also improves the code readability.

What is changed and how it works?

  • adjustColumnInfoInModifyColumn is broken into several functions.
  • Rename some local variables.

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

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 31, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Defined2014
  • zimulala

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 do-not-merge/needs-linked-issue 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 Mar 31, 2022
zimulala
zimulala reviewed Mar 31, 2022
View reviewed changes
Copy link
Contributor

@zimulala zimulala left a comment

Choose a reason for hiding this comment

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

After this PR, the number of lines of code has increased a lot (86->211 lines). At first sight, there is no special advantage. Could you explain the idea of this refactoring in the description?

ddl/column.go Outdated Show resolved Hide resolved
Defined2014
Defined2014 reviewed Mar 31, 2022
View reviewed changes
ddl/column.go Outdated Show resolved Hide resolved
ddl/column.go Outdated Show resolved Hide resolved
ddl/column.go Show resolved Hide resolved
ddl/column.go Show resolved Hide resolved
ddl/column.go Outdated Show resolved Hide resolved
@sre-bot
Copy link
Contributor

sre-bot commented Apr 1, 2022 •
edited
Loading

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/24bfd6bc78b0858f082588b391b24b87128c38a5

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 1, 2022
zimulala
zimulala reviewed Apr 1, 2022
View reviewed changes
ddl/column.go Outdated
@@ -1102,6 +1099,120 @@ func (w *worker) doModifyColumnTypeWithData(
return ver, errors.Trace(err)
}

func replaceOldColumn(tblInfo *model.TableInfo, oldID, newID int64,
Copy link
Contributor

Choose a reason for hiding this comment

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

Why don't we send arguments oldCol and changingCol directly? Then we needn't to find these two args. And we needn't return JobStateRollingback.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Because the column info's offset can be incorrect in the case of multi-schema change like add column first, modify column.

zimulala
zimulala reviewed Apr 1, 2022
View reviewed changes
ddl/column.go
return ver, errors.Trace(err)
}
tblInfo.Indices = tblInfo.Indices[:len(tblInfo.Indices)-len(changingIdxs)]
// Adjust table column offset.
if err = adjustColumnInfoInModifyColumn(job, tblInfo, changingCol, oldCol, pos, changingColumnUniqueName.L); err != nil {
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 adjust the function of adjustColumnInfoInModifyColumn？Then we can still call it here.

zimulala
zimulala reviewed Apr 1, 2022
View reviewed changes
ddl/column.go Outdated Show resolved Hide resolved
ddl/column.go Outdated Show resolved Hide resolved
zimulala
zimulala reviewed Apr 1, 2022
View reviewed changes
ddl/column.go Show resolved Hide resolved
zimulala
zimulala reviewed Apr 1, 2022
View reviewed changes
ddl/column.go Outdated Show resolved Hide resolved
ddl/column.go Show resolved Hide resolved
ddl/column.go Outdated Show resolved Hide resolved
ddl/column.go Outdated Show resolved Hide resolved
ddl/column.go Show resolved Hide resolved
zimulala
zimulala approved these changes Apr 1, 2022
View reviewed changes
Copy link
Contributor

@zimulala zimulala left a comment

Choose a reason for hiding this comment

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

LGTM

@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 Apr 1, 2022
@zimulala
Copy link
Contributor

zimulala commented Apr 1, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 24bfd6b

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 1, 2022
@ti-chi-bot ti-chi-bot merged commit a9ef87b into pingcap:master Apr 1, 2022
@tangenta tangenta mentioned this pull request Apr 1, 2022
Closed
@tangenta tangenta mentioned this pull request Jul 28, 2022
Closed
39 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Defined2014 Defined2014 Defined2014 approved these changes

@zimulala zimulala zimulala approved these changes

Assignees
No one assigned
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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@tangenta @ti-chi-bot @sre-bot @zimulala @Defined2014