*: using standard error to replace terror #19425
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
component/expression
sig/sql-infra
zz-jason
reviewed
Sep 1, 2020
imtbkcat
force-pushed
the
stderr
branch
3 times, most recently
from
424337b
to
6bd9443
Compare
lonng
reviewed
Sep 3, 2020
| @@ -414,8 +415,8 @@ func convertJob2RollbackJob(w *worker, d *ddlCtx, t *meta.Meta, job *model.Job) | |||
| job.Error = toTError(err) | |||
| } | |||
| if !job.Error.Equal(errCancelledDDLJob) { | |||
| job.Error = job.Error.Class().Synthesize(job.Error.Code(), | |||
| fmt.Sprintf("DDL job rollback, error msg: %s", job.Error.ToSQLError().Message)) | |||
| job.Error = terror.GetErrClass(job.Error).Synthesize(terror.ErrCode(job.Error.Code()), | |||
There was a problem hiding this comment.
Can we use errors.Annotatef here directly? @wjhuang2016
There was a problem hiding this comment.
Here job.Error should be a terror.Errors type, but errors.Annotatef will produce an error type.
lonng
reviewed
Sep 3, 2020
|
PTAL @bb7133 @cfzjywxk @SunRunAway |
imtbkcat
added
the
priority/release-blocker
|
This pr can not update parser now, because of #19709 cause CI fail |
|
/run-all-tests |
1 similar comment
|
/run-all-tests |
|
/run-all-tests |
|
/merge |
|
@imtbkcat Oops! This PR requires at least 2 LGTMs to merge. The current number of |
|
/run-all-tests |
|
/run-unit-test |
1 similar comment
|
/run-unit-test |
|
/run-unit-test |
|
/run-cherry-picker |
ti-srebot
pushed a commit
to ti-srebot/tidb
that referenced
this pull request
Sep 8, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
|
cherry pick to release-4.0 in PR #19888 |
jackysp
pushed a commit
that referenced
this pull request
Sep 9, 2020
imtbkcat
pushed a commit
that referenced
this pull request
Sep 11, 2020
ti-srebot
pushed a commit
that referenced
this pull request
Sep 11, 2020
|
/run-cherry-picker |
imtbkcat
pushed a commit
to imtbkcat/tidb
that referenced
this pull request
Sep 21, 2020
qw4990
pushed a commit
that referenced
this pull request
Sep 21, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What problem does this PR solve?
Problem Summary: Replace error in tidb with standard error. parser pr is: pingcap/parser#982
What is changed and how it works?
Proposal: Standardize error codes and messages
What's Changed:
Change error message in test cases.
How it Works:
Error message changed after
terror.Errorhas been replaced witherrors.ErrorRelated changes
pingcap/docs/pingcap/docs-cn:Check List
Tests
Side effects
Release note
replace error code and message with standard error.