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

ddl: fix rename index for expression indexes #51984

Merged
merged 5 commits into from
Apr 8, 2024
Merged

ddl: fix rename index for expression indexes #51984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d6b08c1
u
ywqzzy Mar 6, 2024
ea9be28
fix
ywqzzy Mar 21, 2024
25b1f77
u
ywqzzy Mar 21, 2024
725e2e6
fix
ywqzzy Mar 25, 2024
90dabd2
u
ywqzzy Mar 25, 2024
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
9 changes: 9 additions & 0 deletions pkg/ddl/column.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2049,3 +2049,12 @@ func getChangingColumnOriginName(changingColumn *model.ColumnInfo) string {
}
return columnName[:pos]
}

func getExpressionIndexOriginName(expressionIdx *model.ColumnInfo) string {
columnName := strings.TrimPrefix(expressionIdx.Name.O, expressionIndexPrefix+"_")
var pos int
if pos = strings.LastIndex(columnName, "_"); pos == -1 {
return columnName
}
return columnName[:pos]
}
11 changes: 11 additions & 0 deletions pkg/ddl/index.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,8 @@ func onRenameIndex(d *ddlCtx, t *meta.Meta, job *model.Job) (ver int64, _ error)
}

renameIndexes(tblInfo, from, to)
renameHiddenColumns(tblInfo, from, to)

if ver, err = updateVersionAndTableInfo(d, t, job, tblInfo, true); err != nil {
job.State = model.JobStateCancelled
return ver, errors.Trace(err)
Expand Down Expand Up @@ -2563,3 +2565,12 @@ func renameIndexes(tblInfo *model.TableInfo, from, to model.CIStr) {
}
}
}

func renameHiddenColumns(tblInfo *model.TableInfo, from, to model.CIStr) {
for _, col := range tblInfo.Columns {
if col.Hidden && getExpressionIndexOriginName(col) == from.O {
col.Name.L = strings.Replace(col.Name.L, from.L, to.L, 1)
col.Name.O = strings.Replace(col.Name.O, from.O, to.O, 1)
}
}
}
14 changes: 14 additions & 0 deletions tests/integrationtest/r/ddl/db_rename.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,17 @@ Error 1061 (42000): Duplicate key name 'k2'
alter table t rename index k2 to K2;
alter table t rename key k3 to K2;
Error 1061 (42000): Duplicate key name 'K2'
drop table t;
create table t(j json);
alter table t add index idx1((cast(j as char(10) array)));
alter table t rename index idx1 to idx2;
alter table t add index idx1((cast(j as char(10) array)));
insert into t values ('["1"]');
alter table t add index IDX3((cast(j as char(10) array)));
alter table t rename index IDX3 to IDX4;
alter table t add index IDX3((cast(j as char(10) array)));
insert into t values ('["2"]');
select * from t;
j
["1"]
["2"]
12 changes: 12 additions & 0 deletions tests/integrationtest/t/ddl/db_rename.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,15 @@ alter table t rename index k2 to K2;
-- error 1061
alter table t rename key k3 to K2;

# TestIssue51431
drop table t;
create table t(j json);
alter table t add index idx1((cast(j as char(10) array)));
alter table t rename index idx1 to idx2;
alter table t add index idx1((cast(j as char(10) array)));
insert into t values ('["1"]');
alter table t add index IDX3((cast(j as char(10) array)));
alter table t rename index IDX3 to IDX4;
alter table t add index IDX3((cast(j as char(10) array)));
insert into t values ('["2"]');
select * from t;