@@ -306,33 +306,27 @@ func TestGlobalSortDuplicateErrMsg(t *testing.T) {
306
306
"create table t (id int, data varchar(255));" ,
307
307
"" ,
308
308
"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 '" ,
311
311
},
312
312
{
313
313
"combined index" ,
314
314
"create table t (id int, data varchar(255));" ,
315
315
"" ,
316
316
"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 '" ,
319
319
},
320
320
{
321
321
"multi value index" ,
322
322
"create table t (id int, data json);" ,
323
323
"" ,
324
324
`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 " ,
327
327
},
328
328
}
329
329
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
-
336
330
for _ , tc := range testcases {
337
331
t .Run (tc .caseName , func (tt * testing.T ) {
338
332
// init
@@ -353,7 +347,13 @@ func TestGlobalSortDuplicateErrMsg(t *testing.T) {
353
347
}
354
348
355
349
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;" )
357
357
})
358
358
}
359
359
}
0 commit comments