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: split isTrue and isFalse expression sig (#16542) #16628

Merged
merged 5 commits into from
Apr 28, 2020
Merged

expression: split isTrue and isFalse expression sig (#16542) #16628

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e0779bb
cherry pick #16542 to release-3.1
Reminiscent Apr 20, 2020
c7b10a0
solve conflicts
Reminiscent Apr 26, 2020
e0f288d
Merge branch 'release-3.1' of https://github.com/pingcap/tidb into sr…
Reminiscent Apr 26, 2020
a1120a1
solve conflicts
Reminiscent Apr 26, 2020
87f804b
Merge branch 'release-3.1' into release-3.1-8b6d53a4a959
sre-bot Apr 28, 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
20 changes: 20 additions & 0 deletions executor/executor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4450,3 +4450,23 @@ func (s *testSuite1) TestIssue16025(c *C) {
tk.MustQuery("SELECT * FROM t0 WHERE c0;").Check(testkit.Rows())

}

func (s *testSuite1) TestIssue15718(c *C) {
tk := testkit.NewTestKit(c, s.store)
tk.MustExec("use test;")
tk.MustExec("drop table if exists tt;")
tk.MustExec("create table tt(a decimal(10, 0), b varchar(1), c time);")
tk.MustExec("insert into tt values(0, '2', null), (7, null, '1122'), (NULL, 'w', null), (NULL, '2', '3344'), (NULL, NULL, '0'), (7, 'f', '33');")
tk.MustQuery("select a and b as d, a or c as e from tt;").Check(testkit.Rows("0 <nil>", "<nil> 1", "0 <nil>", "<nil> 1", "<nil> <nil>", "0 1"))

tk.MustExec("drop table if exists tt;")
tk.MustExec("create table tt(a decimal(10, 0), b varchar(1), c time);")
tk.MustExec("insert into tt values(0, '2', '123'), (7, null, '1122'), (null, 'w', null);")
tk.MustQuery("select a and b as d, a, b from tt order by d limit 1;").Check(testkit.Rows("<nil> 7 <nil>"))
tk.MustQuery("select b or c as d, b, c from tt order by d limit 1;").Check(testkit.Rows("<nil> w <nil>"))

tk.MustExec("drop table if exists t0;")
tk.MustExec("CREATE TABLE t0(c0 FLOAT);")
tk.MustExec("INSERT INTO t0(c0) VALUES (NULL);")
tk.MustQuery("SELECT * FROM t0 WHERE NOT(0 OR t0.c0);").Check(testkit.Rows())
}
36 changes: 30 additions & 6 deletions expression/builtin_op.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,27 +425,51 @@ func (c *isTrueOrFalseFunctionClass) getFunction(ctx sessionctx.Context, args []
switch argTp {
case types.ETReal:
sig = &builtinRealIsTrueSig{bf, c.keepNull}
sig.setPbCode(tipb.ScalarFuncSig_RealIsTrue)
if c.keepNull {
sig.setPbCode(tipb.ScalarFuncSig_RealIsTrueWithNull)
} else {
sig.setPbCode(tipb.ScalarFuncSig_RealIsTrue)
}
case types.ETDecimal:
sig = &builtinDecimalIsTrueSig{bf, c.keepNull}
sig.setPbCode(tipb.ScalarFuncSig_DecimalIsTrue)
if c.keepNull {
sig.setPbCode(tipb.ScalarFuncSig_DecimalIsTrueWithNull)
} else {
sig.setPbCode(tipb.ScalarFuncSig_DecimalIsTrue)
}
case types.ETInt:
sig = &builtinIntIsTrueSig{bf, c.keepNull}
sig.setPbCode(tipb.ScalarFuncSig_IntIsTrue)
if c.keepNull {
sig.setPbCode(tipb.ScalarFuncSig_IntIsTrueWithNull)
} else {
sig.setPbCode(tipb.ScalarFuncSig_IntIsTrue)
}
default:
return nil, errors.Errorf("unexpected types.EvalType %v", argTp)
}
case opcode.IsFalsity:
switch argTp {
case types.ETReal:
sig = &builtinRealIsFalseSig{bf, c.keepNull}
sig.setPbCode(tipb.ScalarFuncSig_RealIsFalse)
if c.keepNull {
sig.setPbCode(tipb.ScalarFuncSig_RealIsFalseWithNull)
} else {
sig.setPbCode(tipb.ScalarFuncSig_RealIsFalse)
}
case types.ETDecimal:
sig = &builtinDecimalIsFalseSig{bf, c.keepNull}
sig.setPbCode(tipb.ScalarFuncSig_DecimalIsFalse)
if c.keepNull {
sig.setPbCode(tipb.ScalarFuncSig_DecimalIsFalseWithNull)
} else {
sig.setPbCode(tipb.ScalarFuncSig_DecimalIsFalse)
}
case types.ETInt:
sig = &builtinIntIsFalseSig{bf, c.keepNull}
sig.setPbCode(tipb.ScalarFuncSig_IntIsFalse)
if c.keepNull {
sig.setPbCode(tipb.ScalarFuncSig_IntIsFalseWithNull)
} else {
sig.setPbCode(tipb.ScalarFuncSig_IntIsFalse)
}
default:
return nil, errors.Errorf("unexpected types.EvalType %v", argTp)
}
Expand Down
13 changes: 12 additions & 1 deletion expression/distsql_builtin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,18 @@ func getSignatureByPB(ctx sessionctx.Context, sigCode tipb.ScalarFuncSig, tp *ti
f = &builtinRealIsTrueSig{base, false}
case tipb.ScalarFuncSig_DecimalIsTrue:
f = &builtinDecimalIsTrueSig{base, false}

case tipb.ScalarFuncSig_IntIsTrueWithNull:
f = &builtinIntIsTrueSig{base, true}
case tipb.ScalarFuncSig_RealIsTrueWithNull:
f = &builtinRealIsTrueSig{base, true}
case tipb.ScalarFuncSig_DecimalIsTrueWithNull:
f = &builtinDecimalIsTrueSig{base, true}
case tipb.ScalarFuncSig_IntIsFalseWithNull:
f = &builtinIntIsFalseSig{base, true}
case tipb.ScalarFuncSig_RealIsFalseWithNull:
f = &builtinRealIsFalseSig{base, true}
case tipb.ScalarFuncSig_DecimalIsFalseWithNull:
f = &builtinDecimalIsFalseSig{base, true}
case tipb.ScalarFuncSig_IfNullReal:
f = &builtinIfNullRealSig{base}
case tipb.ScalarFuncSig_IfNullInt:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ require (
github.com/pingcap/parser v3.1.0-beta.2.0.20200425032215-994651e9b6df+incompatible
github.com/pingcap/pd/v3 v3.1.0-beta.2.0.20200312100832-1206736bd050
github.com/pingcap/tidb-tools v4.0.0-beta.1.0.20200317092225-ed6b2a87af54+incompatible
github.com/pingcap/tipb v0.0.0-20200401093201-cc8b75c53383
github.com/pingcap/tipb v0.0.0-20200426072603-ce17d2d03251
github.com/prometheus/client_golang v1.0.0
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4
github.com/remyoudompheng/bigfft v0.0.0-20190512091148-babf20351dd7 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,8 @@ github.com/pingcap/pd/v3 v3.1.0-beta.2.0.20200312100832-1206736bd050 h1:mxPdR0px
github.com/pingcap/pd/v3 v3.1.0-beta.2.0.20200312100832-1206736bd050/go.mod h1:0HfF1LfWLMuGpui0PKhGvkXxfjv1JslMRY6B+cae3dg=
github.com/pingcap/tidb-tools v4.0.0-beta.1.0.20200317092225-ed6b2a87af54+incompatible h1:tYADqdmWwgDOwf/qEN0trJAy6H3c3Tt/QZx1z4qVrRQ=
github.com/pingcap/tidb-tools v4.0.0-beta.1.0.20200317092225-ed6b2a87af54+incompatible/go.mod h1:XGdcy9+yqlDSEMTpOXnwf3hiTeqrV6MN/u1se9N8yIM=
github.com/pingcap/tipb v0.0.0-20200401093201-cc8b75c53383 h1:y1ayhtouCaO0u74JNMN8s20CGJT0yIuAb8UXOYnCALc=
github.com/pingcap/tipb v0.0.0-20200401093201-cc8b75c53383/go.mod h1:RtkHW8WbcNxj8lsbzjaILci01CtYnYbIkQhjyZWrWVI=
github.com/pingcap/tipb v0.0.0-20200426072603-ce17d2d03251 h1:DnrF3jRNUvV37jb4zGT6SL3g06b7kQcD2i1oqgSKSOE=
github.com/pingcap/tipb v0.0.0-20200426072603-ce17d2d03251/go.mod h1:RtkHW8WbcNxj8lsbzjaILci01CtYnYbIkQhjyZWrWVI=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
Expand Down