txn: change check logic for column type change for amend #22150
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
cfzjywxk
requested review from
lysu,
coocood,
jackysp,
zyguan,
you06 and
MyonKeminta
cfzjywxk
changed the title
you06
reviewed
Jan 4, 2021
session/schema_amender.go
Outdated
| // is newly added or modified from an original column.Report error to solve the issue | ||
| // https://github.com/pingcap/tidb/issues/21470. This change will make amend fail for adding column | ||
| // and modifying columns at the same time. | ||
| return nil, errors.Trace(errors.Errorf("column=%v id=%v is not found for table=%v checking column modify", |
There was a problem hiding this comment.
Is it ok to make add-column amend fail?
There was a problem hiding this comment.
Single add-column will not fail, change type containing add column with modify/change column will.
There was a problem hiding this comment.
It seems that errors.Errorf will attach stack info, thus I think errors.Trace is unnecessary.
There was a problem hiding this comment.
Looks like the function's comment at L193 needs to be updated?
Closed
|
LGTM |
cfzjywxk
force-pushed
the
amend_with_col_type_change
branch
from
7cdfb07 to
2978a3d
Compare
cfzjywxk
force-pushed
the
amend_with_col_type_change
branch
from
2978a3d to
c8d1457
Compare
ti-srebot
added
status/LGT2
ti-srebot
approved these changes
Jan 6, 2021
|
/merge |
ti-srebot
added
the
status/can-merge
|
/run-all-tests |
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?
Issue Number: close #21470
Problem Summary:
On the 5.0 or the master branch, the change column ddl may NOT keep the original column id as in the release-4.0 branch, checking the modify colum action type in amend phase could not decide whether it's a newly added column or if this column type change is accepatable, so report error for such branches.
What is changed and how it works?
What's Changed:
Report error for checking modify colum action type if the column could not be found in early schema version though column type change is not GA release currently. This change will make the amend fail for ddl change with both adding column and modifying column.
How it Works:
Related changes
Check List
Tests
Side effects
Release note