From edbadfd178f03a1c8928d25ad78545f6b4ac8a13 Mon Sep 17 00:00:00 2001 From: fzzf678 <108643977+fzzf678@users.noreply.github.com> Date: Tue, 29 Oct 2024 19:32:52 +0800 Subject: [PATCH] commit --- pkg/ddl/executor.go | 29 +++++++++++++++++++ tests/integrationtest/r/session/common.result | 12 ++++++++ tests/integrationtest/t/session/common.test | 12 ++++++++ 3 files changed, 53 insertions(+) diff --git a/pkg/ddl/executor.go b/pkg/ddl/executor.go index 5c264a51fce1f..5685971b98686 100644 --- a/pkg/ddl/executor.go +++ b/pkg/ddl/executor.go @@ -51,6 +51,7 @@ import ( pmodel "github.com/pingcap/tidb/pkg/parser/model" "github.com/pingcap/tidb/pkg/parser/mysql" "github.com/pingcap/tidb/pkg/parser/terror" + parser_types "github.com/pingcap/tidb/pkg/parser/types" "github.com/pingcap/tidb/pkg/privilege" rg "github.com/pingcap/tidb/pkg/resourcegroup" "github.com/pingcap/tidb/pkg/sessionctx" @@ -3971,6 +3972,10 @@ func checkAlterTableCharset(tblInfo *model.TableInfo, dbInfo *model.DBInfo, toCh return doNothing, nil } + if err = checkIndexLengthWithNewCharset(tblInfo, toCharset, toCollate); err != nil { + return doNothing, err + } + for _, col := range tblInfo.Columns { if col.GetType() == mysql.TypeVarchar { if err = types.IsVarcharTooBigFieldLength(col.GetFlen(), col.Name.O, toCharset); err != nil { @@ -3994,6 +3999,30 @@ func checkAlterTableCharset(tblInfo *model.TableInfo, dbInfo *model.DBInfo, toCh return doNothing, nil } +func checkIndexLengthWithNewCharset(tblInfo *model.TableInfo, toCharset, toCollate string) error { + // Copy all columns and replace the charset and collate. + columns := make([]*model.ColumnInfo, 0, len(tblInfo.Columns)) + for _, col := range tblInfo.Columns { + newCol := col.Clone() + if parser_types.HasCharset(&newCol.FieldType) { + newCol.SetCharset(toCharset) + newCol.SetCollate(toCollate) + } else { + newCol.SetCharset(charset.CharsetBin) + newCol.SetCollate(charset.CharsetBin) + } + columns = append(columns, newCol) + } + + for _, indexInfo := range tblInfo.Indices { + err := checkIndexPrefixLength(columns, indexInfo.Columns) + if err != nil { + return err + } + } + return nil +} + // RenameIndex renames an index. // In TiDB, indexes are case-insensitive (so index 'a' and 'A" are considered the same index), // but index names are case-sensitive (we can rename index 'a' to 'A') diff --git a/tests/integrationtest/r/session/common.result b/tests/integrationtest/r/session/common.result index 56170689e4097..e58cf77037c4b 100644 --- a/tests/integrationtest/r/session/common.result +++ b/tests/integrationtest/r/session/common.result @@ -137,6 +137,18 @@ create table t (a blob(10000), b timestamp, index idx(a(3069), b)); Error 1071 (42000): Specified key was too long (3073 bytes); max key length is 3072 bytes create table t (a blob(10000), b timestamp, index idx(a(3068), b)); drop table if exists t; +create table posts (id int auto_increment primary key, title varchar(500) character set utf8, subtitle varchar(500) character set utf8, unique key(title, subtitle)); +alter table posts convert to character set utf8mb4; +Error 1071 (42000): Specified key was too long (4000 bytes); max key length is 3072 bytes +drop table if exists posts; +create table t(a varchar(1000) character set utf8, primary key(a)); +alter table t convert to character set utf8mb4; +Error 1071 (42000): Specified key was too long (4000 bytes); max key length is 3072 bytes +drop table if exists t; +create table t(a varchar(1000) character set utf8, key(a)); +alter table t convert to character set utf8mb4; +Error 1071 (42000): Specified key was too long (4000 bytes); max key length is 3072 bytes +drop table if exists t; drop table if exists t1; create table t1(id int ); insert into t1 values (1); select * from t1; id diff --git a/tests/integrationtest/t/session/common.test b/tests/integrationtest/t/session/common.test index 3e7eaa8e16756..601ce18aed852 100644 --- a/tests/integrationtest/t/session/common.test +++ b/tests/integrationtest/t/session/common.test @@ -140,6 +140,18 @@ drop table if exists t; create table t (a blob(10000), b timestamp, index idx(a(3069), b)); create table t (a blob(10000), b timestamp, index idx(a(3068), b)); drop table if exists t; +create table posts (id int auto_increment primary key, title varchar(500) character set utf8, subtitle varchar(500) character set utf8, unique key(title, subtitle)); +-- error 1071 +alter table posts convert to character set utf8mb4; +drop table if exists posts; +create table t(a varchar(1000) character set utf8, primary key(a)); +-- error 1071 +alter table t convert to character set utf8mb4; +drop table if exists t; +create table t(a varchar(1000) character set utf8, key(a)); +-- error 1071 +alter table t convert to character set utf8mb4; +drop table if exists t; # TestMultiStmts drop table if exists t1; create table t1(id int ); insert into t1 values (1);