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

executor: do not append extra cols to the old row when updateDupRow (#33656) #35165

Merged
merged 9 commits into from
Jun 16, 2022

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Jun 6, 2022

cherry-pick #33656 to release-5.3
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/35165

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/35165:release-5.3-b860500988e0

Signed-off-by: zyguan zhongyangguan@gmail.com

What problem does this PR solve?

Issue Number: close #33608

Problem Summary:

What is changed and how it works?

We append extra datums to the old row to resolve #14164 , however it breaks binlog. We need to prevent binlogRow from including those extra datums. This PR keep the old row unchanged and pass the extra cols info to doDupRowUpdate.

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

Fixed an issue where extra datums may break binlog.

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jun 6, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • XuHuaiyu
  • cfzjywxk

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-srebot
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Jun 6, 2022
@ti-srebot ti-srebot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/5.3-cherry-pick labels Jun 6, 2022
@ti-srebot ti-srebot added this to the v5.3.1 milestone Jun 6, 2022
@ti-srebot
Copy link
Contributor Author

@zyguan you're already a collaborator in bot's repo.

@zyguan
Copy link
Contributor

zyguan commented Jun 14, 2022

/run-unit-test

2 similar comments
@zyguan
Copy link
Contributor

zyguan commented Jun 14, 2022

/run-unit-test

@zyguan
Copy link
Contributor

zyguan commented Jun 14, 2022

/run-unit-test

@zyguan
Copy link
Contributor

zyguan commented Jun 15, 2022

/run-unit-test

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

zyguan commented Jun 16, 2022

@tiancaiamao @zimulala PTAL

@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 Jun 16, 2022
@zyguan
Copy link
Contributor

zyguan commented Jun 16, 2022

/merge

@ti-chi-bot
Copy link
Member

@zyguan: /merge is only allowed for the committers, you can assign this pull request to the committer in list by filling /assign @committer in the comment to help merge this pull request.

In response to this:

/merge

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.

@XuHuaiyu
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 1827286

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

@ti-srebot: 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.

@sre-bot
Copy link
Contributor

sre-bot commented Jun 16, 2022

@ti-chi-bot ti-chi-bot merged commit bb47c46 into pingcap:release-5.3 Jun 16, 2022
@heibaijian heibaijian modified the milestones: v5.3.1, v5.3.2 Jun 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. 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. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/5.3-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants