*: fix the problem that PointGet returns wrong results in the case of overflow #14776
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,6 +19,7 @@ import ( | |
|
|
||
| "github.com/pingcap/errors" | ||
| "github.com/pingcap/parser/ast" | ||
| "github.com/pingcap/parser/charset" | ||
| "github.com/pingcap/parser/model" | ||
| "github.com/pingcap/parser/mysql" | ||
| "github.com/pingcap/parser/opcode" | ||
|
|
@@ -652,6 +653,9 @@ func tryPointGetPlan(ctx sessionctx.Context, selStmt *ast.SelectStmt) *PointGetP | |
| return nil | ||
| } | ||
| pi := tbl.GetPartitionInfo() | ||
| if pi != nil && pi.Type != model.PartitionTypeHash { | ||
| return nil | ||
| } | ||
| for _, col := range tbl.Columns { | ||
| // Do not handle generated columns. | ||
| if col.IsGenerated() { | ||
|
|
@@ -662,53 +666,40 @@ func tryPointGetPlan(ctx sessionctx.Context, selStmt *ast.SelectStmt) *PointGetP | |
| return nil | ||
| } | ||
| } | ||
| schema, names := buildSchemaFromFields(tblName.Schema, tbl, tblAlias, selStmt.Fields.Fields) | ||
| if schema == nil { | ||
| return nil | ||
| } | ||
| dbName := tblName.Schema.L | ||
| if dbName == "" { | ||
| dbName = ctx.GetSessionVars().CurrentDB | ||
| } | ||
|
|
||
| pairs := make([]nameValuePair, 0, 4) | ||
| pairs, isTableDual := getNameValuePairs(ctx.GetSessionVars().StmtCtx, tbl, tblAlias, pairs, selStmt.Where) | ||
| if pairs == nil && !isTableDual { | ||
| return nil | ||
| } | ||
|
|
||
| var partitionInfo *model.PartitionDefinition | ||
| var pos int | ||
| if pi != nil { | ||
| partitionInfo, pos = getPartitionInfo(ctx, tbl, pairs) | ||
| if partitionInfo == nil { | ||
| return nil | ||
| } | ||
| } | ||
|
|
||
| handlePair, fieldType := findPKHandle(tbl, pairs) | ||
| if handlePair.value.Kind() != types.KindNull && len(pairs) == 1 { | ||
| if isTableDual { | ||
| p := newPointGetPlan(ctx, tblName.Schema.O, schema, tbl, names) | ||
| p.IsTableDual = true | ||
| return p | ||
| } | ||
|
|
||
| p := newPointGetPlan(ctx, dbName, schema, tbl, names) | ||
| p.Handle = handlePair.value.GetInt64() | ||
| p.UnsignedHandle = mysql.HasUnsignedFlag(fieldType.Flag) | ||
| p.HandleParam = handlePair.param | ||
| p.PartitionInfo = partitionInfo | ||
|
|
@@ -722,18 +713,16 @@ func tryPointGetPlan(ctx sessionctx.Context, selStmt *ast.SelectStmt) *PointGetP | |
| if idxInfo.State != model.StatePublic { | ||
| continue | ||
| } | ||
| if isTableDual { | ||
| p := newPointGetPlan(ctx, tblName.Schema.O, schema, tbl, names) | ||
| p.IsTableDual = true | ||
| return p | ||
| } | ||
|
|
||
| idxValues, idxValueParams := getIndexValues(idxInfo, pairs) | ||
| if idxValues == nil { | ||
| continue | ||
| } | ||
| p := newPointGetPlan(ctx, dbName, schema, tbl, names) | ||
| p.IndexInfo = idxInfo | ||
| p.IndexValues = idxValues | ||
|
|
@@ -864,21 +853,22 @@ func getSingleTableNameAndAlias(tableRefs *ast.TableRefsClause) (tblName *ast.Ta | |
| } | ||
|
|
||
| // getNameValuePairs extracts `column = constant/paramMarker` conditions from expr as name value pairs. | ||
| func getNameValuePairs(stmtCtx *stmtctx.StatementContext, tbl *model.TableInfo, tblName model.CIStr, nvPairs []nameValuePair, expr ast.ExprNode) ( | ||
| pairs []nameValuePair, isTableDual bool) { | ||
| binOp, ok := expr.(*ast.BinaryOperationExpr) | ||
| if !ok { | ||
| return nil, false | ||
| } | ||
| if binOp.Op == opcode.LogicAnd { | ||
| nvPairs, isTableDual = getNameValuePairs(stmtCtx, tbl, tblName, nvPairs, binOp.L) | ||
| if nvPairs == nil || isTableDual { | ||
| return nil, isTableDual | ||
| } | ||
| nvPairs, isTableDual = getNameValuePairs(stmtCtx, tbl, tblName, nvPairs, binOp.R) | ||
| if nvPairs == nil || isTableDual { | ||
| return nil, isTableDual | ||
| } | ||
| return nvPairs, isTableDual | ||
| } else if binOp.Op == opcode.EQ { | ||
| var d types.Datum | ||
| var colName *ast.ColumnNameExpr | ||
|
|
@@ -901,17 +891,45 @@ func getNameValuePairs(nvPairs []nameValuePair, tblName model.CIStr, expr ast.Ex | |
| param = x | ||
| } | ||
| } else { | ||
| return nil, false | ||
| } | ||
| if d.IsNull() { | ||
| return nil, false | ||
| } | ||
| // Views' columns have no FieldType. | ||
| if tbl.IsView() { | ||
| return nil, false | ||
| } | ||
| if colName.Name.Table.L != "" && colName.Name.Table.L != tblName.L { | ||
| return nil, false | ||
| } | ||
| col := model.FindColumnInfo(tbl.Cols(), colName.Name.Name.L) | ||
| if col == nil || // Handling the case when the column is _tidb_rowid. | ||
| (col.Tp == mysql.TypeString && col.Collate == charset.CollationBin) { // This type we needn't to pad `\0` in here. | ||
|
There was a problem hiding this comment. Any test case for that? I don't know this is used for what. There was a problem hiding this comment. Yes. These tests already exist. The test case for the table of |
||
| return append(nvPairs, nameValuePair{colName: colName.Name.Name.L, value: d, param: param}), false | ||
| } | ||
| dVal, err := d.ConvertTo(stmtCtx, &col.FieldType) | ||
| if err != nil { | ||
| if terror.ErrorEqual(types.ErrOverflow, err) { | ||
| return append(nvPairs, nameValuePair{colName: colName.Name.Name.L, value: d, param: param}), true | ||
| } | ||
| // Some scenarios cast to int with error, but we may use this value in point get. | ||
| if !terror.ErrorEqual(types.ErrTruncatedWrongVal, err) { | ||
| return nil, false | ||
| } | ||
| } | ||
| // The converted result must be same as original datum. | ||
| cmp, err := d.CompareDatum(stmtCtx, &dVal) | ||
| if err != nil { | ||
| return nil, false | ||
| } else if cmp != 0 { | ||
| // return nil, true | ||
zimulala marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return append(nvPairs, nameValuePair{colName: colName.Name.Name.L, value: dVal, param: param}), true | ||
| } | ||
|
|
||
| return append(nvPairs, nameValuePair{colName: colName.Name.Name.L, value: dVal, param: param}), false | ||
| } | ||
| return nil, false | ||
| } | ||
|
|
||
| func findPKHandle(tblInfo *model.TableInfo, pairs []nameValuePair) (handlePair nameValuePair, fieldType *types.FieldType) { | ||
|
|
||
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add a comment why partitions rather than
HashPartitionare not supported.PS: It is actually not related to this PR, right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, it's the original code, I only move it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now, we only support for
HashPartition.