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

expression: fix wrong behavior for IF(not_int, *, *) #15016

Merged
merged 6 commits into from
Mar 13, 2020
Merged

expression: fix wrong behavior for IF(not_int, *, *) #15016

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c8ad4d0
expression: fix wrong behavior for IF(real, *, *)
lance6716 Feb 29, 2020
fafb530
expression: try to keep ast
lance6716 Feb 29, 2020
ccdc6f7
fix comment
lance6716 Mar 3, 2020
893c367
revert to EvalInt
lance6716 Mar 3, 2020
02a9e25
try wrapWithIsTrue
lance6716 Mar 3, 2020
f4fae77
Merge branch 'master' into fix11601
sre-bot Mar 13, 2020
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
Prev Previous commit
Next Next commit
revert to EvalInt
  • Loading branch information
@lance6716
lance6716 committed Mar 3, 2020
commit 893c367b9226c768de5babb9753f755a562acc89
38 changes: 15 additions & 23 deletions expression/builtin_control.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"github.com/pingcap/tidb/types/json"
"github.com/pingcap/tidb/util/chunk"
"github.com/pingcap/tipb/go-tipb"
"math"
)

var (
Expand Down Expand Up @@ -519,13 +518,12 @@ func (b *builtinIfIntSig) Clone() builtinFunc {
}

func (b *builtinIfIntSig) evalInt(row chunk.Row) (ret int64, isNull bool, err error) {
arg0, isNull0, err := b.args[0].EvalReal(b.ctx, row)
arg0, isNull0, err := b.args[0].EvalInt(b.ctx, row)
if err != nil {
return 0, true, err
}
isPositiveZero := arg0 == 0 && !math.Signbit(arg0)
arg1, isNull1, err := b.args[1].EvalInt(b.ctx, row)
if (!isNull0 && !isPositiveZero) || err != nil {
if (!isNull0 && arg0 != 0) || err != nil {
return arg1, isNull1, err
}
arg2, isNull2, err := b.args[2].EvalInt(b.ctx, row)
Expand All @@ -543,13 +541,12 @@ func (b *builtinIfRealSig) Clone() builtinFunc {
}

func (b *builtinIfRealSig) evalReal(row chunk.Row) (ret float64, isNull bool, err error) {
arg0, isNull0, err := b.args[0].EvalReal(b.ctx, row)
arg0, isNull0, err := b.args[0].EvalInt(b.ctx, row)
if err != nil {
return 0, true, err
}
isPositiveZero := arg0 == 0 && !math.Signbit(arg0)
arg1, isNull1, err := b.args[1].EvalReal(b.ctx, row)
if (!isNull0 && !isPositiveZero) || err != nil {
if (!isNull0 && arg0 != 0) || err != nil {
return arg1, isNull1, err
}
arg2, isNull2, err := b.args[2].EvalReal(b.ctx, row)
Expand All @@ -567,13 +564,12 @@ func (b *builtinIfDecimalSig) Clone() builtinFunc {
}

func (b *builtinIfDecimalSig) evalDecimal(row chunk.Row) (ret *types.MyDecimal, isNull bool, err error) {
arg0, isNull0, err := b.args[0].EvalReal(b.ctx, row)
arg0, isNull0, err := b.args[0].EvalInt(b.ctx, row)
if err != nil {
return nil, true, err
}
isPositiveZero := arg0 == 0 && !math.Signbit(arg0)
arg1, isNull1, err := b.args[1].EvalDecimal(b.ctx, row)
if (!isNull0 && !isPositiveZero) || err != nil {
if (!isNull0 && arg0 != 0) || err != nil {
return arg1, isNull1, err
}
arg2, isNull2, err := b.args[2].EvalDecimal(b.ctx, row)
Expand All @@ -591,13 +587,12 @@ func (b *builtinIfStringSig) Clone() builtinFunc {
}

func (b *builtinIfStringSig) evalString(row chunk.Row) (ret string, isNull bool, err error) {
arg0, isNull0, err := b.args[0].EvalReal(b.ctx, row)
arg0, isNull0, err := b.args[0].EvalInt(b.ctx, row)
if err != nil {
return "", true, err
}
isPositiveZero := arg0 == 0 && !math.Signbit(arg0)
arg1, isNull1, err := b.args[1].EvalString(b.ctx, row)
if (!isNull0 && !isPositiveZero) || err != nil {
if (!isNull0 && arg0 != 0) || err != nil {
return arg1, isNull1, err
}
arg2, isNull2, err := b.args[2].EvalString(b.ctx, row)
Expand All @@ -615,13 +610,12 @@ func (b *builtinIfTimeSig) Clone() builtinFunc {
}

func (b *builtinIfTimeSig) evalTime(row chunk.Row) (ret types.Time, isNull bool, err error) {
arg0, isNull0, err := b.args[0].EvalReal(b.ctx, row)
arg0, isNull0, err := b.args[0].EvalInt(b.ctx, row)
if err != nil {
return ret, true, err
}
isPositiveZero := arg0 == 0 && !math.Signbit(arg0)
arg1, isNull1, err := b.args[1].EvalTime(b.ctx, row)
if (!isNull0 && !isPositiveZero) || err != nil {
if (!isNull0 && arg0 != 0) || err != nil {
return arg1, isNull1, err
}
arg2, isNull2, err := b.args[2].EvalTime(b.ctx, row)
Expand All @@ -639,13 +633,12 @@ func (b *builtinIfDurationSig) Clone() builtinFunc {
}

func (b *builtinIfDurationSig) evalDuration(row chunk.Row) (ret types.Duration, isNull bool, err error) {
arg0, isNull0, err := b.args[0].EvalReal(b.ctx, row)
arg0, isNull0, err := b.args[0].EvalInt(b.ctx, row)
if err != nil {
return ret, true, err
}
isPositiveZero := arg0 == 0 && !math.Signbit(arg0)
arg1, isNull1, err := b.args[1].EvalDuration(b.ctx, row)
if (!isNull0 && !isPositiveZero) || err != nil {
if (!isNull0 && arg0 != 0) || err != nil {
return arg1, isNull1, err
}
arg2, isNull2, err := b.args[2].EvalDuration(b.ctx, row)
Expand All @@ -663,11 +656,10 @@ func (b *builtinIfJSONSig) Clone() builtinFunc {
}

func (b *builtinIfJSONSig) evalJSON(row chunk.Row) (ret json.BinaryJSON, isNull bool, err error) {
arg0, isNull0, err := b.args[0].EvalReal(b.ctx, row)
arg0, isNull0, err := b.args[0].EvalInt(b.ctx, row)
if err != nil {
return ret, true, err
}
isPositiveZero := arg0 == 0 && !math.Signbit(arg0)
arg1, isNull1, err := b.args[1].EvalJSON(b.ctx, row)
if err != nil {
return ret, true, err
Expand All @@ -677,9 +669,9 @@ func (b *builtinIfJSONSig) evalJSON(row chunk.Row) (ret json.BinaryJSON, isNull
return ret, true, err
}
switch {
case isNull0 || isPositiveZero:
case isNull0 || arg0 == 0:
ret, isNull = arg2, isNull2
case !isPositiveZero:
case arg0 != 0:
ret, isNull = arg1, isNull1
}
return
Expand Down
5 changes: 0 additions & 5 deletions expression/builtin_control_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,6 @@ func (s *testEvaluatorSuite) TestIf(c *C) {
defer func() {
stmtCtx.IgnoreTruncate = origin
}()

var notZeroIntValue uint64
// EvalReal will handle it as float64 -0, this particular input should be same with any non-zero int as expected.
notZeroIntValue = 0x8000000000000000
tbl := []struct {
Arg1 interface{}
Arg2 interface{}
Expand All @@ -86,7 +82,6 @@ func (s *testEvaluatorSuite) TestIf(c *C) {
{types.NewDecFromStringForTest("0.0"), 1, 2, 2},
{"0.1", 1, 2, 1},
{"0.0", 1, 2, 2},
{notZeroIntValue, 1, 2, 1},
}

fc := funcs[ast.If]
Expand Down