executor: avoid using fmt.Sprint to truncate the string (#44540) (#44557

) close #44542
pingcap · Jun 28, 2023 · 4f7f3ab · 4f7f3ab
1 parent 464dc82
commit 4f7f3ab
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/executor/adapter.go b/executor/adapter.go
@@ -1199,7 +1199,11 @@ func FormatSQL(sql string) stringutil.StringerFunc {
 			return QueryReplacer.Replace(sql) // no limit
 		}
 		if int32(length) > maxQueryLen {
-			sql = fmt.Sprintf("%.*q(len:%d)", maxQueryLen, sql, length)
+			var result strings.Builder
+			result.Grow(int(maxQueryLen))
+			result.WriteString(sql[:maxQueryLen])
+			fmt.Fprintf(&result, "(len:%d)", length)
+			return QueryReplacer.Replace(result.String())
 		}
 		return QueryReplacer.Replace(sql)
 	}

diff --git a/executor/adapter_test.go b/executor/adapter_test.go
@@ -50,5 +50,5 @@ func TestFormatSQL(t *testing.T) {
 	require.Equal(t, "aaaaaaaaaaaaaaaaaaaa", val.String())
 	variable.QueryLogMaxLen.Store(5)
 	val = executor.FormatSQL("aaaaaaaaaaaaaaaaaaaa")
-	require.Equal(t, "\"aaaaa\"(len:20)", val.String())
+	require.Equal(t, "aaaaa(len:20)", val.String())
 }
diff --git a/util/stmtsummary/statement_summary.go b/util/stmtsummary/statement_summary.go
@@ -908,7 +908,10 @@ func formatSQL(sql string) string {
 	maxSQLLength := StmtSummaryByDigestMap.maxSQLLength()
 	length := len(sql)
 	if length > maxSQLLength {
-		sql = fmt.Sprintf("%.*s(len:%d)", maxSQLLength, sql, length)
+		var result strings.Builder
+		result.WriteString(sql[:maxSQLLength])
+		fmt.Fprintf(&result, "(len:%d)", length)
+		return result.String()
 	}
 	return sql
 }