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

executor: fix 2nd index dup check after insert ignore on dup update primary (#23814) #23825

Merged
merged 8 commits into from
May 10, 2021
Merged

executor: fix 2nd index dup check after insert ignore on dup update primary (#23814) #23825

merged 8 commits into from
May 10, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Apr 2, 2021 •
edited by lysu
Loading

cherry-pick #23814, #23894 to release-4.0
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/23825

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

git push [email protected]:ti-srebot/tidb.git pr/23825:release-4.0-096281ec2f9a

What problem does this PR solve?

Issue Number: close #23809

Problem Summary:

see more detail at

#23809 (comment)

What is changed and how it works?

What's Changed, How it Works:

remove old record if new record can added

Related changes

  • Need to cherry-pick to the release branch 5.0 / 4.0?

Check List

Tests

  • Unit test

Side effects

  • n/a

Release note

  • Fix insert ignore on duplicate may delete wrong record

This change is Reviewable

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot mentioned this pull request Apr 2, 2021
Merged
@ti-srebot ti-srebot added sig/execution SIG execution sig/transaction SIG:Transaction size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/4.0-cherry-pick type/bugfix This PR fixes a bug. labels Apr 2, 2021
@ti-srebot ti-srebot added this to the v4.0.11 milestone Apr 2, 2021
@ti-srebot
Copy link
Contributor Author

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

@lysu lysu force-pushed the release-4.0-096281ec2f9a branch from 1ea7183 to 2a824c0 Compare April 2, 2021 07:48
@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 Apr 2, 2021
@lysu
Copy link
Contributor

lysu commented Apr 2, 2021

4.0's codebase is very different to 5.0, CheckHandleExists has be used in many place, so change a lot to resolve conflict, please review carefully :)

@lysu lysu force-pushed the release-4.0-096281ec2f9a branch from 2a824c0 to 0427079 Compare April 2, 2021 07:52
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 2, 2021
@jackysp
Copy link
Member

jackysp commented Apr 27, 2021

/lgtm

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 27, 2021
@lysu lysu modified the milestones: v4.0.11, v4.0.13 Apr 27, 2021
@lysu
Copy link
Contributor

lysu commented Apr 27, 2021

/run-integration-common-test

@lysu
Copy link
Contributor

lysu commented Apr 28, 2021 •
edited
Loading

@cfzjywxk PTAL~ this PR is using some different way with 5.0 due to it doesn't support stageHandle in 4.0

maybe we need merge this in Friday.

cfzjywxk
cfzjywxk approved these changes Apr 28, 2021
View reviewed changes
Copy link
Contributor

@cfzjywxk cfzjywxk left a comment

Choose a reason for hiding this comment

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

/lgtm

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • cfzjywxk
  • jackysp

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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-chi-bot ti-chi-bot removed the status/LGT1 Indicates that a PR has LGTM 1. label Apr 28, 2021
@ti-chi-bot
Copy link
Member

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

Commit hash: 04270794eff04c4bfa46f949307504fa583975a9

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 7, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label May 7, 2021
@lysu
Copy link
Contributor

lysu commented May 7, 2021

/merge

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

@lysu
Copy link
Contributor

lysu commented May 8, 2021

/merge

1 similar comment
@lysu
Copy link
Contributor

lysu commented May 8, 2021

/merge

@lysu lysu force-pushed the release-4.0-096281ec2f9a branch from d33b8f5 to 01ca559 Compare May 8, 2021 04:44
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed status/can-merge Indicates a PR has been approved by a committer. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 8, 2021
@lysu
Copy link
Contributor

lysu commented May 8, 2021

cherry-pick #23894 to 4.0 too, @jackysp @cfzjywxk PTAL again thx

@lysu
Copy link
Contributor

lysu commented May 10, 2021

PTAL @jackysp @cfzjywxk, we need merge this for today's release thx

@cfzjywxk
Copy link
Contributor

/lgtm

@lysu
Copy link
Contributor

lysu commented May 10, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 54caaa0

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 10, 2021
@lysu
Copy link
Contributor

lysu commented May 10, 2021

/merge

@lysu
Copy link
Contributor

lysu commented May 10, 2021

/merge

@lysu
Copy link
Contributor

lysu commented May 10, 2021

/merge

@lysu
Copy link
Contributor

lysu commented May 10, 2021

/run-unit-test

@ti-chi-bot ti-chi-bot merged commit a5ccf15 into pingcap:release-4.0 May 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cfzjywxk cfzjywxk cfzjywxk approved these changes

@coocood coocood Awaiting requested review from coocood

@jackysp jackysp Awaiting requested review from jackysp

Assignees

@lysu lysu

Labels
cherry-pick-approved Cherry pick PR approved by release team. sig/execution SIG execution sig/transaction SIG:Transaction 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. type/bugfix This PR fixes a bug. type/4.0-cherry-pick
Projects
None yet
Milestone
v4.0.13
Development

Successfully merging this pull request may close these issues.
6 participants
@ti-srebot @lysu @jackysp @ti-chi-bot @cfzjywxk @zhouqiang-cl