Skip to content

Commit 24efb23

Browse files
committed
update
1 parent 406960d commit 24efb23

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

tests/realtikvtest/addindextest2/global_sort_test.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -306,33 +306,27 @@ func TestGlobalSortDuplicateErrMsg(t *testing.T) {
306306
"create table t (id int, data varchar(255));",
307307
"",
308308
"insert into t values (1, '1'), (2, '1');",
309-
"alter table t add unique index i(data);",
310-
"[kv:1062]Duplicate entry '1' for key 't.i'",
309+
"alter table t add unique index idx(data);",
310+
"[kv:1062]Duplicate entry '1' for key 't.idx'",
311311
},
312312
{
313313
"combined index",
314314
"create table t (id int, data varchar(255));",
315315
"",
316316
"insert into t values (1, '1'), (1, '1');",
317-
"alter table t add unique index i(id, data);",
318-
"[kv:1062]Duplicate entry '1-1' for key 't.i'",
317+
"alter table t add unique index idx(id, data);",
318+
"[kv:1062]Duplicate entry '1-1' for key 't.idx'",
319319
},
320320
{
321321
"multi value index",
322322
"create table t (id int, data json);",
323323
"",
324324
`insert into t values (1, '{"code":[1,1]}'), (2, '{"code":[1,1]}');`,
325-
"alter table t add unique index zips( (CAST(data->'$.code' AS UNSIGNED ARRAY)));",
326-
"Duplicate entry '1' for key 't.zips",
325+
"alter table t add unique index idx( (CAST(data->'$.code' AS UNSIGNED ARRAY)));",
326+
"Duplicate entry '1' for key 't.idx",
327327
},
328328
}
329329

330-
checkSubtaskErr := func(t *testing.T) {
331-
errorSubtask := taskexecutor.GetErrorSubtask4Test.Swap(nil)
332-
require.NotEmpty(t, errorSubtask)
333-
require.Equal(t, proto.BackfillStepWriteAndIngest, errorSubtask.Step)
334-
}
335-
336330
for _, tc := range testcases {
337331
t.Run(tc.caseName, func(tt *testing.T) {
338332
// init
@@ -353,7 +347,13 @@ func TestGlobalSortDuplicateErrMsg(t *testing.T) {
353347
}
354348

355349
tk.MustContainErrMsg(tc.addUniqueKeySQL, tc.errMsg)
356-
checkSubtaskErr(tt)
350+
errorSubtask := taskexecutor.GetErrorSubtask4Test.Swap(nil)
351+
require.NotEmpty(tt, errorSubtask)
352+
require.Equal(tt, proto.BackfillStepWriteAndIngest, errorSubtask.Step)
353+
354+
tk.MustExec("set session tidb_redact_log = on;")
355+
tk.MustContainErrMsg(tc.addUniqueKeySQL, "[kv:1062]Duplicate entry '?' for key 't.idx'")
356+
tk.MustExec("set session tidb_redact_log = off;")
357357
})
358358
}
359359
}

0 commit comments

Comments
 (0)