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

lightning: add Conflict section to config and refactor #45197

Merged
merged 6 commits into from Jul 11, 2023
Merged

lightning: add Conflict section to config and refactor #45197

merged 6 commits into from Jul 11, 2023

Conversation

lance6716
Copy link
Contributor

@lance6716 lance6716 commented Jul 6, 2023 •
edited

What problem does this PR solve?

Issue Number: ref #41629

Problem Summary:

What is changed and how it works?

  • Add config.conflict section to control the behaviour of PK/UK conflict
  • refactor the config.Adjust(). Now different member of Config has its own adjust() function has the dependency order of adjust is expressed by argument of adjust()
  • remove the already deprecated black-white-list

Check List

Tests

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

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

@lance6716
lightning: add Conflict section to config and refactor
9c942bf 
Signed-off-by: lance6716 <lance6716@gmail.com>
@lance6716
fix DDL usgae
913089d 
Signed-off-by: lance6716 <lance6716@gmail.com>
@lance6716
fix bazel
bd1254f 
Signed-off-by: lance6716 <lance6716@gmail.com>
@ti-chi-bot ti-chi-bot bot added release-note-none size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jul 6, 2023
@tiprow
Copy link

tiprow bot commented Jul 6, 2023

Hi @lance6716. 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.

@lance6716
Copy link
Contributor Author

/ok-to-test

@ti-chi-bot ti-chi-bot bot added the ok-to-test label Jul 6, 2023
@ti-chi-bot ti-chi-bot bot deleted a comment from ti-chi-bot Jul 6, 2023
@lance6716
fix linter
4a544ea 
Signed-off-by: lance6716 <lance6716@gmail.com>
@lance6716
Copy link
Contributor Author

/run-integration-br-test

@ti-chi-bot ti-chi-bot bot deleted a comment from ti-chi-bot Jul 6, 2023
@lance6716
Copy link
Contributor Author

/retest

@lance6716
fix CI
e24d10b 
Signed-off-by: lance6716 <lance6716@gmail.com>
@lance6716
Copy link
Contributor Author

/run-integration-br-test

@lance6716
Copy link
Contributor Author

/retest

@lance6716
Copy link
Contributor Author

/run-integration-br-test

1 similar comment
@lance6716
Copy link
Contributor Author

/run-integration-br-test

okJiang
okJiang reviewed Jul 6, 2023
View reviewed changes
Copy link
Member

@okJiang okJiang left a comment

Choose a reason for hiding this comment

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

left Conflict

br/pkg/lightning/config/config.go Show resolved Hide resolved
br/pkg/lightning/config/config.go Show resolved Hide resolved
br/pkg/lightning/config/config.go Show resolved Hide resolved
br/pkg/lightning/config/config.go Show resolved Hide resolved
@lance6716
Copy link
Contributor Author

/run-integration-br-test

okJiang
okJiang reviewed Jul 6, 2023
View reviewed changes
br/pkg/lightning/config/config_test.go Outdated Show resolved Hide resolved
br/pkg/lightning/config/config.go Show resolved Hide resolved
@lance6716
change test name
46b2824 
Signed-off-by: lance6716 <lance6716@gmail.com>
D3Hunter
D3Hunter approved these changes Jul 10, 2023
View reviewed changes
Copy link
Contributor

@D3Hunter D3Hunter 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

br/pkg/lightning/config/config.go
rule.ToLower()
}
if err := rule.Valid(); err != nil {
return common.ErrInvalidConfig.Wrap(err).GenWithStack("file route rule is invalid")
Copy link
Contributor

Choose a reason for hiding this comment

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

table route?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

In lightning it's indeed called file route. Maybe the data source of lighting are files.

GMHDBJD
GMHDBJD approved these changes Jul 11, 2023
View reviewed changes
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

br/pkg/lightning/config/config.go
}
p.Checksum = OpLevelOff
p.Analyze = OpLevelOff
p.Compact = false
Copy link
Contributor

Choose a reason for hiding this comment

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

ChecksumViaSQL?

@ti-chi-bot
Copy link

ti-chi-bot bot commented Jul 11, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: D3Hunter, GMHDBJD

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

ti-chi-bot bot commented Jul 11, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-07-10 07:32:51.266607016 +0000 UTC m=+317263.036945721: ☑️ agreed by D3Hunter.
  • 2023-07-11 08:40:17.521527039 +0000 UTC m=+407709.291865751: ☑️ agreed by GMHDBJD.

@ti-chi-bot ti-chi-bot bot merged commit 108cb92 into pingcap:master Jul 11, 2023
15 of 21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@okJiang okJiang okJiang left review comments

@D3Hunter D3Hunter D3Hunter approved these changes

@GMHDBJD GMHDBJD GMHDBJD approved these changes

Assignees
No one assigned
Labels
approved lgtm ok-to-test release-note-none size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@lance6716 @D3Hunter @okJiang @GMHDBJD