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

syncer(dm): fix collation compatibility behaviour #6833

Merged
merged 4 commits into from
Aug 22, 2022

Conversation

lance6716
Copy link
Contributor

Signed-off-by: lance6716 [email protected]

What problem does this PR solve?

Issue Number: close #6832

What is changed and how it works?

Check List

Tests

  • Unit test

Questions

Will it cause performance regression or break compatibility?
Do you need to update user documentation, design documentation or monitoring documentation?

Release note

Fix when use "strict" collation_compatible, DM sometimes generate SQL with duplicated collation

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 22, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • WizardXiao

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-triage-completed release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Aug 22, 2022
@lance6716 lance6716 added the area/dm Issues or PRs related to DM. label Aug 22, 2022
@ti-chi-bot ti-chi-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Aug 22, 2022
@lance6716
Copy link
Contributor Author

/cc @lichunzhu @WizardXiao

@lance6716
Copy link
Contributor Author

/check-issue-triage-complete
/run-verify

@ti-chi-bot ti-chi-bot added needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. and removed do-not-merge/needs-triage-completed labels Aug 22, 2022
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 22, 2022
@codecov-commenter
Copy link

codecov-commenter commented Aug 22, 2022

Codecov Report

Merging #6833 (5ce08c0) into master (435053b) will increase coverage by 0.5196%.
The diff coverage is 69.9570%.

Flag Coverage Δ
cdc 67.3777% <71.9101%> (+1.2999%) ⬆️
dm 52.0413% <50.0000%> (+0.0350%) ⬆️
engine 62.7225% <0.0000%> (-0.3039%) ⬇️

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

@@               Coverage Diff                @@
##             master      #6833        +/-   ##
================================================
+ Coverage   59.4341%   59.9537%   +0.5196%     
================================================
  Files           787        784         -3     
  Lines         89743      89534       -209     
================================================
+ Hits          53338      53679       +341     
+ Misses        31702      31156       -546     
+ Partials       4703       4699         -4     

@lance6716
Copy link
Contributor Author

/cc @GMHDBJD

@ti-chi-bot ti-chi-bot requested a review from GMHDBJD August 22, 2022 06:10
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 22, 2022
@lance6716 lance6716 added the require-LGT1 Indicates that the PR requires an LGTM. label Aug 22, 2022
@lance6716
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: cb687db

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 22, 2022
@ti-chi-bot
Copy link
Member

@lance6716: 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.

@lance6716
Copy link
Contributor Author

/run-verify

1 similar comment
@lance6716
Copy link
Contributor Author

/run-verify

@ti-chi-bot ti-chi-bot merged commit 750f0e4 into pingcap:master Aug 22, 2022
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #6846.

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Aug 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/dm Issues or PRs related to DM. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. release-note Denotes a PR that will be considered when it comes time to generate release notes. require-LGT1 Indicates that the PR requires an LGTM. 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/LGT1 Indicates that a PR has LGTM 1.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

when use "strict" collation compatibility, DM syncer may generate unexpected ddl
4 participants