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

pkg/causality(cdc): refactor and simplify conflict detector (#10954) #11273

Open
wants to merge 8 commits into
base: release-7.1
Choose a base branch
from

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #10954

What problem does this PR solve?

Issue Number: close #10973

What is changed and how it works?

  • Remove some useless and redundant logic.
  • Move sortAndDedupHashes to pkg/causality/internal/slots.go, since it is used to solve the false positive problem caused by hash conflicts in slots.
  • For txnEvent interface, rename GenSortedDedupKeysHash to ConflictKeys to ensure semantic consistency, because the implementers should not care about internal implementations of conflict_detector.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Questions

Will it cause performance regression or break compatibility?
Do you need to update user documentation, design documentation or monitoring documentation?

Release note

Please refer to [Release Notes Language Style Guide](https://pingcap.github.io/tidb-dev-guide/contribute-to-tidb/release-notes-style-guide.html) to write a quality release note.

If you don't think this PR needs a release note then fill it with `None`.

@ti-chi-bot ti-chi-bot added lgtm release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. type/cherry-pick-for-release-7.1 This PR is cherry-picked to release-7.1 from a source PR. labels Jun 7, 2024
@ti-chi-bot ti-chi-bot bot added the do-not-merge/cherry-pick-not-approved The current cherry-pick pull request has not been approved and cannot be merged. label Jun 7, 2024
@ti-chi-bot ti-chi-bot force-pushed the cherry-pick-10954-to-release-7.1 branch from 18ec23b to 3ab1d95 Compare June 7, 2024 07:13
Copy link
Contributor

ti-chi-bot bot commented Jun 7, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from charlescheung96, ensuring that each of them provides their approval before proceeding. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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 force-pushed the cherry-pick-10954-to-release-7.1 branch from 3ab1d95 to 1f22da0 Compare June 7, 2024 07:13
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Jun 7, 2024
@ti-chi-bot ti-chi-bot bot removed the do-not-merge/cherry-pick-not-approved The current cherry-pick pull request has not been approved and cannot be merged. label Jun 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. lgtm release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. type/cherry-pick-for-release-7.1 This PR is cherry-picked to release-7.1 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants