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

sink(ticdc): Revert changes related to the conflict detector #10897

Merged
merged 2 commits into from
Apr 10, 2024

Conversation

CharlesCheung96
Copy link
Contributor

@CharlesCheung96 CharlesCheung96 commented Apr 10, 2024

What problem does this PR solve?

Issue Number: ref #10896

What is changed and how it works?

Check List

Tests

  • 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

None

@ti-chi-bot ti-chi-bot bot added 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. labels Apr 10, 2024
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Apr 10, 2024
Copy link

codecov bot commented Apr 10, 2024

Codecov Report

Merging #10897 (2fed815) into master (8a3b776) will increase coverage by 0.0269%.
The diff coverage is 88.6597%.

Additional details and impacted files
Components Coverage Δ
cdc 61.7195% <88.6597%> (+0.0448%) ⬆️
dm 51.2394% <ø> (-0.0021%) ⬇️
engine 63.4232% <ø> (+0.0353%) ⬆️
Flag Coverage Δ
unit 57.4131% <88.6597%> (+0.0269%) ⬆️

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

@@               Coverage Diff                @@
##             master     #10897        +/-   ##
================================================
+ Coverage   57.3861%   57.4131%   +0.0269%     
================================================
  Files           849        849                
  Lines        124997     125062        +65     
================================================
+ Hits          71731      71802        +71     
+ Misses        47876      47870         -6     
  Partials       5390       5390                

Copy link
Contributor

ti-chi-bot bot commented Apr 10, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 3AceShowHand, hongyunyan

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:
  • OWNERS [3AceShowHand,hongyunyan]

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 lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Apr 10, 2024
Copy link
Contributor

ti-chi-bot bot commented Apr 10, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-04-10 05:57:35.919825336 +0000 UTC m=+1028317.447365879: ☑️ agreed by 3AceShowHand.
  • 2024-04-10 06:24:07.274857786 +0000 UTC m=+1029908.802398332: ☑️ agreed by hongyunyan.

@asddongmen asddongmen changed the title sink(ticdc): revert some pr sink(ticdc): Revert changes related to the conflict detector Apr 10, 2024
@ti-chi-bot ti-chi-bot bot added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Apr 10, 2024
@3AceShowHand
Copy link
Contributor

/retest

4 similar comments
@CharlesCheung96
Copy link
Contributor Author

/retest

@CharlesCheung96
Copy link
Contributor Author

/retest

@CharlesCheung96
Copy link
Contributor Author

/retest

@CharlesCheung96
Copy link
Contributor Author

/retest

@ti-chi-bot ti-chi-bot bot merged commit e47549b into pingcap:master Apr 10, 2024
28 checks passed
@ti-chi-bot ti-chi-bot added the needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. label Apr 18, 2024
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.5: #10926.

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.1: #10927.

@ti-chi-bot ti-chi-bot added needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. labels Apr 26, 2024
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-8.1: #10986.

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Apr 26, 2024
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.5: #10987.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants