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

lightning: check hasDupe and tableID when resolve duplicate rows (#40696) #40793

Merged
merged 4 commits into from
Feb 19, 2023
Merged

lightning: check hasDupe and tableID when resolve duplicate rows (#40696) #40793

merged 4 commits into from
Feb 19, 2023

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #40696

What problem does this PR solve?

Issue Number: close #40657

Problem Summary:

ResolveDuplicateRows may accidentally delete imported data even if there is no duplicate data is detected. See #40657 (comment).

What is changed and how it works?

Add two checks when deleting duplicate data:

  1. Skip ResolveDuplicateRows when no duplicate data is detected.
  2. Check table id if before deleting duplicate data.

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

@ti-chi-bot ti-chi-bot mentioned this pull request Jan 28, 2023
Merged
12 tasks
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Jan 28, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • dsdashun
  • gozssky

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 component/lightning This issue is related to Lightning of TiDB. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. do-not-merge/cherry-pick-not-approved labels Jan 28, 2023
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 28, 2023
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Jan 31, 2023
@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 Jan 31, 2023
@sleepymole
Copy link
Contributor

/hold

@ti-chi-bot ti-chi-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 7, 2023
@sleepymole
Copy link
Contributor

This cherry-pick must be merged with #41488.

@sleepymole
Copy link
Contributor

/unhold

@ti-chi-bot ti-chi-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 17, 2023
@sleepymole
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: b2aa489223a55e6a139db27640030fc9cb1a741e

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 17, 2023
@sleepymole
Copy link
Contributor

/retest

@sleepymole sleepymole force-pushed the cherry-pick-40696-to-release-6.5 branch from b2aa489 to a94398a Compare February 19, 2023 05:06
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Feb 19, 2023
@sleepymole
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: a94398a

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 19, 2023
@ti-chi-bot ti-chi-bot merged commit 772c688 into pingcap:release-6.5 Feb 19, 2023
@dsdashun dsdashun mentioned this pull request Mar 6, 2023
Merged
12 tasks
@VelocityLight VelocityLight added do-not-merge/cherry-pick-not-approved cherry-pick-approved Cherry pick PR approved by release team. and removed cherry-pick-approved Cherry pick PR approved by release team. do-not-merge/cherry-pick-not-approved labels Mar 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sleepymole sleepymole sleepymole approved these changes

@dsdashun dsdashun dsdashun approved these changes

Assignees

@sleepymole sleepymole

Labels
cherry-pick-approved Cherry pick PR approved by release team. component/lightning This issue is related to Lightning of TiDB. release-note-none Denotes a PR that doesn't merit a release note. 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/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR.
Projects
None yet
Milestone
No milestone
Development

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