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: remove glue #42911

Merged
merged 15 commits into from Apr 13, 2023
Merged

lightning: remove glue #42911

merged 15 commits into from Apr 13, 2023

Conversation

lance6716
Copy link
Contributor

@lance6716 lance6716 commented Apr 11, 2023 •
edited

What problem does this PR solve?

Issue Number: close #xxx

Problem Summary:

What is changed and how it works?

revert pingcap/tidb-lightning#456 . Glue is introduced to implement lightning in SQL, but the plan has been changed.

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

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Apr 11, 2023 •
edited

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • D3Hunter
  • GMHDBJD

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 do-not-merge/needs-linked-issue do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Apr 11, 2023
@lance6716
Merge branch 'master' of github.com:pingcap/tidb into remove-lightnin…
9bdba65 
…g-glue

Signed-off-by: lance6716 <lance6716@gmail.com>
@lance6716
fix some UT
7fcc5e2 
Signed-off-by: lance6716 <lance6716@gmail.com>
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 11, 2023
@lance6716
fix UT
3444dcd 
Signed-off-by: lance6716 <lance6716@gmail.com>
@lance6716 lance6716 changed the title [WIP] lightning: remove glue lightning: remove glue Apr 11, 2023
@ti-chi-bot ti-chi-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 11, 2023
@lance6716
fix bazel
bec65fe 
Signed-off-by: lance6716 <lance6716@gmail.com>
@lance6716
fix UT
088e568 
Signed-off-by: lance6716 <lance6716@gmail.com>
@lance6716
fix CI
362a939 
Signed-off-by: lance6716 <lance6716@gmail.com>
@lance6716
Copy link
Contributor Author

/run-integration-br-test

D3Hunter
D3Hunter reviewed Apr 11, 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/importer/tidb.go Outdated
kvs, err := g.QueryStringsWithLog(ctx, query.String(), "obtain system variables", log.FromContext(ctx))
kvs := make([][]string, 0, len(common.DefaultImportantVariables)+len(common.DefaultImportVariablesTiDB))
exec := common.SQLWithRetry{DB: db, Logger: log.FromContext(ctx)}
err := exec.Transact(ctx, "obtain system variables", func(c context.Context, tx *sql.Tx) (txErr error) {
Copy link
Contributor

Choose a reason for hiding this comment

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

make it a function?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

do you mean provide a function like common.TransactWithRetry(ctx, db, logger, purpose, actionFn)? We still need provide these arguments, I think there's not much benefits

Copy link
Contributor

Choose a reason for hiding this comment

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

like previous QueryStringsWithLog, we can move it to SQLWithRetry

Copy link
Contributor Author

Choose a reason for hiding this comment

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

a328891

@lance6716
address comment
a328891 
Signed-off-by: lance6716 <lance6716@gmail.com>
@lance6716
fix CI
4aef82d 
Signed-off-by: lance6716 <lance6716@gmail.com>
@lance6716
fix CI
652eeb7 
Signed-off-by: lance6716 <lance6716@gmail.com>
@lance6716
fix CI
0d22b43 
Signed-off-by: lance6716 <lance6716@gmail.com>
@lance6716
fix CI
c7e97a3 
Signed-off-by: lance6716 <lance6716@gmail.com>
@ti-chi-bot ti-chi-bot added status/LGT1 Indicates that a PR has LGTM 1. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Apr 13, 2023
@lance6716
Merge branch 'master' of github.com:pingcap/tidb into remove-lightnin…
2e7f176 
…g-glue

Signed-off-by: lance6716 <lance6716@gmail.com>
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 13, 2023
GMHDBJD
GMHDBJD approved these changes Apr 13, 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

@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 Apr 13, 2023
@lance6716
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 2e7f176

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 13, 2023
@lance6716
fix lint
3b8e8f0 
Signed-off-by: lance6716 <lance6716@gmail.com>
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Apr 13, 2023
@lance6716
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 3b8e8f0

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 13, 2023
@lance6716
Copy link
Contributor Author

/retest

@lance6716
fix CI
f0dd116 
Signed-off-by: lance6716 <lance6716@gmail.com>
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Apr 13, 2023
@lance6716
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: f0dd116

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 13, 2023
@ti-chi-bot ti-chi-bot merged commit 49748c4 into pingcap:master Apr 13, 2023
11 checks passed
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Apr 14, 2023 •
edited

@lance6716: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
idc-jenkins-ci-tidb/check_dev 2e7f176 link true /test check-dev

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@D3Hunter D3Hunter D3Hunter approved these changes

@GMHDBJD GMHDBJD GMHDBJD approved these changes

Assignees
No one assigned
Labels
release-note-none size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. skip-issue-check 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.

None yet
4 participants
@lance6716 @ti-chi-bot @D3Hunter @GMHDBJD