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

expression: fix out of range error for intdiv #7492

Merged
merged 5 commits into from
Aug 28, 2018
Merged

expression: fix out of range error for intdiv #7492

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7159493
expression: fix out of range error for intdiv
mccxj Aug 26, 2018
46d7ca6
make code clear
mccxj Aug 26, 2018
12f79c9
move useless code
mccxj Aug 27, 2018
ae91494
Merge branch 'master' into intdiv
mccxj Aug 27, 2018
f9e7802
Merge branch 'master' into intdiv
jackysp Aug 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 25 additions & 11 deletions expression/builtin_arithmetic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,27 +729,41 @@ func (s *builtinArithmeticIntDivideIntSig) evalInt(row chunk.Row) (int64, bool,
return ret, err != nil, errors.Trace(err)
}

func (s *builtinArithmeticIntDivideDecimalSig) evalInt(row chunk.Row) (int64, bool, error) {
a, isNull, err := s.args[0].EvalDecimal(s.ctx, row)
if isNull || err != nil {
return 0, isNull, errors.Trace(err)
}

b, isNull, err := s.args[1].EvalDecimal(s.ctx, row)
if isNull || err != nil {
return 0, isNull, errors.Trace(err)
func (s *builtinArithmeticIntDivideDecimalSig) evalInt(row chunk.Row) (ret int64, isNull bool, err error) {
sc := s.ctx.GetSessionVars().StmtCtx
var num [2]*types.MyDecimal
for i, arg := range s.args[0:2] {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we return an error if len(args) is not 2?

Copy link
Member

@zz-jason zz-jason Aug 27, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

argument validation should not be done in this phase.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So use s.args is also safe here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh， I forgot it. use s.args is enough.

num[i], isNull, err = arg.EvalDecimal(s.ctx, row)
// Its behavior is consistent with MySQL.
if terror.ErrorEqual(err, types.ErrTruncated) {
err = nil
}
if terror.ErrorEqual(err, types.ErrOverflow) {
newErr := errTruncatedWrongValue.GenByArgs("DECIMAL", arg)
err = sc.HandleOverflow(newErr, newErr)
}
if isNull || err != nil {
return 0, isNull, errors.Trace(err)
}
}

c := &types.MyDecimal{}
err = types.DecimalDiv(a, b, c, types.DivFracIncr)
err = types.DecimalDiv(num[0], num[1], c, types.DivFracIncr)
if err == types.ErrDivByZero {
return 0, true, errors.Trace(handleDivisionByZeroError(s.ctx))
}
if err == types.ErrTruncated {
err = sc.HandleTruncate(errTruncatedWrongValue.GenByArgs("DECIMAL", c))
}
if err == types.ErrOverflow {
newErr := errTruncatedWrongValue.GenByArgs("DECIMAL", c)
err = sc.HandleOverflow(newErr, newErr)
}
if err != nil {
return 0, true, errors.Trace(err)
}

ret, err := c.ToInt()
ret, err = c.ToInt()
// err returned by ToInt may be ErrTruncated or ErrOverflow, only handle ErrOverflow, ignore ErrTruncated.
if err == types.ErrOverflow {
return 0, true, types.ErrOverflow.GenByArgs("BIGINT", fmt.Sprintf("(%s DIV %s)", s.args[0].String(), s.args[1].String()))
Expand Down
2 changes: 2 additions & 0 deletions expression/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ var (
errDeprecatedSyntaxNoReplacement = terror.ClassExpression.New(mysql.ErrWarnDeprecatedSyntaxNoReplacement, mysql.MySQLErrName[mysql.ErrWarnDeprecatedSyntaxNoReplacement])
errBadField = terror.ClassExpression.New(mysql.ErrBadField, mysql.MySQLErrName[mysql.ErrBadField])
errWarnAllowedPacketOverflowed = terror.ClassExpression.New(mysql.ErrWarnAllowedPacketOverflowed, mysql.MySQLErrName[mysql.ErrWarnAllowedPacketOverflowed])
errTruncatedWrongValue = terror.ClassExpression.New(mysql.ErrTruncatedWrongValue, mysql.MySQLErrName[mysql.ErrTruncatedWrongValue])
)

func init() {
Expand All @@ -53,6 +54,7 @@ func init() {
mysql.ErrOperandColumns: mysql.ErrOperandColumns,
mysql.ErrRegexp: mysql.ErrRegexp,
mysql.ErrWarnAllowedPacketOverflowed: mysql.ErrWarnAllowedPacketOverflowed,
mysql.ErrTruncatedWrongValue: mysql.ErrTruncatedWrongValue,
}
terror.ErrClassToMySQLCodes[terror.ClassExpression] = expressionMySQLErrCodes
}
Expand Down
7 changes: 7 additions & 0 deletions expression/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2515,6 +2515,13 @@ func (s *testIntegrationSuite) TestArithmeticBuiltin(c *C) {
result.Check(testkit.Rows("1 1300 -6 <nil> <nil> <nil>"))
result = tk.MustQuery("SELECT 2.4 div 1.1, 2.4 div 1.2, 2.4 div 1.3;")
result.Check(testkit.Rows("2 2 1"))
result = tk.MustQuery("SELECT 1.175494351E-37 div 1.7976931348623157E+308, 1.7976931348623157E+308 div -1.7976931348623157E+307, 1 div 1e-82;")
result.Check(testkit.Rows("0 -1 <nil>"))
tk.MustQuery("show warnings").Check(testutil.RowsWithSep("|",
"Warning|1292|Truncated incorrect DECIMAL value: 'cast(1.7976931348623157e+308)'",
"Warning|1292|Truncated incorrect DECIMAL value: 'cast(1.7976931348623157e+308)'",
"Warning|1292|Truncated incorrect DECIMAL value: 'cast(-1.7976931348623158e+307)'",
"Warning|1365|Division by 0"))
rs, err = tk.Exec("select 1e300 DIV 1.5")
c.Assert(err, IsNil)
_, err = session.GetRows4Test(ctx, tk.Se, rs)
Expand Down