Skip to content
This repository has been archived by the owner on Nov 24, 2023. It is now read-only.

syncer: load table structure from dump files (#1699) #1754

Closed
wants to merge 2 commits into from
Closed

syncer: load table structure from dump files (#1699) #1754

wants to merge 2 commits into from

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #1699

What problem does this PR solve?

close #1697

What is changed and how it works?

  • as title
  • originally we use MySQL 5.7 & 8.0 as upstreams, they has different default CHARSET. Because DM ignores "table already exists" error and fetches table from downstream, only one table with one CHARSET will be created at downstream and DM loads it for two sharding tables. Now, DM will see table strcuture of diferent CHARSET, so set default in advance.

Check List

Tests

  • Unit test
  • Integration test

Side effects

  • Breaking backward compatibility (but fix a bug)

Related changes

  • Need to cherry-pick to the release branch
  • Need to be included in the release note

@lance6716 @ti-chi-bot
This is an automated cherry-pick of pingcap#1699
914baa4 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member Author

[REVIEW NOTIFICATION]

This pull request has not been approved.

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 needs-update-release-note This PR should be added into release notes. Remove this label once the release notes are updated require-LGT1 for small PR, LGT1 is enough size/XL type/cherry-pick-for-release-2.0 labels Jun 7, 2021
@ti-chi-bot ti-chi-bot mentioned this pull request Jun 7, 2021
Merged
Ehco1996
Ehco1996 reviewed Jun 7, 2021
View reviewed changes
syncer/syncer.go
@@ -1128,6 +1130,7 @@ func (s *Syncer) Run(ctx context.Context) (err error) {
if err != nil {
return err
}
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

@lance6716 need resolve confilct?

hound[bot]
hound bot reviewed Jun 9, 2021
View reviewed changes
syncer/syncer.go
@@ -1128,6 +1130,7 @@ func (s *Syncer) Run(ctx context.Context) (err error) {
if err != nil {
return err
}
<<<<<<< HEAD
Copy link

Choose a reason for hiding this comment

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

expected statement, found '<<' (and 3 more errors)

@lance6716
Copy link
Collaborator

need resolve confilct?

I'll wait previous cherry-pick PR merged, then cherry-pick again

@lance6716
Copy link
Collaborator

/close

@ti-chi-bot ti-chi-bot closed this Jun 9, 2021
@ti-chi-bot
Copy link
Member Author

@lance6716: Closed this PR.

In response to this:

/close

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 kubernetes/test-infra repository.

@ti-chi-bot
Copy link
Member Author

@ti-chi-bot: PR needs rebase.

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 kubernetes/test-infra repository.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@hound hound[bot] hound[bot] left review comments

@Ehco1996 Ehco1996 Ehco1996 left review comments

@lance6716 lance6716 Awaiting requested review from lance6716

@lichunzhu lichunzhu Awaiting requested review from lichunzhu

Assignees

@lance6716 lance6716

Labels
needs-rebase needs-update-release-note This PR should be added into release notes. Remove this label once the release notes are updated require-LGT1 for small PR, LGT1 is enough size/XL type/cherry-pick-for-release-2.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ti-chi-bot @lance6716 @Ehco1996