error: print non-printable chars in hex style for duplicate entry error

expression/integration_test.go

@@ -7895,3 +7895,17 @@ func TestIssue39146(t *testing.T) {
 	tk.MustExec("set @@tidb_enable_vectorized_expression = off;")
 	tk.MustQuery(`select str_to_date(substr(dest,1,6),'%H%i%s') from sun;`).Check(testkit.Rows("20:23:10"))
 }
+
+func TestIssue35289(t *testing.T) {
+	store := testkit.CreateMockStore(t)
+	tk := testkit.NewTestKit(t, store)
+	tk.MustExec("use test")
+	tk.MustExec("CREATE TABLE t1 (a BINARY(16) PRIMARY KEY);")
+	tk.MustExec(`INSERT INTO t1 VALUES (AES_ENCRYPT('a','a'));`)
+	err := tk.ExecToErr(`INSERT INTO t1 VALUES (AES_ENCRYPT('a','a'));`)
+	require.Error(t, err, `ERROR 1062 (23000): Duplicate entry '{ W]\xA1\x06u\x9D\xBD\xB1\xA3.\xE2\xD9\xA7t' for key 't1.PRIMARY'`)
+
+	tk.MustExec(`INSERT INTO t1 VALUES (AES_ENCRYPT('b','b'));`)
+	err = tk.ExecToErr(`INSERT INTO t1 VALUES (AES_ENCRYPT('b','b'));`)
+	require.Error(t, err, "ERROR 1062 (23000): Duplicate entry '\x0C\x1E\x8DG`\xEB\x93 F&BC\xF0\xB5\xF4\xB7' for key 't1.PRIMARY'")
+}

store/driver/txn/error.go

@@ -45,6 +45,31 @@ func genKeyExistsError(name string, value string, err error) error {
 	return kv.ErrKeyExists.FastGenByArgs(value, name)
 }
 
+func printableASCII(b byte) bool {
+	if b >= 0 && b < 32 || b > 127 {
+		return false
+	}
+
+	return true
+}
+
+// fmtNonASCIIPrintableCharToHex turns non-printable-ASCII characters into Hex
+func fmtNonASCIIPrintableCharToHex(str string) string {
+	var b bytes.Buffer
+	b.Grow(len(str) * 2)
+	for i := 0; i < len(str); i++ {
+		if printableASCII(str[i]) {
+			b.WriteByte(str[i])
+			continue
+		}
+
+		b.WriteString(`\x`)
+		// turns non-printable-ASCII character into hex-string
+		b.WriteString(fmt.Sprintf("%02X", str[i]))
+	}
+	return b.String()
+}
+
 func extractKeyExistsErrFromHandle(key kv.Key, value []byte, tblInfo *model.TableInfo) error {
 	name := tblInfo.Name.String() + ".PRIMARY"
 	_, handle, err := tablecodec.DecodeRecordKey(key)
@@ -100,6 +125,8 @@ func extractKeyExistsErrFromHandle(key kv.Key, value []byte, tblInfo *model.Tabl
 		if col.Length > 0 && len(str) > col.Length {
 			str = str[:col.Length]
 		}
+
+		str = fmtNonASCIIPrintableCharToHex(str)
 		valueStr = append(valueStr, str)
 	}
 	return genKeyExistsError(name, strings.Join(valueStr, "-"), nil)
@@ -136,6 +163,7 @@ func extractKeyExistsErrFromIndex(key kv.Key, value []byte, tblInfo *model.Table
 		if err != nil {
 			return genKeyExistsError(name, key.String(), err)
 		}
+		str = fmtNonASCIIPrintableCharToHex(str)
 		valueStr = append(valueStr, str)
 	}
 	return genKeyExistsError(name, strings.Join(valueStr, "-"), nil)