From e031962bb43811d00c675230f90d66c97ba5dc12 Mon Sep 17 00:00:00 2001 From: Yiding Cui Date: Mon, 18 Dec 2023 16:40:53 +0800 Subject: [PATCH] This is an automated cherry-pick of #49543 Signed-off-by: ti-chi-bot --- pkg/expression/chunk_executor.go | 26 +++++++++++++++++++ .../r/expression/enum_set.result | 13 ++++++++++ .../t/expression/enum_set.test | 12 +++++++++ 3 files changed, 51 insertions(+) create mode 100644 tests/integrationtest/r/expression/enum_set.result create mode 100644 tests/integrationtest/t/expression/enum_set.test diff --git a/pkg/expression/chunk_executor.go b/pkg/expression/chunk_executor.go index 92f260f7e7368..6b1b60c63919c 100644 --- a/pkg/expression/chunk_executor.go +++ b/pkg/expression/chunk_executor.go @@ -20,6 +20,8 @@ import ( "github.com/pingcap/tidb/pkg/sessionctx" "github.com/pingcap/tidb/pkg/types" "github.com/pingcap/tidb/pkg/util/chunk" + "github.com/pingcap/tidb/pkg/util/logutil" + "go.uber.org/zap" ) // Vectorizable checks whether a list of expressions can employ vectorized execution. @@ -179,7 +181,19 @@ func evalOneVec(ctx sessionctx.Context, expr Expression, input *chunk.Chunk, out if result.IsNull(i) { buf.AppendNull() } else { +<<<<<<< HEAD buf.AppendEnum(types.Enum{Value: 0, Name: result.GetString(i)}) +======= + enum, err := types.ParseEnumName(ft.GetElems(), result.GetString(i), ft.GetCollate()) + if err != nil { + logutil.BgLogger().Debug("Wrong enum name parsed during evaluation", + zap.String("The name to be parsed in the ENUM", result.GetString(i)), + zap.Strings("The valid names in the ENUM", ft.GetElems()), + zap.Error(err), + ) + } + buf.AppendEnum(enum) +>>>>>>> fb9d2203b99 (expression: enum/set could be invalid during evaluation (#49543)) } } output.SetCol(colIdx, buf) @@ -191,7 +205,19 @@ func evalOneVec(ctx sessionctx.Context, expr Expression, input *chunk.Chunk, out if result.IsNull(i) { buf.AppendNull() } else { +<<<<<<< HEAD buf.AppendSet(types.Set{Value: 0, Name: result.GetString(i)}) +======= + set, err := types.ParseSetName(ft.GetElems(), result.GetString(i), ft.GetCollate()) + if err != nil { + logutil.BgLogger().Debug("Wrong set name parsed during evaluation", + zap.String("The name to be parsed in the SET", result.GetString(i)), + zap.Strings("The valid names in the SET", ft.GetElems()), + zap.Error(err), + ) + } + buf.AppendSet(set) +>>>>>>> fb9d2203b99 (expression: enum/set could be invalid during evaluation (#49543)) } } output.SetCol(colIdx, buf) diff --git a/tests/integrationtest/r/expression/enum_set.result b/tests/integrationtest/r/expression/enum_set.result new file mode 100644 index 0000000000000..1c40536bb1c2b --- /dev/null +++ b/tests/integrationtest/r/expression/enum_set.result @@ -0,0 +1,13 @@ +drop table if exists t01; +CREATE TABLE `t01` ( +`6524d87a` timestamp DEFAULT '2024-10-02 01:54:55', +`744e4d52` int(11) NOT NULL DEFAULT '2023959529', +`087de3b2` varchar(122) DEFAULT '36h0hvfpylz0f0iv9h0ownfcg3rehi4', +`26cbbf2a` enum('l7i9','3sdz3','83','4','92p','4g','8y5rn','7gp','7','1','e') NOT NULL DEFAULT '4', +PRIMARY KEY (`744e4d52`,`26cbbf2a`) /*T![clustered_index] CLUSTERED */ +) ENGINE=InnoDB DEFAULT CHARSET=gbk COLLATE=gbk_chinese_ci COMMENT='7ad99128' +PARTITION BY HASH (`744e4d52`) PARTITIONS 9; +insert ignore into t01 values ("2023-01-01 20:01:02", 123, 'abcd', ''); +select `t01`.`26cbbf2a` as r0 from `t01` where `t01`.`6524d87a` in ( '2010-05-25') or not( `t01`.`26cbbf2a` > '1' ) ; +r0 + diff --git a/tests/integrationtest/t/expression/enum_set.test b/tests/integrationtest/t/expression/enum_set.test new file mode 100644 index 0000000000000..5bd90859381ec --- /dev/null +++ b/tests/integrationtest/t/expression/enum_set.test @@ -0,0 +1,12 @@ +# https://github.com/pingcap/tidb/issues/49487 +drop table if exists t01; +CREATE TABLE `t01` ( + `6524d87a` timestamp DEFAULT '2024-10-02 01:54:55', + `744e4d52` int(11) NOT NULL DEFAULT '2023959529', + `087de3b2` varchar(122) DEFAULT '36h0hvfpylz0f0iv9h0ownfcg3rehi4', + `26cbbf2a` enum('l7i9','3sdz3','83','4','92p','4g','8y5rn','7gp','7','1','e') NOT NULL DEFAULT '4', + PRIMARY KEY (`744e4d52`,`26cbbf2a`) /*T![clustered_index] CLUSTERED */ +) ENGINE=InnoDB DEFAULT CHARSET=gbk COLLATE=gbk_chinese_ci COMMENT='7ad99128' +PARTITION BY HASH (`744e4d52`) PARTITIONS 9; +insert ignore into t01 values ("2023-01-01 20:01:02", 123, 'abcd', ''); +select `t01`.`26cbbf2a` as r0 from `t01` where `t01`.`6524d87a` in ( '2010-05-25') or not( `t01`.`26cbbf2a` > '1' ) ; \ No newline at end of file