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 function 'binSearch' in builtinIntervalRealSig not return error (#12957) #13768

Merged
merged 5 commits into from
Dec 2, 2019
Merged

expression : fix function 'binSearch' in builtinIntervalRealSig not return error (#12957) #13768

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
e3adb8a
fix : fix func binSearch not return error
gtygo Oct 28, 2019
2a3da0f
add a test case for catch error
gtygo Nov 11, 2019
88abea0
update
gtygo Nov 15, 2019
fa00b44
Merge branch 'release-2.1' into release-2.1-f996816eb74c
ngaut Nov 27, 2019
e2c0f63
Merge branch 'release-2.1' into release-2.1-f996816eb74c
zz-jason Nov 28, 2019
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
2 changes: 1 addition & 1 deletion expression/builtin_compare.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,7 +934,7 @@ func (b *builtinIntervalRealSig) binSearch(target float64, args []Expression, ro
for i < j {
mid := i + (j-i)/2
v, isNull, err1 := args[mid].EvalReal(b.ctx, row)
if err != nil {
if err1 != nil {
err = err1
break
}
Expand Down
48 changes: 28 additions & 20 deletions expression/builtin_compare_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,33 +219,41 @@ func (s *testEvaluatorSuite) TestIntervalFunc(c *C) {
}()

for _, t := range []struct {
args []types.Datum
ret int64
args []types.Datum
ret int64
getErr bool
}{
{types.MakeDatums(nil, 1, 2), -1},
{types.MakeDatums(1, 2, 3), 0},
{types.MakeDatums(2, 1, 3), 1},
{types.MakeDatums(3, 1, 2), 2},
{types.MakeDatums(0, "b", "1", "2"), 1},
{types.MakeDatums("a", "b", "1", "2"), 1},
{types.MakeDatums(23, 1, 23, 23, 23, 30, 44, 200), 4},
{types.MakeDatums(23, 1.7, 15.3, 23.1, 30, 44, 200), 2},
{types.MakeDatums(9007199254740992, 9007199254740993), 0},
{types.MakeDatums(uint64(9223372036854775808), uint64(9223372036854775809)), 0},
{types.MakeDatums(9223372036854775807, uint64(9223372036854775808)), 0},
{types.MakeDatums(-9223372036854775807, uint64(9223372036854775808)), 0},
{types.MakeDatums(uint64(9223372036854775806), 9223372036854775807), 0},
{types.MakeDatums(uint64(9223372036854775806), -9223372036854775807), 1},
{types.MakeDatums("9007199254740991", "9007199254740992"), 0},
{types.MakeDatums(nil, 1, 2), -1, false},
{types.MakeDatums(1, 2, 3), 0, false},
{types.MakeDatums(2, 1, 3), 1, false},
{types.MakeDatums(3, 1, 2), 2, false},
{types.MakeDatums(0, "b", "1", "2"), 1, false},
{types.MakeDatums("a", "b", "1", "2"), 1, false},
{types.MakeDatums(23, 1, 23, 23, 23, 30, 44, 200), 4, false},
{types.MakeDatums(23, 1.7, 15.3, 23.1, 30, 44, 200), 2, false},
{types.MakeDatums(9007199254740992, 9007199254740993), 0, false},
{types.MakeDatums(uint64(9223372036854775808), uint64(9223372036854775809)), 0, false},
{types.MakeDatums(9223372036854775807, uint64(9223372036854775808)), 0, false},
{types.MakeDatums(-9223372036854775807, uint64(9223372036854775808)), 0, false},
{types.MakeDatums(uint64(9223372036854775806), 9223372036854775807), 0, false},
{types.MakeDatums(uint64(9223372036854775806), -9223372036854775807), 1, false},
{types.MakeDatums("9007199254740991", "9007199254740992"), 0, false},
{types.MakeDatums(1, uint32(1), uint32(1)), 0, true},

// tests for appropriate precision loss
{types.MakeDatums(9007199254740992, "9007199254740993"), 1},
{types.MakeDatums("9007199254740992", 9007199254740993), 1},
{types.MakeDatums("9007199254740992", "9007199254740993"), 1},
{types.MakeDatums(9007199254740992, "9007199254740993"), 1, false},
{types.MakeDatums("9007199254740992", 9007199254740993), 1, false},
{types.MakeDatums("9007199254740992", "9007199254740993"), 1, false},
} {
fc := funcs[ast.Interval]
f, err := fc.getFunction(s.ctx, s.datumsToConstants(t.args))
c.Assert(err, IsNil)
if t.getErr {
v, err := evalBuiltinFunc(f, chunk.Row{})
c.Assert(err, NotNil)
c.Assert(v.GetInt64(), Equals, t.ret)
continue
}
v, err := evalBuiltinFunc(f, chunk.Row{})
c.Assert(err, IsNil)
c.Assert(v.GetInt64(), Equals, t.ret)
Expand Down