Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

expr: Refine decimal type infer #38175

Merged
merged 5 commits into from Sep 27, 2022
+9 −7
Merged

expr: Refine decimal type infer #38175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
86b8934
refine decimal type infer
windtalker Sep 26, 2022
9d0ee12
update test reference
windtalker Sep 26, 2022
d818431
update test reference
windtalker Sep 26, 2022
4fae2bf
address comments
windtalker Sep 27, 2022
2056914
Merge branch 'master' into refine_decimal_type_infer
ti-chi-bot Sep 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions expression/builtin_arithmetic.go
View file
Open in desktop
Expand Up @@ -117,11 +117,13 @@ func setFlenDecimal4RealOrDecimal(ctx sessionctx.Context, retTp *types.FieldType
retTp.SetFlen(types.UnspecifiedLength)
return
}
digitsInt := mathutil.Max(a.GetFlen()-a.GetDecimal(), b.GetFlen()-b.GetDecimal())
if isMultiply {
hawkingrei marked this conversation as resolved.
Show resolved Hide resolved
digitsInt = a.GetFlen() - a.GetDecimal() + b.GetFlen() - b.GetDecimal()
digitsInt := a.GetFlen() - a.GetDecimal() + b.GetFlen() - b.GetDecimal()
retTp.SetFlenUnderLimit(digitsInt + retTp.GetDecimal())
} else {
digitsInt := mathutil.Max(a.GetFlen()-a.GetDecimal(), b.GetFlen()-b.GetDecimal())
retTp.SetFlenUnderLimit(digitsInt + retTp.GetDecimal() + 1)
}
retTp.SetFlenUnderLimit(digitsInt + retTp.GetDecimal() + 1)
if isReal {
retTp.SetFlen(mathutil.Min(retTp.GetFlen(), mysql.MaxRealWidth))
return
Expand Down
2 changes: 1 addition & 1 deletion expression/builtin_arithmetic_test.go
View file
Open in desktop
Expand Up @@ -71,7 +71,7 @@ func TestSetFlenDecimal4RealOrDecimal(t *testing.T) {

setFlenDecimal4RealOrDecimal(mock.NewContext(), ret, &Constant{RetType: a}, &Constant{RetType: b}, true, true)
require.Equal(t, 1, ret.GetDecimal())
require.Equal(t, 6, ret.GetFlen())
require.Equal(t, 5, ret.GetFlen())

b.SetFlen(65)
setFlenDecimal4RealOrDecimal(mock.NewContext(), ret, &Constant{RetType: a}, &Constant{RetType: b}, true, true)
Expand Down
6 changes: 3 additions & 3 deletions expression/typeinfer_test.go
View file
Open in desktop
Expand Up @@ -742,9 +742,9 @@ func (s *InferTypeSuite) createTestCase4ArithmeticFuncs() []typeInferTestCase {
{"c_int_d * c_char", mysql.TypeDouble, charset.CharsetBin, mysql.BinaryFlag, types.UnspecifiedLength, types.UnspecifiedLength},
{"c_int_d * c_time_d", mysql.TypeLonglong, charset.CharsetBin, mysql.BinaryFlag, mysql.MaxIntWidth, 0},
{"c_int_d * c_double_d", mysql.TypeDouble, charset.CharsetBin, mysql.BinaryFlag, types.UnspecifiedLength, types.UnspecifiedLength},
{"c_int_d * c_decimal", mysql.TypeNewDecimal, charset.CharsetBin, mysql.BinaryFlag, 17, 3},
{"c_datetime * c_decimal", mysql.TypeNewDecimal, charset.CharsetBin, mysql.BinaryFlag, 29, 5},
{"c_bigint_d * c_decimal", mysql.TypeNewDecimal, charset.CharsetBin, mysql.BinaryFlag, 27, 3},
{"c_int_d * c_decimal", mysql.TypeNewDecimal, charset.CharsetBin, mysql.BinaryFlag, 16, 3},
{"c_datetime * c_decimal", mysql.TypeNewDecimal, charset.CharsetBin, mysql.BinaryFlag, 28, 5},
{"c_bigint_d * c_decimal", mysql.TypeNewDecimal, charset.CharsetBin, mysql.BinaryFlag, 26, 3},
{"c_double_d * c_decimal", mysql.TypeDouble, charset.CharsetBin, mysql.BinaryFlag, types.UnspecifiedLength, types.UnspecifiedLength},
{"c_double_d * c_char", mysql.TypeDouble, charset.CharsetBin, mysql.BinaryFlag, types.UnspecifiedLength, types.UnspecifiedLength},
{"c_double_d * c_enum", mysql.TypeDouble, charset.CharsetBin, mysql.BinaryFlag, types.UnspecifiedLength, types.UnspecifiedLength},
Expand Down