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

mysql (ticdc): back port batch dml to release 6.1 #7857

Merged
merged 18 commits into from
Jan 10, 2023
Merged

mysql (ticdc): back port batch dml to release 6.1 #7857

merged 18 commits into from
Jan 10, 2023

Conversation

asddongmen
Copy link
Contributor

@asddongmen asddongmen commented Dec 8, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: ref #7653

What is changed and how it works?

This PR is a manual cherry pick of #7548.

Check List

Tests

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

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
Copy link
Member

ti-chi-bot commented Dec 8, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • lance6716
  • nongfushanquan

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.

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 added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/cherry-pick-not-approved size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. 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 Dec 8, 2022
@asddongmen
Copy link
Contributor Author

/run-integration-tests

@asddongmen
Copy link
Contributor Author

/run-integration-tests

1 similar comment
@asddongmen
Copy link
Contributor Author

/run-integration-tests

@asddongmen
Copy link
Contributor Author

/run-integration-tests

@asddongmen
Copy link
Contributor Author

/run-integration-test

lance6716
lance6716 reviewed Dec 12, 2022
View reviewed changes
pkg/sqlmodel/multivalue.go
// (typically same PK/NOT NULL UK), otherwise the behaviour is undefined.
// Compared to GenInsertSQL with DMLInsertOnDuplicateUpdate, this function is
// slower and more complex, we should only use it when PK/UK is updated.
func GenUpdateSQL(changes ...*RowChange) (string, []interface{}) {
Copy link
Contributor

Choose a reason for hiding this comment

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

lgtm for this function

lance6716
lance6716 approved these changes Dec 26, 2022
View reviewed changes
Copy link
Contributor

@lance6716 lance6716 left a comment

Choose a reason for hiding this comment

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

lgtm for GenUpdateSQL

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 26, 2022
@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 Dec 26, 2022
@asddongmen
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: e9960a5

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 26, 2022
@codecov-commenter
Copy link

codecov-commenter commented Dec 26, 2022 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (release-6.1@ee2a385). Click here to learn what that means.
The diff coverage is n/a.

❗ Current head 815f2d0 differs from pull request most recent head 60a8005. Consider uploading reports for the commit 60a8005 to get more accurate results

Additional details and impacted files
Flag Coverage Δ
cdc 67.3983% <0.0000%> (?)
dm 55.8240% <0.0000%> (?)
engine 64.3154% <0.0000%> (?)

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

@@               Coverage Diff                @@
##             release-6.1      #7857   +/-   ##
================================================
  Coverage               ?   61.7249%           
================================================
  Files                  ?        971           
  Lines                  ?     133617           
  Branches               ?          0           
================================================
  Hits                   ?      82475           
  Misses                 ?      44414           
  Partials               ?       6728

@asddongmen
Copy link
Contributor Author

/run-kafka-integration-test

3 similar comments
@asddongmen
Copy link
Contributor Author

/run-kafka-integration-test

@asddongmen
Copy link
Contributor Author

/run-kafka-integration-test

@nongfushanquan
Copy link
Contributor

/run-kafka-integration-test

@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Dec 27, 2022
@asddongmen
Copy link
Contributor Author

/run-kafka-integration-test

@asddongmen
Copy link
Contributor Author

/run-kafka-integration-test

1 similar comment
@asddongmen
Copy link
Contributor Author

/run-kafka-integration-test

@asddongmen asddongmen added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 28, 2022
@asddongmen
Copy link
Contributor Author

/run-kafka-integration-test

@asddongmen
Copy link
Contributor Author

/run-kafka-integration-test

@asddongmen
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 2ce2c87

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 10, 2023
@asddongmen asddongmen removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 10, 2023
@asddongmen
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

@asddongmen: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

trigger some heavy tests which will not run always when PR updated.

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

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 ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot merged commit 8e90b44 into pingcap:release-6.1 Jan 10, 2023
@asddongmen asddongmen deleted the manual-cherry-pick-7584-to-release-6.1 branch May 18, 2023 05:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nongfushanquan nongfushanquan nongfushanquan approved these changes

@lance6716 lance6716 lance6716 approved these changes

Assignees
No one assigned
Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@asddongmen @ti-chi-bot @codecov-commenter @nongfushanquan @lance6716 @VelocityLight