Skip to content

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

Merged
ti-chi-bot merged 2 commits intopingcap:release-6.1from
ti-chi-bot:cherry-pick-40696-to-release-6.1
Mar 30, 2023
Merged

lightning: check hasDupe and tableID when resolve duplicate rows (#40696)#40792
ti-chi-bot merged 2 commits intopingcap:release-6.1from
ti-chi-bot:cherry-pick-40696-to-release-6.1

Conversation

@ti-chi-bot
Copy link
Member

@ti-chi-bot ti-chi-bot commented Jan 28, 2023

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

@sleepymole @ti-chi-bot
This is an automated cherry-pick of pingcap#40696
c7e0e4a 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@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:

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

Details

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 mentioned this pull request Jan 28, 2023
Merged
12 tasks
@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. component/lightning This issue is related to Lightning of TiDB. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR. 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
@sleepymole
Copy link
Contributor

sleepymole commented Feb 7, 2023

/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

sleepymole commented Feb 16, 2023

This cherry-pick must be merged with #41487.

@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Feb 28, 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 Mar 29, 2023
@sleepymole
Copy link
Contributor

sleepymole commented Mar 30, 2023

/merge

@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Mar 30, 2023

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

DetailsCommit hash: 06392da

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

sleepymole commented Mar 30, 2023

/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 Mar 30, 2023
@sleepymole
Copy link
Contributor

sleepymole commented Mar 30, 2023

/retest

@ti-chi-bot ti-chi-bot merged commit dc1ebbe into pingcap:release-6.1 Mar 30, 2023
@VelocityLight VelocityLight added do-not-merge/cherry-pick-not-approved and removed cherry-pick-approved Cherry pick PR approved by release team. labels Apr 12, 2023
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Apr 12, 2023
@ti-chi-bot ti-chi-bot deleted the cherry-pick-40696-to-release-6.1 branch April 15, 2025 08:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@niubell niubell niubell approved these changes

+2 more reviewers

@sleepymole sleepymole sleepymole approved these changes

@lichunzhu lichunzhu lichunzhu approved these changes

Reviewers whose approvals may not affect merge requirements

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.1 This PR is cherry-picked to release-6.1 from a source PR.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@ti-chi-bot @sleepymole @niubell @lichunzhu @VelocityLight