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): add collation config "collation_compatible" #4121

Merged
merged 13 commits into from
Dec 30, 2021
Merged

syncer(dm): add collation config "collation_compatible" #4121

merged 13 commits into from
Dec 30, 2021

Conversation

WizardXiao
Copy link
Contributor

@WizardXiao WizardXiao commented Dec 29, 2021

What problem does this PR solve?

Issue Number: close #3420

What is changed and how it works?

add config collation_compatible.
default loose handle create sql by original sql, will not add default collation as upstream.
strick will add default collation as upstream, and downstream will occur error when downstream don't support.

Check List

Tests

  • Unit test
  • Integration test

Related changes

  • Need to update the documentation

Release note

add config `collation_compatible`.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 29, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Ehco1996
  • lance6716

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 Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 29, 2021
@WizardXiao WizardXiao added area/dm Issues or PRs related to DM. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 29, 2021
@WizardXiao
Copy link
Contributor Author

i will fix integration test after add same config in dumpling.

@ti-chi-bot ti-chi-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 29, 2021
@WizardXiao
Copy link
Contributor Author

/run-all-tests

@Ehco1996 Ehco1996 added this to the v5.4.0 milestone Dec 30, 2021
Copy link
Contributor

@Ehco1996 Ehco1996 left a comment

Choose a reason for hiding this comment

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

LGTM after fix the it test, do wee need add this config to doc ?

dm/dm/config/subtask.go Show resolved Hide resolved
Copy link
Contributor

@lance6716 lance6716 left a comment

Choose a reason for hiding this comment

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

rest lgtm

dm/dm/config/task.go Show resolved Hide resolved
dm/dm/config/task_test.go Outdated Show resolved Hide resolved
@WizardXiao
Copy link
Contributor Author

LGTM after fix the it test, do wee need add this config to doc ?

yes, this need add to doc, i will write doc pr.

@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 Dec 30, 2021
@WizardXiao
Copy link
Contributor Author

/run-all-tests

@WizardXiao
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 30, 2021
@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
@Ehco1996
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: f81d5db

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

/run-all-tests

@lance6716
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 174e00e

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

[FORMAT CHECKER NOTIFICATION]

Notice: Please provide the linked issue number on one line in the PR body, for example: Issue Number: close #123 or Issue Number: ref #456.

📖 For more info, you can check the "Contribute Code" section in the development guide.

@ti-chi-bot
Copy link
Member

@WizardXiao: 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

/run-leak-test

@codecov-commenter
Copy link

codecov-commenter commented Dec 30, 2021

Codecov Report

Merging #4121 (174e00e) into master (08da001) will increase coverage by 0.1456%.
The diff coverage is 65.5935%.

❗ Current head 174e00e differs from pull request most recent head 7d9909e. Consider uploading reports for the commit 7d9909e to get more accurate results

Flag Coverage Δ
cdc 58.8119% <67.7966%> (+0.1671%) ⬆️
dm 52.3334% <58.1497%> (+0.0788%) ⬆️

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

@@               Coverage Diff                @@
##             master      #4121        +/-   ##
================================================
+ Coverage   55.1722%   55.3179%   +0.1456%     
================================================
  Files           485        489         +4     
  Lines         59829      60550       +721     
================================================
+ Hits          33009      33495       +486     
- Misses        23484      23684       +200     
- Partials       3336       3371        +35     

@lance6716
Copy link
Contributor

/run-kafka-integration-test
/run-verify

@WizardXiao
Copy link
Contributor Author

/run-kafka-integration-test

@ti-chi-bot
Copy link
Member

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

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-5.3 Should cherry pick this PR to release-5.3 branch. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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.

DM migrates table with incorrect collation
5 participants