refine tidb cast binary to json

Signed-off-by: Yang Keao <yangkeao@chunibyo.icu>
pingcap · Mar 7, 2024 · 3ad06e0 · 3ad06e0
1 parent 87bcf32
commit 3ad06e0
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 2 deletions.
diff --git a/pkg/expression/builtin_cast.go b/pkg/expression/builtin_cast.go
@@ -878,7 +878,7 @@ func (b *builtinCastStringAsJSONSig) evalJSON(ctx EvalContext, row chunk.Row) (r
 	typ := b.args[0].GetType()
 	if types.IsBinaryStr(typ) {
 		buf := []byte(val)
-		if typ.GetType() == mysql.TypeString {
+		if typ.GetType() == mysql.TypeString && typ.GetFlen() > 0 {
 			// the tailing zero should also be in the opaque json
 			buf = make([]byte, typ.GetFlen())
 			copy(buf, val)

diff --git a/pkg/expression/builtin_cast_vec.go b/pkg/expression/builtin_cast_vec.go
@@ -853,7 +853,7 @@ func (b *builtinCastStringAsJSONSig) vecEvalJSON(ctx EvalContext, input *chunk.C
 
 			val := buf.GetBytes(i)
 			resultBuf := val
-			if typ.GetType() == mysql.TypeString {
+			if typ.GetType() == mysql.TypeString && typ.GetFlen() > 0 {
 				// only for BINARY: the tailing zero should also be in the opaque json
 				resultBuf = make([]byte, typ.GetFlen())
 				copy(resultBuf, val)

diff --git a/tests/integrationtest/r/expression/json.result b/tests/integrationtest/r/expression/json.result
@@ -628,3 +628,24 @@ a	cast(a as signed)
 "-1"	-1
 "18446744073709551615"	-1
 "18446744073709552000"	-1
+select cast(binary 'aa' as json);
+cast(binary 'aa' as json)
+"base64:type254:YWE="
+drop table if exists t;
+create table t (vb VARBINARY(10), b BINARY(10), vc VARCHAR(10), c CHAR(10));
+insert into t values ('1', '1', '1', '1');
+select cast(vb as json), cast(b as json), cast(vc as json), cast(c as json) from t;
+cast(vb as json)	cast(b as json)	cast(vc as json)	cast(c as json)
+"base64:type15:MQ=="	"base64:type254:MQAAAAAAAAAAAA=="	1	1
+select 1 as data from t where cast(vb as json) = '1';
+data
+select 1 as data from t where cast(b as json) = '1';
+data
+select 1 as data from t where cast(vc as json) = '1';
+data
+select 1 as data from t where cast(c as json) = '1';
+data
+select 1 as data from t where cast(BINARY vc as json) = '1';
+data
+select 1 as data from t where cast(BINARY c as json) = '1';
+data
diff --git a/tests/integrationtest/t/expression/json.test b/tests/integrationtest/t/expression/json.test
@@ -380,3 +380,16 @@ insert into t values ('"18446744073709552000"');
 select a, cast(a as unsigned) from t;
 -- sorted_result
 select a, cast(a as signed) from t;
+
+# TestCastBinaryStringToJSON
+select cast(binary 'aa' as json);
+drop table if exists t;
+create table t (vb VARBINARY(10), b BINARY(10), vc VARCHAR(10), c CHAR(10));
+insert into t values ('1', '1', '1', '1');
+select cast(vb as json), cast(b as json), cast(vc as json), cast(c as json) from t;
+select 1 from t where cast(vb as json) = '1';
+select 1 from t where cast(b as json) = '1';
+select 1 from t where cast(vc as json) = '1';
+select 1 from t where cast(c as json) = '1';
+select 1 from t where cast(BINARY vc as json) = '1';
+select 1 from t where cast(BINARY c as json) = '1';