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

Merged
merged 4 commits into from
Apr 2, 2021
Merged

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

merged 4 commits into from
Apr 2, 2021

Conversation

lysu
Copy link
Contributor

@lysu lysu commented Apr 1, 2021 •
edited
Loading

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

@lysu lysu requested a review from a team as a code owner April 1, 2021 13:59
@lysu lysu requested review from qw4990 and removed request for a team April 1, 2021 13:59
@ti-chi-bot ti-chi-bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 1, 2021
@lysu
Copy link
Contributor Author

lysu commented Apr 1, 2021

/run-all-tests

@lysu lysu added type/bugfix This PR fixes a bug. sig/transaction SIG:Transaction labels Apr 1, 2021
@lysu lysu requested review from coocood and jackysp and removed request for qw4990 April 1, 2021 14:00
@lysu lysu marked this pull request as draft April 1, 2021 14:05
@ti-chi-bot ti-chi-bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 1, 2021
@github-actions github-actions bot added the sig/execution SIG execution label Apr 1, 2021
@ichn-hu ichn-hu mentioned this pull request Apr 1, 2021
Closed
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 1, 2021
@lysu lysu marked this pull request as ready for review April 1, 2021 17:09
@ti-chi-bot ti-chi-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 1, 2021
@lysu
Copy link
Contributor Author

lysu commented Apr 1, 2021

/run-all-tests

@coocood
Copy link
Member

coocood commented Apr 2, 2021

/lgtm

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 2, 2021
@lysu lysu requested a review from cfzjywxk April 2, 2021 03:46
cfzjywxk
cfzjywxk approved these changes Apr 2, 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
  • coocood

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 2, 2021
@ti-chi-bot ti-chi-bot added the status/LGT2 Indicates that a PR has LGTM 2. label Apr 2, 2021
@lysu
Copy link
Contributor Author

lysu commented Apr 2, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 036314d

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

lysu commented Apr 2, 2021

/run-unit-test

1 similar comment
@lysu
Copy link
Contributor Author

lysu commented Apr 2, 2021

/run-unit-test

@ti-chi-bot ti-chi-bot merged commit 096281e into pingcap:master Apr 2, 2021
@ti-srebot ti-srebot mentioned this pull request Apr 2, 2021
Merged
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #23825

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Apr 2, 2021
@lysu @ti-srebot
cherry pick pingcap#23814 to release-5.0
0e6ff59 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request Apr 2, 2021
Merged
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0 in PR #23826

@lysu lysu mentioned this pull request Apr 7, 2021
Closed
ti-chi-bot pushed a commit that referenced this pull request Apr 14, 2021
@ti-srebot
executor: fix 2nd index dup check after insert ignore on dup update p…
b61ccf1 
…rimary (#23814) (#23826)
lysu added a commit to ti-srebot/tidb that referenced this pull request May 8, 2021
@lysu
cherry pick pingcap#23814 to release-4.0
10f0961
ti-chi-bot pushed a commit that referenced this pull request May 10, 2021
@ti-srebot
executor: fix 2nd index dup check after insert ignore on dup update p…
a5ccf15 
…rimary (#23814) (#23825)
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
No one assigned
Labels
needs-cherry-pick-release-5.0 sig/execution SIG execution sig/transaction SIG:Transaction 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/bugfix This PR fixes a bug.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

ignore dup error after insert on duplicate get wrong result in clustered index or int pk table
5 participants
@lysu @coocood @ti-chi-bot @ti-srebot @cfzjywxk