*: Fix add index after add column with default value #3510
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
|
@zimulala CI failed. |
shenli
reviewed
Jun 19, 2017
table/tables/tables.go
Outdated
| @@ -673,6 +661,27 @@ func (t *Table) IterRecords(ctx context.Context, startKey kv.Key, cols []*table. | |||
| return nil | |||
| } | |||
|
|
|||
| func GetColDefaultValue(ctx context.Context, col *table.Column, defaultVals []types.Datum) ( | |||
table/tables/tables.go
Outdated
| if mysql.HasNotNullFlag(col.Flag) { | ||
| return nil, errors.New("Miss column") | ||
| } | ||
| v[i], err = GetColDefaultValue(ctx, col, defaultVals) |
There was a problem hiding this comment.
Should we move this before line 479?
ddl/index.go
Outdated
| } | ||
| idxColumnVal, ret.err = tables.GetColDefaultValue(ctx, col, defaultVals) | ||
| if ret.err != nil { | ||
| ret.err = errors.Trace(err) |
hanfei1991
reviewed
Jun 19, 2017
table/tables/tables.go
Outdated
| @@ -673,6 +661,27 @@ func (t *Table) IterRecords(ctx context.Context, startKey kv.Key, cols []*table. | |||
| return nil | |||
| } | |||
|
|
|||
| func GetColDefaultValue(ctx context.Context, col *table.Column, defaultVals []types.Datum) ( | |||
There was a problem hiding this comment.
I think you can implement a GetAllColDefaultValues to return default values for every column at one time. Passing a slice every time is a little strange.
There was a problem hiding this comment.
If implement a GetAllColDefaultValues, it will be an interface and its arguments are hard to understand. I tried and thought it was not very good. @hanfei1991
|
PTAL @shenli @hanfei1991 |
|
LGTM |
|
LGTM |
shenli
approved these changes
Jun 20, 2017
ngaut
added
type/bugfix
zimulala
added a commit
that referenced
this pull request
Jun 20, 2017
Conflicts: table/tables/tables.go
zimulala
added a commit
that referenced
this pull request
Jun 20, 2017
Conflicts: table/tables/tables.go
zimulala
added a commit
that referenced
this pull request
Jun 20, 2017
zimulala
added a commit
that referenced
this pull request
Jun 20, 2017
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.
No description provided.