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

drainer: rtrim char type column in sql #1165

Merged
merged 6 commits into from
May 26, 2022
Merged

drainer: rtrim char type column in sql #1165

merged 6 commits into from
May 26, 2022

Conversation

cartersz
Copy link
Contributor

What problem does this PR solve?

Issue Number: ref #1164

What is changed and how it works?

when table defined the char type column, rtrim function will be used in sql

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Code changes

  • Has exported function/method change
  • Has exported variable/fields change
  • Has interface methods change
  • Has persistent data change

Side effects

  • Possible performance regression
  • Increased code complexity
  • Breaking backward compatibility

Related changes

  • Need to cherry-pick to the release branch
  • Need to update the documentation
  • Need to update the tidb-ansible repository
  • Need to be included in the release note

Release note

  • No release note

@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 25, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • gozssky
  • 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.

@cartersz
Copy link
Contributor Author

@lichunzhu PTAL

@cartersz
Copy link
Contributor Author

/run-all-tests

lichunzhu
lichunzhu reviewed May 26, 2022
View reviewed changes
Copy link
Contributor

@lichunzhu lichunzhu 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

pkg/loader/model.go Outdated
@@ -270,14 +270,23 @@ func (dml *DML) buildOracleWhere(builder *strings.Builder, oracleHolderPos int)
if wargs[i] == nil || wargs[i] == "" {
builder.WriteString(escapeName(wnames[i]) + " IS NULL")
} else {
builder.WriteString(fmt.Sprintf("%s = :%d", escapeName(wnames[i]), pOracleHolderPos))
builder.WriteString(fmt.Sprintf("%s = :%d", dml.processOracleColumn(escapeName(wnames[i])), pOracleHolderPos))
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm afraid escapeName(wnames[i]) can't get correct dataType from dml.info.dataTypeMap

pkg/loader/model_test.go Show resolved Hide resolved
@cartersz
Copy link
Contributor Author

/run-all-tests

lichunzhu
lichunzhu approved these changes May 26, 2022
View reviewed changes
Copy link
Contributor

@lichunzhu lichunzhu left a comment

Choose a reason for hiding this comment

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

LGTM

@lichunzhu
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 7d7e99b

@ti-chi-bot ti-chi-bot merged commit b0214a2 into pingcap:master May 26, 2022
@lichunzhu
Copy link
Contributor

/cherry-pick release-6.1

ti-chi-bot pushed a commit to ti-chi-bot/tidb-binlog that referenced this pull request May 27, 2022
@cartersz @ti-chi-bot
This is an automated cherry-pick of pingcap#1165
30d7bdc 
Signed-off-by: ti-chi-bot <[email protected]>
@ti-chi-bot ti-chi-bot mentioned this pull request May 27, 2022
Merged
@ti-chi-bot
Copy link
Member

@lichunzhu: new pull request created: #1167.

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 added a commit that referenced this pull request May 29, 2022
@ti-chi-bot
drainer: rtrim char type column in sql (#1165) (#1167)
1012ec7 
ref #1164
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lichunzhu lichunzhu lichunzhu approved these changes

@sleepymole sleepymole sleepymole approved these changes

Assignees
No one assigned
Labels
size/L status/can-merge status/LGT2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@cartersz @ti-chi-bot @lichunzhu @sleepymole