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

executor: check error message and refine LOAD DATA logic #41640

Merged
merged 21 commits into from
Feb 28, 2023
Merged

executor: check error message and refine LOAD DATA logic #41640

merged 21 commits into from
Feb 28, 2023

Conversation

lance6716
Copy link
Contributor

@lance6716 lance6716 commented Feb 21, 2023 •
edited
Loading

What problem does this PR solve?

Issue Number: ref #40499

Problem Summary:

What is changed and how it works?

  • Add specific error types for LOAD DATA, and display the error to user (TODO: check data error is also displayed)
  • refine the producer/comsumer pattern, use errgroup instead of multiple channels with magic size
  • remove some public member and method, rename and reorder functions

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

[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/work-in-progress Indicates that a PR should not merge because it is a work in progress. do-not-merge/needs-linked-issue 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 Feb 21, 2023
@lance6716
finish refine code
0adb0e6 
Signed-off-by: lance6716 <lance6716@gmail.com>
@lance6716
add error message
903fd60 
Signed-off-by: lance6716 <lance6716@gmail.com>
@lance6716 lance6716 changed the title [WIP]executor: check error message and refine LOAD DATA logic executor: check error message and refine LOAD DATA logic Feb 22, 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 Feb 22, 2023
@lance6716
fix errdoc
cd78ebd 
Signed-off-by: lance6716 <lance6716@gmail.com>
@lance6716
fix UT
72eccb0 
Signed-off-by: lance6716 <lance6716@gmail.com>
@lance6716
fix UT
af7e91f 
Signed-off-by: lance6716 <lance6716@gmail.com>
@lance6716
Merge branch 'master' of github.com:pingcap/tidb into ld-worker
6858e51
@lance6716 lance6716 changed the title executor: check error message and refine LOAD DATA logic executor: check error message and refine LOAD DATA logic | tidb-test=pr/2086 Feb 23, 2023
@lance6716
Copy link
Contributor Author

/retest

@lance6716
Copy link
Contributor Author

/cc @cfzjywxk @gozssky @GMHDBJD

@lance6716
fix wrong check killed
e177c81 
Signed-off-by: lance6716 <lance6716@gmail.com>
@lance6716
save work
db25d8c 
Signed-off-by: lance6716 <lance6716@gmail.com>
@lance6716
save work
15e7999 
Signed-off-by: lance6716 <lance6716@gmail.com>
@lance6716
align with spec
b66ebd1 
Signed-off-by: lance6716 <lance6716@gmail.com>
@lance6716
fix some UT
2d53291 
Signed-off-by: lance6716 <lance6716@gmail.com>
@lance6716
fix more
4a627d4 
Signed-off-by: lance6716 <lance6716@gmail.com>
@lance6716
fix UT
7857c26 
Signed-off-by: lance6716 <lance6716@gmail.com>
@lance6716
align with spec
90cae54 
Signed-off-by: lance6716 <lance6716@gmail.com>
@lance6716
Copy link
Contributor Author

/cc @D3Hunter

@ti-chi-bot ti-chi-bot requested a review from D3Hunter February 27, 2023 05:43
@lance6716
fix make errdoc
ed6a2d0 
Signed-off-by: lance6716 <lance6716@gmail.com>
D3Hunter
D3Hunter reviewed Feb 27, 2023
View reviewed changes
br/pkg/lightning/mydump/csv_parser.go Outdated Show resolved Hide resolved
executor/load_data.go Outdated Show resolved Hide resolved
executor/errors.go Outdated Show resolved Hide resolved
executor/load_data.go Outdated Show resolved Hide resolved
executor/load_data.go Outdated Show resolved Hide resolved
executor/load_data.go Show resolved Hide resolved
executor/load_data.go
case <-checkKilled.C:
if atomic.CompareAndSwapUint32(&e.Ctx.GetSessionVars().Killed, 1, 0) {
logutil.Logger(ctx).Info("load data query interrupted quit data processing")
return ErrQueryInterrupted
Copy link
Contributor

Choose a reason for hiding this comment

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

close(e.commitTaskQueue) before return?

executor/load_data.go Outdated Show resolved Hide resolved
executor/load_data.go
return err
return ErrLoadDataCantRead.GenWithStackByArgs(
err.Error(),
"Only the following formats delimited text file (csv, tsv), parquet, sql are supported. Please provide the valid source file(s)",
Copy link
Contributor

Choose a reason for hiding this comment

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

should we include help message in doc, not in error message? seems most tidb error don't have msg for how to handle it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'll discuss with PM about it later

executor/load_data.go
)

const (
// LoadDataFormatSQLDump represents the data source file of LOAD DATA is
// mydumper-format DML file
LoadDataFormatSQLDump = "sqldumpfile"
LoadDataFormatSQLDump = "sql file"
Copy link
Contributor

Choose a reason for hiding this comment

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

use sql?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'll discuss with PM about it later

@lance6716
address comment
2e6d13c 
Signed-off-by: lance6716 <lance6716@gmail.com>
@lance6716
fix bazel
52dc64d 
Signed-off-by: lance6716 <lance6716@gmail.com>
@lance6716
fix UT
2bf2dc5 
Signed-off-by: lance6716 <lance6716@gmail.com>
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Feb 28, 2023
@lance6716
Copy link
Contributor Author

/test mysql-test

GMHDBJD
GMHDBJD approved these changes Feb 28, 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 Feb 28, 2023
@lance6716
Copy link
Contributor Author

/test mysql-test

@lance6716 lance6716 changed the title executor: check error message and refine LOAD DATA logic | tidb-test=pr/2086 executor: check error message and refine LOAD DATA logic Feb 28, 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: 1f4892c

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 28, 2023
@ti-chi-bot ti-chi-bot merged commit 1da60a3 into pingcap:master Feb 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fzzf678 fzzf678 fzzf678 left review comments

@GMHDBJD GMHDBJD GMHDBJD approved these changes

@D3Hunter D3Hunter D3Hunter approved these changes

@cfzjywxk cfzjywxk Awaiting requested review from cfzjywxk

@sleepymole sleepymole Awaiting requested review from sleepymole

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.
5 participants
@lance6716 @ti-chi-bot @D3Hunter @GMHDBJD @fzzf678