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.

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 issue that TimeIsNull is not compatible with MySQL #10753

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 22 additions & 2 deletions expression/builtin_op.go
Original file line number Diff line number Diff line change
Expand Up @@ -799,8 +799,13 @@ func (c *isNullFunctionClass) getFunction(ctx sessionctx.Context, args []Express
sig = &builtinRealIsNullSig{bf}
sig.setPbCode(tipb.ScalarFuncSig_RealIsNull)
case types.ETDatetime:
sig = &builtinTimeIsNullSig{bf}
sig.setPbCode(tipb.ScalarFuncSig_TimeIsNull)
if mysql.HasNotNullFlag(args[0].GetType().Flag) {
sig = &builtinTimeIsNullSigOnNotNullCol{bf}
sig.setPbCode(tipb.ScalarFuncSig_TimeIsNullOnNotNullCol)
} else {
sig = &builtinTimeIsNullSig{bf}
sig.setPbCode(tipb.ScalarFuncSig_TimeIsNull)
}
case types.ETDuration:
sig = &builtinDurationIsNullSig{bf}
sig.setPbCode(tipb.ScalarFuncSig_DurationIsNull)
Expand Down Expand Up @@ -912,3 +917,18 @@ func (b *builtinTimeIsNullSig) evalInt(row chunk.Row) (int64, bool, error) {
_, isNull, err := b.args[0].EvalTime(b.ctx, row)
return evalIsNull(isNull, err)
}

type builtinTimeIsNullSigOnNotNullCol struct {
baseBuiltinFunc
}

func (b *builtinTimeIsNullSigOnNotNullCol) Clone() builtinFunc {
newSig := &builtinTimeIsNullSig{}
newSig.cloneFrom(&b.baseBuiltinFunc)
return newSig
}

func (b *builtinTimeIsNullSigOnNotNullCol) evalInt(row chunk.Row) (int64, bool, error) {
t, isNull, err := b.args[0].EvalTime(b.ctx, row)
return evalIsNull(isNull || t.IsZero(), err)
}
2 changes: 2 additions & 0 deletions expression/distsql_builtin.go
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,8 @@ func getSignatureByPB(ctx sessionctx.Context, sigCode tipb.ScalarFuncSig, tp *ti
f = &builtinRealIsNullSig{base}
case tipb.ScalarFuncSig_TimeIsNull:
f = &builtinTimeIsNullSig{base}
case tipb.ScalarFuncSig_TimeIsNullOnNotNullCol:
f = &builtinTimeIsNullSigOnNotNullCol{base}
case tipb.ScalarFuncSig_StringIsNull:
f = &builtinStringIsNullSig{base}
case tipb.ScalarFuncSig_IntIsNull:
Expand Down
25 changes: 25 additions & 0 deletions expression/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4398,3 +4398,28 @@ func (s *testIntegrationSuite) TestIssue10181(c *C) {
tk.MustExec(`insert into t values(9223372036854775807), (18446744073709551615)`)
tk.MustQuery(`select * from t where a > 9223372036854775807-0.5 order by a`).Check(testkit.Rows(`9223372036854775807`, `18446744073709551615`))
}

func (s *testIntegrationSuite) TestIssue9763(c *C) {
tk := testkit.NewTestKit(c, s.store)
tk.MustExec("use test")

tk.MustExec(`drop table if exists t1;`)
tk.MustExec(`CREATE TABLE t1 (a datetime not null);`)
tk.MustExec(`insert ignore into t1 values (0);`)
tk.MustQuery(`select * from t1 where a is null;`).Check(testkit.Rows(`0000-00-00 00:00:00`))

tk.MustExec(`drop table if exists t2;`)
tk.MustExec(`CREATE TABLE t2 (a date not null);`)
tk.MustExec(`insert ignore into t2 values (0);`)
tk.MustQuery(`select * from t2 where a is null;`).Check(testkit.Rows(`0000-00-00`))

tk.MustExec(`drop table if exists t3;`)
tk.MustExec(`CREATE TABLE t3 (a datetime);`)
tk.MustExec(`insert ignore into t3 values (0);`)
c.Assert(len(tk.MustQuery(`select * from t3 where a is null;`).Rows()), Equals, 0)

tk.MustExec(`drop table if exists t4;`)
tk.MustExec(`CREATE TABLE t4 (a date);`)
tk.MustExec(`insert ignore into t4 values (0);`)
c.Assert(len(tk.MustQuery(`select * from t4 where a is null;`).Rows()), Equals, 0)
}