*: remove FromID from expression.Column
#7157
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
|
/run-all-tests |
|
/run-integration-ddl-test |
|
/run-sqllogic-test |
alivxxx
reviewed
Jul 26, 2018
plan/rule_aggregation_push_down.go
Outdated
| @@ -169,14 +169,13 @@ func (a *aggregationOptimizer) checkValidJoin(join *LogicalJoin) bool { | |||
|
|
|||
| // decompose splits an aggregate function to two parts: a final mode function and a partial mode function. Currently | |||
| // there are no differences between partial mode and complete mode, so we can confuse them. | |||
| func (a *aggregationOptimizer) decompose(aggFunc *aggregation.AggFuncDesc, schema *expression.Schema, id int) ([]*aggregation.AggFuncDesc, *expression.Schema) { | |||
| func (a *aggregationOptimizer) decompose(ctx sessionctx.Context, aggFunc *aggregation.AggFuncDesc, schema *expression.Schema, id int) ([]*aggregation.AggFuncDesc, *expression.Schema) { | |||
expression/distsql_builtin_test.go
Outdated
| return s.colID | ||
| } | ||
|
|
||
| // generateSchema will generate a schema for test. Used only in this file. |
There was a problem hiding this comment.
Actually, it is only used in schema_test.go.
plan/find_best_task.go
Outdated
| @@ -337,6 +337,14 @@ func (ds *DataSource) convertToIndexScan(prop *requiredProp, path *accessPath) ( | |||
| } | |||
| rowCount := path.countAfterAccess | |||
| cop := &copTask{indexPlan: is} | |||
| names1 := make([]string, 0, len(is.Columns)) | |||
| names2 := make([]string, 0, len(is.Index.Columns)) | |||
|
/run-sqllogic-test |
|
/run-all-tests |
|
@winoros please address the comments. |
XuHuaiyu
reviewed
Jul 26, 2018
| // Position means the position of this column that appears in the select fields. | ||
| // e.g. SELECT name as id , 1 - id as id , 1 + name as id, name as id from src having id = 1; | ||
| // There are four ids in the same schema, so you can't identify the column through the FromID and ColName. | ||
| // Position is the unique id of this column. |
There was a problem hiding this comment.
We may need to comment for the difference between ID and Position.
There was a problem hiding this comment.
This will be done is the future, not this pr.
| // FindColumnByName finds a column by its name. | ||
| func (s *Schema) FindColumnByName(name string) *Column { | ||
| for _, col := range s.Columns { | ||
| if col.ColName.L == name { |
There was a problem hiding this comment.
Should we take the DBName and TableName into consideration?
There was a problem hiding this comment.
No, this is only used for datasource which only have one table.
winoros
commented
Jul 26, 2018
| // Position means the position of this column that appears in the select fields. | ||
| // e.g. SELECT name as id , 1 - id as id , 1 + name as id, name as id from src having id = 1; | ||
| // There are four ids in the same schema, so you can't identify the column through the FromID and ColName. | ||
| // Position is the unique id of this column. | ||
| Position int |
There was a problem hiding this comment.
I'll rename it to UniqueID or something after this pr.
I'll examine whether the ID of Column can be removed.
|
@XuHuaiyu @lamxTyler PTAL |
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 have you changed? (mandatory)
Remove the
FromIDfromexpression.Column.What is the type of the changes? (mandatory)
How has this PR been tested? (mandatory)
existing test.