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

Conflict data resolution enhancement during data import #16720

Merged
merged 14 commits into from
Mar 26, 2024
Merged

Conflict data resolution enhancement during data import #16720

merged 14 commits into from
Mar 26, 2024

Conversation

qiancai
Copy link
Collaborator

@qiancai qiancai commented Mar 11, 2024

close pingcap/tidb#51295

What is changed, added or deleted? (Required)

Conflict data resolution enhancement during data import. Lightning preprocess duplicate detection and post-import conflict detection has been merged.

Which TiDB version(s) do your changes apply to? (Required)

Tips for choosing the affected version(s):

By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.

For details, see tips for choosing the affected versions (in Chinese).

  • master (the latest development version)
  • v8.0 (TiDB 8.0 versions)
  • v7.6 (TiDB 7.6 versions)
  • v7.5 (TiDB 7.5 versions)
  • v7.4 (TiDB 7.4 versions)
  • v7.1 (TiDB 7.1 versions)
  • v6.5 (TiDB 6.5 versions)
  • v6.1 (TiDB 6.1 versions)
  • v5.4 (TiDB 5.4 versions)
  • v5.3 (TiDB 5.3 versions)
  • v5.2 (TiDB 5.2 versions)
  • v5.1 (TiDB 5.1 versions)
  • v5.0 (TiDB 5.0 versions)

What is the related PR or file link(s)?

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

@qiancai qiancai added area/tidb-lightning Indicates that the Issue or PR belongs to the area of TiDB Lightning. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. v8.0 labels Mar 11, 2024
@ti-chi-bot ti-chi-bot bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 11, 2024
@ti-chi-bot ti-chi-bot bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 13, 2024
@qiancai qiancai self-assigned this Mar 20, 2024
qiancai
qiancai commented Mar 20, 2024
View reviewed changes
tidb-lightning/tidb-lightning-configuration.md Outdated Show resolved Hide resolved
tidb-lightning/tidb-lightning-configuration.md Outdated Show resolved Hide resolved
tidb-lightning/tidb-lightning-configuration.md Outdated Show resolved Hide resolved
tidb-lightning/tidb-lightning-configuration.md Outdated Show resolved Hide resolved
tidb-lightning/tidb-lightning-configuration.md Outdated Show resolved Hide resolved
tidb-lightning/tidb-lightning-logical-import-mode-usage.md Outdated Show resolved Hide resolved
tidb-lightning/tidb-lightning-physical-import-mode-usage.md Outdated Show resolved Hide resolved
tidb-lightning/tidb-lightning-physical-import-mode-usage.md Outdated Show resolved Hide resolved
tidb-lightning/tidb-lightning-physical-import-mode-usage.md Outdated Show resolved Hide resolved
tidb-lightning/tidb-lightning-physical-import-mode-usage.md Outdated Show resolved Hide resolved
@qiancai qiancai requested a review from lyzx2001 March 21, 2024 08:19
lyzx2001
lyzx2001 reviewed Mar 21, 2024
View reviewed changes
tidb-lightning/tidb-lightning-configuration.md Outdated Show resolved Hide resolved
tidb-lightning/tidb-lightning-configuration.md Outdated Show resolved Hide resolved
tidb-lightning/tidb-lightning-configuration.md Outdated Show resolved Hide resolved
tidb-lightning/tidb-lightning-logical-import-mode-usage.md Outdated Show resolved Hide resolved
tidb-lightning/tidb-lightning-physical-import-mode-usage.md Outdated Show resolved Hide resolved
tidb-lightning/tidb-lightning-physical-import-mode-usage.md Outdated
strategy = ""
# Controls whether to enable conflict prechecks, which check conflicts in the data before importing it to TiDB. In scenarios where the ratio of conflict records is greater than or equal to 1%, it is recommended to enable conflict prechecks for better performance in conflict detection. In other scenarios, it is recommended to disable it. The default value is false, indicating that TiDB Lightning only checks conflicts after the import. If you set it to true, TiDB Lightning checks conflicts both before and after the import. This parameter is experimental.
Copy link
Contributor

Choose a reason for hiding this comment

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

ditto

tidb-lightning/tidb-lightning-physical-import-mode-usage.md Outdated Show resolved Hide resolved
lilin90
lilin90 approved these changes Mar 22, 2024
View reviewed changes
Copy link
Member

@lilin90 lilin90 left a comment

Choose a reason for hiding this comment

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

Rest LGTM

@qiancai @lilin90
Apply suggestions from code review
856dcf6 
Co-authored-by: Lilian Lee <lilin@pingcap.com>
@ti-chi-bot ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Mar 22, 2024
@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Mar 22, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-03-22 06:45:14.537449452 +0000 UTC m=+1618341.559695837: ☑️ agreed by lilin90.

@qiancai @lyzx2001
Apply suggestions from code review
9c0a026 
Co-authored-by: Luo Yangzhixin <rep_laureline@hotmail.com>
@qiancai @lyzx2001
Apply suggestions from code review
32feb43 
Co-authored-by: Luo Yangzhixin <rep_laureline@hotmail.com>
@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Mar 25, 2024

@lyzx2001: adding LGTM is restricted to approvers and reviewers in OWNERS files.

In response to this:

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 kubernetes/test-infra repository.

@qiancai
Copy link
Collaborator Author

qiancai commented Mar 26, 2024

/approve

@qiancai qiancai added the lgtm label Mar 26, 2024
@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Mar 26, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: qiancai

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added the approved label Mar 26, 2024
@ti-chi-bot ti-chi-bot bot merged commit 072b53c into pingcap:master Mar 26, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lyzx2001 lyzx2001 lyzx2001 approved these changes

@lilin90 lilin90 lilin90 approved these changes

Assignees

@qiancai qiancai

Labels
approved area/tidb-lightning Indicates that the Issue or PR belongs to the area of TiDB Lightning. lgtm needs-1-more-lgtm Indicates a PR needs 1 more LGTM. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. v8.0
Projects
None yet
Milestone
No milestone
3 participants
@qiancai @lilin90 @lyzx2001