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

load data: physical mode part2 #42883

Merged
merged 9 commits into from
Apr 13, 2023
Merged

load data: physical mode part2 #42883

merged 9 commits into from
Apr 13, 2023

Conversation

D3Hunter
Copy link
Contributor

@D3Hunter D3Hunter commented Apr 10, 2023 •
edited
Loading

What problem does this PR solve?

Issue Number: ref #40499

Problem Summary:

What is changed and how it works?

  • add JobImporter so logical/physical mode can reuse same job management code
  • some refactor, such as make job related func methods
  • will add test for physical mode job in later pr

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 10, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • GMHDBJD
  • lance6716

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-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Apr 10, 2023
@D3Hunter D3Hunter requested review from lance6716 and GMHDBJD April 10, 2023 02:33
D3Hunter
D3Hunter commented Apr 10, 2023
View reviewed changes
executor/load_data.go
}
}

func (e *LoadDataWorker) loadRemote(ctx context.Context) (int64, error) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

moved to above to make code for same struct together

D3Hunter
D3Hunter commented Apr 10, 2023
View reviewed changes
executor/load_data.go
}
return err2
})
// UpdateJobProgress goroutine.
group.Go(func() error {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

moved as a job method

D3Hunter
D3Hunter commented Apr 10, 2023
View reviewed changes
executor/load_data.go
@@ -861,115 +968,6 @@ func (w *commitWorker) addRecordLD(ctx context.Context, row []types.Datum) error
return nil
}

// mergeAndSetMessage merges stats from all used session context and sets info
// message(ERR_LOAD_INFO) generated by LOAD statement to UserSctx.
func (e *LoadDataWorker) mergeAndSetMessage() string {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

moved to above

D3Hunter
D3Hunter commented Apr 10, 2023
View reviewed changes
executor/load_data.go
@@ -82,10 +82,6 @@ func (e *LoadDataExec) Next(ctx context.Context, req *chunk.Chunk) (err error) {
e.detachHandled = true
}
case ast.FileLocClient:
if e.loadDataWorker.controller.Detached {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

moved to controller.initLoadParams

@D3Hunter
Copy link
Contributor Author

/retest

3 similar comments
@D3Hunter
Copy link
Contributor Author

/retest

@D3Hunter
Copy link
Contributor Author

/retest

@D3Hunter
Copy link
Contributor Author

/retest

@D3Hunter
Copy link
Contributor Author

@lance6716 @GMHDBJD

GMHDBJD
GMHDBJD approved these changes Apr 12, 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 the status/LGT1 Indicates that a PR has LGTM 1. label Apr 12, 2023
lance6716
lance6716 reviewed Apr 12, 2023
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.

12 / 18 files viewed

executor/load_data.go

// UpdateJobProgress goroutine.
group.Go(func() error {
return job.ProgressUpdateRoutineFn(ctx, done, groupCtx.Done(), e.progress)
Copy link
Contributor

Choose a reason for hiding this comment

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

why we need two context here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

one ctx, the third is a channel

Copy link
Contributor

Choose a reason for hiding this comment

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

The groupCtx is derieved from ctx, we don't need ctx.

lance6716
lance6716 reviewed Apr 13, 2023
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.

rest lgtm

executor/load_data.go Outdated
e.UserSctx.GetSessionVars().User.String(),
)
if err != nil {
return 0, err
Copy link
Contributor

Choose a reason for hiding this comment

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

in these exit branch with true e.controller.Detached we will leak the session

Copy link
Contributor Author

Choose a reason for hiding this comment

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

d704f39

@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
@D3Hunter
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: d704f39

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

/retest

@ti-chi-bot ti-chi-bot merged commit 2002ca1 into master Apr 13, 2023
@ti-chi-bot ti-chi-bot deleted the physical-mode-ld-job branch April 13, 2023 06:09
@ti-chi-bot
Copy link
Member

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

@D3Hunter: 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/mysql-test f433e36 link true /test mysql-test

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

@GMHDBJD GMHDBJD GMHDBJD approved these changes

@lance6716 lance6716 lance6716 approved these changes

Assignees
No one assigned
Labels
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.
4 participants
@D3Hunter @ti-chi-bot @lance6716 @GMHDBJD