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

dumpling: fix wrong behaviour of StrictCollationCompatible #37243

Merged
merged 2 commits into from Aug 19, 2022
Merged

dumpling: fix wrong behaviour of StrictCollationCompatible #37243

merged 2 commits into from Aug 19, 2022

Conversation

lance6716
Copy link
Contributor

Signed-off-by: lance6716 lance6716@gmail.com

What problem does this PR solve?

Issue Number: close #37241

Problem Summary:

What is changed and how it works?

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

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@lance6716
dumpling: fix wrong behaviour of StrictCollationCompatible
5679043 
Signed-off-by: lance6716 <lance6716@gmail.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 19, 2022 •
edited

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • WizardXiao
  • lichunzhu

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-none do-not-merge/needs-triage-completed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 19, 2022
@lance6716
Copy link
Contributor Author

/check-issue-triage-complete

@lance6716
Copy link
Contributor Author

/cc @lichunzhu @WizardXiao

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 19, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Aug 19, 2022 •
edited

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/434b93e1e9af57c8d89dcd5855dd990edcefdf54

hawkingrei
hawkingrei reviewed Aug 19, 2022
View reviewed changes
dumpling/export/dump.go
@@ -541,11 +540,12 @@ func adjustTableCollation(tctx *tcontext.Context, collationCompatible string, pa

// adjustColumnsCollation adds column's collation.
func adjustColumnsCollation(tctx *tcontext.Context, createStmt *ast.CreateTableStmt, charsetAndDefaultCollationMap map[string]string) {
ColumnLoop:
for _, col := range createStmt.Cols {
for _, options := range col.Options {
Copy link
Member

Choose a reason for hiding this comment

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

if this pr need not cherrypick. we can implement the set by generics. it can simplify this code.

@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 Aug 19, 2022
@hawkingrei
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 5679043

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 19, 2022
@ti-chi-bot ti-chi-bot merged commit b690f1c into pingcap:master Aug 19, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Aug 19, 2022

TiDB MergeCI notify

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci/integration-cdc-test 🟢 all 36 tests passed 35 min Existing passed
idc-jenkins-ci-tidb/common-test 🟢 all 11 tests passed 15 min Existing passed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 17 tests passed 14 min Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 7 min 18 sec Existing passed
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 7 min 2 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 5 min 55 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 5 min 38 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 3 min 42 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 3 min 23 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

@lance6716
Copy link
Contributor Author

/cherry-pick release-6.1

@ti-chi-bot
Copy link
Member

@lance6716: new pull request created: #38422.

In response to this:

/cherry-pick release-6.1

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.

@ti-chi-bot ti-chi-bot mentioned this pull request Oct 12, 2022
Merged
12 tasks
ti-chi-bot added a commit that referenced this pull request Oct 12, 2022
@ti-chi-bot
dumpling: fix wrong behaviour of StrictCollationCompatible (#37243) (#…
67fb271 
…38422)

close #37241
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hawkingrei hawkingrei hawkingrei left review comments

@lichunzhu lichunzhu lichunzhu approved these changes

@WizardXiao WizardXiao WizardXiao approved these changes

Assignees
No one assigned
Labels
release-note-none size/XS Denotes a PR that changes 0-9 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.

unexpected behaviour of dumpling's CollationCompatible
6 participants
@lance6716 @ti-chi-bot @sre-bot @hawkingrei @lichunzhu @WizardXiao