update

Author: CbcWestwolf

tests/realtikvtest/addindextest2/global_sort_test.go

@@ -313,41 +313,35 @@ func TestGlobalSortDuplicateErrMsg(t *testing.T) {
 			"create table t (id int, data varchar(255));",
 			"",
 			"insert into t values (1, '1'), (2, '1');",
-			"alter table t add unique index i(data);",
-			"[kv:1062]Duplicate entry '1' for key 't.i'",
+			"alter table t add unique index idx(data);",
+			"[kv:1062]Duplicate entry '1' for key 't.idx'",
 		},
 		{
 			"combined index",
 			"create table t (id int, data varchar(255));",
 			"",
 			"insert into t values (1, '1'), (1, '1');",
-			"alter table t add unique index i(id, data);",
-			"[kv:1062]Duplicate entry '1-1' for key 't.i'",
+			"alter table t add unique index idx(id, data);",
+			"[kv:1062]Duplicate entry '1-1' for key 't.idx'",
 		},
 		{
 			"multi value index",
 			"create table t (id int, data json);",
 			"",
 			`insert into t values (1, '{"code":[1,1]}'), (2, '{"code":[1,1]}');`,
-			"alter table t add unique index zips( (CAST(data->'$.code' AS UNSIGNED ARRAY)));",
-			"Duplicate entry '1' for key 't.zips",
+			"alter table t add unique index idx( (CAST(data->'$.code' AS UNSIGNED ARRAY)));",
+			"Duplicate entry '1' for key 't.idx",
 		},
 		{
 			"global index",
 			"create table t (k int, c int) partition by list (k) (partition odd values in (1,3,5,7,9), partition even values in (2,4,6,8,10));",
 			"",
 			"insert into t values (1, 1), (2, 1)",
-			"alter table t add unique index i(c) global",
-			"[kv:1062]Duplicate entry '1' for key 't.i'",
+			"alter table t add unique index idx(c) global",
+			"[kv:1062]Duplicate entry '1' for key 't.idx'",
 		},
 	}
 
-	checkSubtaskErr := func(t *testing.T) {
-		errorSubtask := taskexecutor.GetErrorSubtask4Test.Swap(nil)
-		require.NotEmpty(t, errorSubtask)
-		require.Equal(t, proto.BackfillStepWriteAndIngest, errorSubtask.Step)
-	}
-
 	for _, tc := range testcases {
 		t.Run(tc.caseName, func(tt *testing.T) {
 			// init
@@ -368,7 +362,13 @@ func TestGlobalSortDuplicateErrMsg(t *testing.T) {
 			}
 
 			tk.MustContainErrMsg(tc.addUniqueKeySQL, tc.errMsg)
-			checkSubtaskErr(tt)
+			errorSubtask := taskexecutor.GetErrorSubtask4Test.Swap(nil)
+			require.NotEmpty(tt, errorSubtask)
+			require.Equal(tt, proto.BackfillStepWriteAndIngest, errorSubtask.Step)
+
+			tk.MustExec("set session tidb_redact_log = on;")
+			tk.MustContainErrMsg(tc.addUniqueKeySQL, "[kv:1062]Duplicate entry '?' for key 't.idx'")
+			tk.MustExec("set session tidb_redact_log = off;")
 		})
 	}
 }