fix conflict

Author: lcwangchao

expression/builtin_cast.go

@@ -284,13 +284,7 @@ func (c *castAsStringFunctionClass) getFunction(ctx sessionctx.Context, args []E
 	if err != nil {
 		return nil, err
 	}
-<<<<<<< HEAD:expression/builtin_cast.go
-	if args[0].GetType().Hybrid() {
-		sig = &builtinCastStringAsStringSig{bf}
-		sig.setPbCode(tipb.ScalarFuncSig_CastStringAsString)
-		return sig, nil
-=======
-	if ft := args[0].GetType(ctx.GetEvalCtx()); ft.Hybrid() {
+	if ft := args[0].GetType(); ft.Hybrid() {
 		castBitAsUnBinary := ft.GetType() == mysql.TypeBit && c.tp.GetCharset() != charset.CharsetBin
 		if !castBitAsUnBinary {
 			sig = &builtinCastStringAsStringSig{bf}
@@ -304,7 +298,6 @@ func (c *castAsStringFunctionClass) getFunction(ctx sessionctx.Context, args []E
 		tp.SetCollate(charset.CollationBin)
 		tp.AddFlag(mysql.BinaryFlag)
 		args[0] = BuildCastFunction(ctx, args[0], tp)
->>>>>>> 38104f4f328 (expression: fix tikv crash when `bool like cast(bit as char)` (#57484)):pkg/expression/builtin_cast.go
 	}
 	argTp := args[0].GetType().EvalType()
 	switch argTp {

expression/builtin_convert_charset.go

@@ -166,7 +166,6 @@ type builtinInternalFromBinarySig struct {
 func (b *builtinInternalFromBinarySig) Clone() builtinFunc {
 	newSig := &builtinInternalFromBinarySig{}
 	newSig.cloneFrom(&b.baseBuiltinFunc)
-	newSig.cannotConvertStringAsWarning = b.cannotConvertStringAsWarning
 	return newSig
 }
 

pkg/planner/core/integration_test.go

@@ -1405,15 +1405,15 @@ func TestBitColumnPushDown(t *testing.T) {
 	tk.MustQuery(sql).Check(testkit.Rows("A"))
 	tk.MustQuery(fmt.Sprintf("explain analyze %s", sql)).CheckAt([]int{0, 3, 6}, rows)
 
-	rows[1][2] = `eq(cast(test.t1.a, var_string(1)), "A")`
+	rows[1][2] = `eq(cast(from_binary(cast(test.t1.a, binary(1))), var_string(1)), "A")`
 	sql = "select a from t1 where cast(a as char)='A'"
 	tk.MustQuery(sql).Check(testkit.Rows("A"))
 	tk.MustQuery(fmt.Sprintf("explain analyze %s", sql)).CheckAt([]int{0, 3, 6}, rows)
 
 	tk.MustExec("insert into mysql.expr_pushdown_blacklist values('bit', 'tikv','');")
 	tk.MustExec("admin reload expr_pushdown_blacklist;")
 	rows = [][]interface{}{
-		{"Selection_5", "root", `eq(cast(test.t1.a, var_string(1)), "A")`},
+		{"Selection_5", "root", `eq(cast(from_binary(cast(test.t1.a, binary(1))), var_string(1)), "A")`},
 		{"└─TableReader_7", "root", "data:TableFullScan_6"},
 		{"  └─TableFullScan_6", "cop[tikv]", "keep order:false, stats:pseudo"},
 	}

planner/core/integration_test.go

@@ -1,183 +1,3 @@
-select cast('' as signed);
-cast('' as signed)
-0
-Level	Code	Message
-Warning	1292	Truncated incorrect INTEGER value: ''
-select cast('12345abcde' as signed);
-cast('12345abcde' as signed)
-12345
-Level	Code	Message
-Warning	1292	Truncated incorrect INTEGER value: '12345abcde'
-select cast('123e456' as signed);
-cast('123e456' as signed)
-123
-Level	Code	Message
-Warning	1292	Truncated incorrect INTEGER value: '123e456'
-select cast('-12345abcde' as signed);
-cast('-12345abcde' as signed)
--12345
-Level	Code	Message
-Warning	1292	Truncated incorrect INTEGER value: '-12345abcde'
-select cast('-123e456' as signed);
-cast('-123e456' as signed)
--123
-Level	Code	Message
-Warning	1292	Truncated incorrect INTEGER value: '-123e456'
-select coercibility(binary('a'));
-coercibility(binary('a'))
-2
-select coercibility(cast('a' as char(10)));
-coercibility(cast('a' as char(10)))
-2
-select coercibility(convert('abc', char(10)));
-coercibility(convert('abc', char(10)))
-2
-drop table if exists t;
-create table t(d1 double, f float, d2 decimal(24,8));
-insert into t values(0, 0, 0);
-select cast(111.1 as datetime) from t;
-cast(111.1 as datetime)
-2000-01-11 00:00:00
-select cast(1311.1 as datetime) from t;
-cast(1311.1 as datetime)
-NULL
-insert into t values(111.1, 1122.1, 31212.111);
-insert into t values(121212.1111, 1121212.111111, 11121212.111111);
-insert into t values(99991111.1111111, 101.1111111, 20121212121212.1111111);
-insert into t values(NULL, NULL, NULL);
-insert into t values(1.1, 48.1, 100.1);
-insert into t values(1301.11, 1131.111, 100001111.111);
-insert into t values(20121212121260.1111111, 20121212126012.1111111, 20121212241212.1111111);
-select cast(d1 as datetime), cast(f as datetime), cast(d2 as datetime) from t;
-cast(d1 as datetime)	cast(f as datetime)	cast(d2 as datetime)
-NULL	NULL	NULL
-NULL	NULL	NULL
-NULL	NULL	NULL
-NULL	NULL	NULL
-0000-00-00 00:00:00	0000-00-00 00:00:00	0000-00-00 00:00:00
-2000-01-11 00:00:00	2000-11-22 00:00:00	2003-12-12 00:00:00
-2012-12-12 00:00:00	0112-12-12 00:00:00	1112-12-12 00:00:00
-9999-11-11 00:00:00	2000-01-01 00:00:00	2012-12-12 12:12:12
-drop table if exists t;
-create table t (col1 bigint, col2 double, col3 decimal, col4 varchar(20), col5 json);
-insert into t values (1, 1, 1, "1", "1");
-insert into t values (null, null, null, null, null);
-select cast(col1 as time), cast(col2 as time), cast(col3 as time), cast(col4 as time), cast(col5 as time) from t where col1 = 1;
-cast(col1 as time)	cast(col2 as time)	cast(col3 as time)	cast(col4 as time)	cast(col5 as time)
-00:00:01	00:00:01	00:00:01	00:00:01	NULL
-select cast(col1 as time), cast(col2 as time), cast(col3 as time), cast(col4 as time), cast(col5 as time) from t where col1 is null;
-cast(col1 as time)	cast(col2 as time)	cast(col3 as time)	cast(col4 as time)	cast(col5 as time)
-NULL	NULL	NULL	NULL	NULL
-select cast(col1 as time(31)) from t where col1 is null;
-Error 1426 (42000): Too-big precision 31 specified for 'CAST'. Maximum is 6.
-select cast(col2 as time(31)) from t where col1 is null;
-Error 1426 (42000): Too-big precision 31 specified for 'CAST'. Maximum is 6.
-select cast(col3 as time(31)) from t where col1 is null;
-Error 1426 (42000): Too-big precision 31 specified for 'CAST'. Maximum is 6.
-select cast(col4 as time(31)) from t where col1 is null;
-Error 1426 (42000): Too-big precision 31 specified for 'CAST'. Maximum is 6.
-select cast(col5 as time(31)) from t where col1 is null;
-Error 1426 (42000): Too-big precision 31 specified for 'CAST'. Maximum is 6.
-drop table if exists t;
-create table t(a varchar(50));
-insert into t values ('2020-01-01 12:00:00.123456 +0600 PST');
-insert into t values ('2020-01-01 12:00:00.123456 -0600 PST');
-insert into t values ('2020-01-01 12:00:00.123456');
-select cast(a as datetime(3)) from t;
-cast(a as datetime(3))
-2020-01-01 12:00:00.123
-2020-01-01 12:00:00.123
-2020-01-01 12:00:00.123
-drop table if exists t1;
-create table t1 (c1 text);
-insert into t1 values ('a');
-update t1 set c1 = cast('61qw' as decimal);
-Error 1292 (22007): Truncated incorrect DECIMAL value: '61qw'
-select cast('61qw' as decimal);
-cast('61qw' as decimal)
-61
-Level	Code	Message
-Warning	1292	Truncated incorrect DECIMAL value: '61qw'
-drop table if exists t;
-create table t (y year);
-insert into t values (cast('14:15' as time));
-select 1 from t where y = YEAR(CURDATE());
-1
-1
-select cast(cast('14:15' as time) as year) = YEAR(CURDATE());
-cast(cast('14:15' as time) as year) = YEAR(CURDATE())
-1
-explain select null as a union all select 'a' as a;
-id	estRows	task	access object	operator info
-Union_8	2.00	root		
-├─Projection_10	1.00	root		<nil>->Column#3
-│ └─TableDual_11	1.00	root		rows:1
-└─Projection_12	1.00	root		a->Column#3
-  └─TableDual_13	1.00	root		rows:1
-select null as a union all select 'a' as a;
-a
-NULL
-a
-drop table if exists t0;
-create table t0(c0 tinyint(1) unsigned not null );
-insert into t0 values (1);
-select * from t0 where case 0 when t0.c0 > -1.194192591e9 then null else 1 end;
-c0
-1
-select t0.c0 > -1.194192591e9 from t0;
-t0.c0 > -1.194192591e9
-1
-select t0.c0 < -1.194192591e9 from t0;
-t0.c0 < -1.194192591e9
-0
-select -1.194192591e9 > t0.c0 from t0;
--1.194192591e9 > t0.c0
-0
-select -1.194192591e9 < t0.c0 from t0;
--1.194192591e9 < t0.c0
-1
-select t0.c0 > 1.194192591e9 from t0;
-t0.c0 > 1.194192591e9
-0
-select t0.c0 < 1.194192591e9 from t0;
-t0.c0 < 1.194192591e9
-1
-select 1.194192591e9 > t0.c0 from t0;
-1.194192591e9 > t0.c0
-1
-select 1.194192591e9 < t0.c0 from t0;
-1.194192591e9 < t0.c0
-0
-drop table if exists test;
-CREATE TABLE `test` (
-`id` bigint(20) NOT NULL,
-`update_user` varchar(32) DEFAULT NULL,
-PRIMARY KEY (`id`) /*T![clustered_index] CLUSTERED */
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
-insert into test values(1,'张三');
-insert into test values(2,'李四');
-insert into test values(3,'张三');
-insert into test values(4,'李四');
-select * from test order by cast(update_user as char character set gbk) desc , id limit 3;
-id	update_user
-1	张三
-3	张三
-2	李四
-drop table test;
-CREATE TABLE `test` (
-`id` bigint NOT NULL,
-`update_user` varchar(32) CHARACTER SET gbk COLLATE gbk_chinese_ci DEFAULT NULL,
-PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
-insert into test values(1,'张三');
-insert into test values(2,'李四');
-insert into test values(3,'张三');
-insert into test values(4,'李四');
-select * from test order by cast(update_user as char) desc , id limit 3;
-id	update_user
-2	李四
-4	李四
-1	张三
 drop table if exists test;
 create table test(a bit(24));
 insert into test values('中');

tests/integrationtest/r/expression/cast.result

@@ -1,118 +1,3 @@
-# TestCastStrToInt
---enable_warnings
-select cast('' as signed);
-select cast('12345abcde' as signed);
-select cast('123e456' as signed);
-select cast('-12345abcde' as signed);
-select cast('-123e456' as signed);
---disable_warnings
-
-# TestCastCoer
-select coercibility(binary('a'));
-select coercibility(cast('a' as char(10)));
-select coercibility(convert('abc', char(10)));
-
-# TestCastRealAsTime
-drop table if exists t;
-create table t(d1 double, f float, d2 decimal(24,8));
-insert into t values(0, 0, 0);
-select cast(111.1 as datetime) from t;
-select cast(1311.1 as datetime) from t;
-insert into t values(111.1, 1122.1, 31212.111);
-insert into t values(121212.1111, 1121212.111111, 11121212.111111);
-insert into t values(99991111.1111111, 101.1111111, 20121212121212.1111111);
-insert into t values(NULL, NULL, NULL);
-insert into t values(1.1, 48.1, 100.1);
-insert into t values(1301.11, 1131.111, 100001111.111);
-insert into t values(20121212121260.1111111, 20121212126012.1111111, 20121212241212.1111111);
--- sorted_result
-select cast(d1 as datetime), cast(f as datetime), cast(d2 as datetime) from t;
-
-# TestCastAsTime
-drop table if exists t;
-create table t (col1 bigint, col2 double, col3 decimal, col4 varchar(20), col5 json);
-insert into t values (1, 1, 1, "1", "1");
-insert into t values (null, null, null, null, null);
-select cast(col1 as time), cast(col2 as time), cast(col3 as time), cast(col4 as time), cast(col5 as time) from t where col1 = 1;
-select cast(col1 as time), cast(col2 as time), cast(col3 as time), cast(col4 as time), cast(col5 as time) from t where col1 is null;
--- error 1426
-select cast(col1 as time(31)) from t where col1 is null;
--- error 1426
-select cast(col2 as time(31)) from t where col1 is null;
--- error 1426
-select cast(col3 as time(31)) from t where col1 is null;
--- error 1426
-select cast(col4 as time(31)) from t where col1 is null;
--- error 1426
-select cast(col5 as time(31)) from t where col1 is null;
-drop table if exists t;
-create table t(a varchar(50));
-insert into t values ('2020-01-01 12:00:00.123456 +0600 PST');
-insert into t values ('2020-01-01 12:00:00.123456 -0600 PST');
-insert into t values ('2020-01-01 12:00:00.123456');
-select cast(a as datetime(3)) from t;
-
-# TestCastErrMsg
-drop table if exists t1;
-create table t1 (c1 text);
-insert into t1 values ('a');
---error 1292
-update t1 set c1 = cast('61qw' as decimal);
---enable_warnings
-select cast('61qw' as decimal);
---disable_warnings
-
-# TestCastTimeAsYear
-drop table if exists t;
-create table t (y year);
-insert into t values (cast('14:15' as time));
-select 1 from t where y = YEAR(CURDATE());
-select cast(cast('14:15' as time) as year) = YEAR(CURDATE());
-
-# TestIssue49526
-explain select null as a union all select 'a' as a;
---sorted_result
-select null as a union all select 'a' as a;
-
-# TestNegFloatConvertToUnsigned
-drop table if exists t0;
-create table t0(c0 tinyint(1) unsigned not null );
-insert into t0 values (1);
-select * from t0 where case 0 when t0.c0 > -1.194192591e9 then null else 1 end;
-select t0.c0 > -1.194192591e9 from t0;
-select t0.c0 < -1.194192591e9 from t0;
-select -1.194192591e9 > t0.c0 from t0;
-select -1.194192591e9 < t0.c0 from t0;
-select t0.c0 > 1.194192591e9 from t0;
-select t0.c0 < 1.194192591e9 from t0;
-select 1.194192591e9 > t0.c0 from t0;
-select 1.194192591e9 < t0.c0 from t0;
-
-# TestCastAsStringExplicitCharSet
-drop table if exists test;
-CREATE TABLE `test` (
-    `id` bigint(20) NOT NULL,
-    `update_user` varchar(32) DEFAULT NULL,
-    PRIMARY KEY (`id`) /*T![clustered_index] CLUSTERED */
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
-insert into test values(1,'张三');
-insert into test values(2,'李四');
-insert into test values(3,'张三');
-insert into test values(4,'李四');
-select * from test order by cast(update_user as char character set gbk) desc , id limit 3;
-
-drop table test;
-CREATE TABLE `test` (
-  `id` bigint NOT NULL,
-  `update_user` varchar(32) CHARACTER SET gbk COLLATE gbk_chinese_ci DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
-insert into test values(1,'张三');
-insert into test values(2,'李四');
-insert into test values(3,'张三');
-insert into test values(4,'李四');
-select * from test order by cast(update_user as char) desc , id limit 3;
-
 # issue #56494, cast bit as char
 drop table if exists test;
 create table test(a bit(24));

tests/integrationtest/t/expression/cast.test

@@ -17,7 +17,7 @@ package pushdowntest
 import (
 	"testing"
 
-	"github.com/pingcap/tidb/pkg/testkit"
+	"github.com/pingcap/tidb/testkit"
 	"github.com/pingcap/tidb/tests/realtikvtest"
 	"github.com/stretchr/testify/require"
 )