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: refactor schema builder #31172

Merged
merged 20 commits into from
Dec 31, 2021
Merged

ddl: refactor schema builder #31172

merged 20 commits into from
Dec 31, 2021

Conversation

xhebox
Copy link
Contributor

@xhebox xhebox commented Dec 30, 2021

What problem does this PR solve?

Issue Number: ref #30272

Problem Summary: Sub task from #28763. The big function ApplyDiff is separated into two parts: the outer one serve as the first dispatching layer, which will handle some loosely-related actions; all other actions falls into default, which either requires applyUpdateTable(the original main logic of ApplyDiff) to update the infoschema, or process AffectedOpts.

It is made very clear and verbose about how the actions are handled. The redundant code is intended to make it clear.

Also one memory optimization is applied, dbInfo won't be copied every time in applyUpdateTable.

copySchemaTables is renamed to getSchemaAndCopyIfNecessary.

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 Dec 30, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • AilinKid
  • 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 the release-note-none Denotes a PR that doesn't merit a release note. label Dec 30, 2021
@xhebox xhebox requested a review from wjhuang2016 December 30, 2021 06:43
@ti-chi-bot ti-chi-bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Dec 30, 2021
@xhebox xhebox requested a review from AilinKid December 30, 2021 06:43
infoschema/builder.go Outdated Show resolved Hide resolved
infoschema/builder.go Outdated Show resolved Hide resolved
Signed-off-by: xhe <[email protected]>
Copy link
Contributor

@AilinKid AilinKid left a comment

Choose a reason for hiding this comment

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

LGTM, pls add tests for it either in this one or next pull request

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 30, 2021
@xhebox
Copy link
Contributor Author

xhebox commented Dec 30, 2021

LGTM, pls add tests for it either in this one or next pull request

Thx, I don't think new tests are needed. It is same as before anyway. But I think some failed tests may be related, I'll take a deeper look...

infoschema/builder.go Outdated Show resolved Hide resolved
@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 Dec 30, 2021
@wjhuang2016
Copy link
Member

/merge

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 30, 2021
@xhebox
Copy link
Contributor Author

xhebox commented Dec 31, 2021

/merge cancel

@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Dec 31, 2021
@xhebox
Copy link
Contributor Author

xhebox commented Dec 31, 2021

Seems stable, I am looking at it.

@xhebox
Copy link
Contributor Author

xhebox commented Dec 31, 2021

Since my fix for rename tables, auto id allocated are not as expected as in the tests. It should not be "1,2,3" but "1,5001", which is the result reusing allocators.3

@xhebox
Copy link
Contributor Author

xhebox commented Dec 31, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 7f4d41e

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 31, 2021
@sre-bot
Copy link
Contributor

sre-bot commented Dec 31, 2021

@ti-chi-bot
Copy link
Member

@xhebox: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

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 ti-community-infra/tichi repository.

@xhebox
Copy link
Contributor Author

xhebox commented Dec 31, 2021

/merge

@ti-chi-bot ti-chi-bot merged commit de88547 into pingcap:master Dec 31, 2021
@xhebox xhebox deleted the batch_2 branch December 31, 2021 06:07
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/L Denotes a PR that changes 100-499 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.

5 participants