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.

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

txn: fix Pipelined DML duplicate entry message #51708

Merged
merged 5 commits into from
Mar 13, 2024

Conversation

ekexium
Copy link
Contributor

@ekexium ekexium commented Mar 12, 2024

What problem does this PR solve?

Issue Number: ref #50215

Problem Summary:

Previously the error message was like

(1062, "Duplicate entry '7480000000000000685f728000000000000001' for key 'UNKNOWN'")

The PR fixes it to make it like

(1062, "Duplicate entry '1' for key 't.PRIMARY'")

Depends on tikv/client-go#1218

What changed and how does it work?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No need to test
    • I checked and no code files have been changed.

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 bot added 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. labels Mar 12, 2024
Copy link

tiprow bot commented Mar 12, 2024

Hi @ekexium. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

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.

@ekexium ekexium force-pushed the pipelined-dml-dup-key-message branch from c461d2a to 385b5cf Compare March 12, 2024 10:29
@ti-chi-bot ti-chi-bot 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 Mar 12, 2024
Signed-off-by: ekexium <eke@fastmail.com>
@ekexium ekexium force-pushed the pipelined-dml-dup-key-message branch from 385b5cf to a32c305 Compare March 12, 2024 10:30
@ekexium ekexium requested review from you06 and cfzjywxk March 12, 2024 10:32
Signed-off-by: ekexium <eke@fastmail.com>
@ti-chi-bot ti-chi-bot 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 Mar 12, 2024
Signed-off-by: ekexium <eke@fastmail.com>
Copy link

codecov bot commented Mar 12, 2024

Codecov Report

Merging #51708 (31ce274) into master (ccbab5e) will increase coverage by 2.2850%.
Report is 16 commits behind head on master.
The diff coverage is 42.8571%.

Additional details and impacted files
@@               Coverage Diff                @@
##             master     #51708        +/-   ##
================================================
+ Coverage   70.7455%   73.0305%   +2.2849%     
================================================
  Files          1473       1474         +1     
  Lines        436996     440809      +3813     
================================================
+ Hits         309155     321925     +12770     
+ Misses       108515      98880      -9635     
- Partials      19326      20004       +678     
Flag Coverage Δ
integration 49.0052% <42.8571%> (?)
unit 70.6802% <42.8571%> (+0.1168%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
dumpling 53.9957% <ø> (ø)
parser ∅ <ø> (∅)
br 51.2229% <ø> (+5.3373%) ⬆️

@ti-chi-bot ti-chi-bot bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Mar 12, 2024
@ekexium ekexium requested a review from zyguan March 12, 2024 12:32
@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Mar 13, 2024
Copy link

ti-chi-bot bot commented Mar 13, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-03-12 12:06:45.204808457 +0000 UTC m=+773632.227054845: ☑️ agreed by cfzjywxk.
  • 2024-03-13 02:35:00.850241739 +0000 UTC m=+825727.872488124: ☑️ agreed by you06.

Signed-off-by: ekexium <eke@fastmail.com>
@ti-chi-bot ti-chi-bot bot removed the approved label Mar 13, 2024
@ekexium ekexium force-pushed the pipelined-dml-dup-key-message branch from 5044dd2 to d97c141 Compare March 13, 2024 02:57
@ekexium
Copy link
Contributor Author

ekexium commented Mar 13, 2024

@GMHDBJD @Leavrth I changed mockPdClient. The PR needs your approval, PTAL.

@ekexium ekexium force-pushed the pipelined-dml-dup-key-message branch from d97c141 to 8bb0014 Compare March 13, 2024 03:19
Copy link
Contributor

@GMHDBJD GMHDBJD left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link

ti-chi-bot bot commented Mar 13, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cfzjywxk, GMHDBJD, Leavrth, you06

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 13, 2024
Signed-off-by: ekexium <eke@fastmail.com>
@ekexium ekexium force-pushed the pipelined-dml-dup-key-message branch from 8bb0014 to 31ce274 Compare March 13, 2024 03:28
@hawkingrei
Copy link
Member

/retest

@ti-chi-bot ti-chi-bot bot merged commit 8f9fbbb into pingcap:master Mar 13, 2024
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants