From 0106f4c2161725da889858e07b7eb825d3bff371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=B6=85?= Date: Fri, 28 Jun 2024 15:34:24 +0800 Subject: [PATCH] *: fix empty SQL in slow log for internal statement (#54274) close pingcap/tidb#52743, close pingcap/tidb#53264, close pingcap/tidb#54190 --- pkg/sessionctx/variable/session.go | 1 + pkg/util/redact/BUILD.bazel | 5 ++++- pkg/util/redact/redact.go | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pkg/sessionctx/variable/session.go b/pkg/sessionctx/variable/session.go index 530f9b54cc08b..c546dd830c26e 100644 --- a/pkg/sessionctx/variable/session.go +++ b/pkg/sessionctx/variable/session.go @@ -2075,6 +2075,7 @@ func NewSessionVars(hctx HookContext) *SessionVars { ResourceGroupName: resourcegroup.DefaultResourceGroupName, DefaultCollationForUTF8MB4: mysql.DefaultCollationName, GroupConcatMaxLen: DefGroupConcatMaxLen, + EnableRedactLog: DefTiDBRedactLog, } vars.status.Store(uint32(mysql.ServerStatusAutocommit)) vars.StmtCtx.ResourceGroupName = resourcegroup.DefaultResourceGroupName diff --git a/pkg/util/redact/BUILD.bazel b/pkg/util/redact/BUILD.bazel index efc000e401a2d..18c8b3c2c2cc7 100644 --- a/pkg/util/redact/BUILD.bazel +++ b/pkg/util/redact/BUILD.bazel @@ -5,7 +5,10 @@ go_library( srcs = ["redact.go"], importpath = "github.com/pingcap/tidb/pkg/util/redact", visibility = ["//visibility:public"], - deps = ["@com_github_pingcap_errors//:errors"], + deps = [ + "//pkg/util/intest", + "@com_github_pingcap_errors//:errors", + ], ) go_test( diff --git a/pkg/util/redact/redact.go b/pkg/util/redact/redact.go index ef2f6c02a00f8..4cfb5dfd9c1ba 100644 --- a/pkg/util/redact/redact.go +++ b/pkg/util/redact/redact.go @@ -25,6 +25,7 @@ import ( "strings" "github.com/pingcap/errors" + "github.com/pingcap/tidb/pkg/util/intest" ) var ( @@ -50,7 +51,11 @@ func String(mode string, input string) string { return b.String() case "OFF": return input + case "ON": + return "" default: + // should never happen + intest.Assert(false, "invalid redact mode") return "" } }