From 9947db86110e642992cb7bc65b8b8f71a973f301 Mon Sep 17 00:00:00 2001 From: wjHuang Date: Tue, 19 May 2020 18:09:44 +0800 Subject: [PATCH 1/6] cherry pick #16984 to release-4.0 Signed-off-by: sre-bot --- executor/set.go | 35 ++++++++++++++++++++++++++++++----- executor/set_test.go | 2 +- go.mod | 6 +++++- go.sum | 9 +++++++-- sessionctx/variable/sysvar.go | 6 ++++++ 5 files changed, 49 insertions(+), 9 deletions(-) diff --git a/executor/set.go b/executor/set.go index 3ecc8fba9a938..6af3a8b46bd04 100644 --- a/executor/set.go +++ b/executor/set.go @@ -55,10 +55,10 @@ func (e *SetExecutor) Next(ctx context.Context, req *chunk.Chunk) error { sessionVars := e.ctx.GetSessionVars() for _, v := range e.vars { // Variable is case insensitive, we use lower case. - if v.Name == ast.SetNames { + if v.Name == ast.SetNames || v.Name == ast.SetCharset { // This is set charset stmt. if v.IsDefault { - err := e.setCharset(mysql.DefaultCharset, "") + err := e.setCharset(mysql.DefaultCharset, "", v.Name == ast.SetNames) if err != nil { return err } @@ -73,7 +73,7 @@ func (e *SetExecutor) Next(ctx context.Context, req *chunk.Chunk) error { if v.ExtendValue != nil { co = v.ExtendValue.Value.GetString() } - err = e.setCharset(cs, co) + err = e.setCharset(cs, co, v.Name == ast.SetNames) if err != nil { return err } @@ -232,7 +232,7 @@ func (e *SetExecutor) setSysVariable(name string, v *expression.VarAssignment) e return nil } -func (e *SetExecutor) setCharset(cs, co string) error { +func (e *SetExecutor) setCharset(cs, co string, isSetName bool) error { var err error if len(co) == 0 { if co, err = charset.GetDefaultCollation(cs); err != nil { @@ -248,12 +248,37 @@ func (e *SetExecutor) setCharset(cs, co string) error { } } sessionVars := e.ctx.GetSessionVars() - for _, v := range variable.SetNamesVariables { + if isSetName { + for _, v := range variable.SetNamesVariables { + if err = sessionVars.SetSystemVar(v, cs); err != nil { + return errors.Trace(err) + } + } + return errors.Trace(sessionVars.SetSystemVar(variable.CollationConnection, co)) + } + // Set charset statement, see also https://dev.mysql.com/doc/refman/8.0/en/set-character-set.html. + for _, v := range variable.SetCharsetVariables { if err = sessionVars.SetSystemVar(v, cs); err != nil { return errors.Trace(err) } } +<<<<<<< HEAD return errors.Trace(sessionVars.SetSystemVar(variable.CollationConnection, co)) +======= + csDb, err := sessionVars.GlobalVarsAccessor.GetGlobalSysVar(variable.CharsetDatabase) + if err != nil { + return err + } + coDb, err := sessionVars.GlobalVarsAccessor.GetGlobalSysVar(variable.CollationDatabase) + if err != nil { + return err + } + err = sessionVars.SetSystemVar(variable.CharacterSetConnection, csDb) + if err != nil { + return errors.Trace(err) + } + return errors.Trace(sessionVars.SetSystemVar(variable.CollationConnection, coDb)) +>>>>>>> 838de2a... executor: fix wrong behavior of set charset statement (#16984) } func (e *SetExecutor) getVarValue(v *expression.VarAssignment, sysVar *variable.SysVar) (value types.Datum, err error) { diff --git a/executor/set_test.go b/executor/set_test.go index 89d0e9673d403..4a555da819eeb 100644 --- a/executor/set_test.go +++ b/executor/set_test.go @@ -499,7 +499,7 @@ func (s *testSuite5) TestSetCharset(c *C) { tk.MustExec(`SET CHARACTER SET latin1`) check( "latin1", - "latin1", + "utf8mb4", "latin1", "utf8mb4", "utf8mb4", diff --git a/go.mod b/go.mod index bfa8e5dbce24b..3a341feb0f0b6 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/danjacques/gofslock v0.0.0-20191023191349-0a45f885bc37 github.com/dgraph-io/ristretto v0.0.1 github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 - github.com/go-sql-driver/mysql v1.4.1 + github.com/go-sql-driver/mysql v1.5.0 github.com/gogo/protobuf v1.3.1 github.com/golang/protobuf v1.3.4 github.com/golang/snappy v0.0.1 @@ -30,7 +30,11 @@ require ( github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989 github.com/pingcap/kvproto v0.0.0-20200428135407-0f5ffe459677 github.com/pingcap/log v0.0.0-20200117041106-d28c14d3b1cd +<<<<<<< HEAD github.com/pingcap/parser v0.0.0-20200427031542-879c7bd4f27d +======= + github.com/pingcap/parser v0.0.0-20200515063435-34703eeb52b3 +>>>>>>> 838de2a... executor: fix wrong behavior of set charset statement (#16984) github.com/pingcap/pd/v4 v4.0.0-rc.1.0.20200422143320-428acd53eba2 github.com/pingcap/sysutil v0.0.0-20200408114249-ed3bd6f7fdb1 github.com/pingcap/tidb-tools v4.0.0-rc.1.0.20200421113014-507d2bb3a15e+incompatible diff --git a/go.sum b/go.sum index 8977a6ec29eb4..f4be18f6ab0fc 100644 --- a/go.sum +++ b/go.sum @@ -151,8 +151,9 @@ github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTM github.com/go-playground/overalls v0.0.0-20180201144345-22ec1a223b7c/go.mod h1:UqxAgEOt89sCiXlrc/ycnx00LVvUO/eS8tMUkWX4R7w= github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY= github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= -github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= +github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gogo/protobuf v0.0.0-20180717141946-636bf0302bc9/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -367,8 +368,13 @@ github.com/pingcap/log v0.0.0-20191012051959-b742a5d432e9/go.mod h1:4rbK1p9ILyIf github.com/pingcap/log v0.0.0-20200117041106-d28c14d3b1cd h1:CV3VsP3Z02MVtdpTMfEgRJ4T9NGgGTxdHpJerent7rM= github.com/pingcap/log v0.0.0-20200117041106-d28c14d3b1cd/go.mod h1:4rbK1p9ILyIfb6hU7OG2CiWSqMXnp3JMbiaVJ6mvoY8= github.com/pingcap/parser v0.0.0-20200424075042-8222d8b724a4/go.mod h1:9v0Edh8IbgjGYW2ArJr19E+bvL8zKahsFp+ixWeId+4= +<<<<<<< HEAD github.com/pingcap/parser v0.0.0-20200427031542-879c7bd4f27d h1:iXKcmBOj5v8Vw4jbiWdY0LKyhJinSwqd1Hwyi0NvxBY= github.com/pingcap/parser v0.0.0-20200427031542-879c7bd4f27d/go.mod h1:9v0Edh8IbgjGYW2ArJr19E+bvL8zKahsFp+ixWeId+4= +======= +github.com/pingcap/parser v0.0.0-20200515063435-34703eeb52b3 h1:zF4dhoVicadrmg5vc4ip4SuwdBc5H7kHryYxGB1EJIE= +github.com/pingcap/parser v0.0.0-20200515063435-34703eeb52b3/go.mod h1:vQdbJqobJAgFyiRNNtXahpMoGWwPEuWciVEK5A20NS0= +>>>>>>> 838de2a... executor: fix wrong behavior of set charset statement (#16984) github.com/pingcap/pd/v4 v4.0.0-rc.1.0.20200422143320-428acd53eba2 h1:JTzYYukREvxVSKW/ncrzNjFitd8snoQ/Xz32pw8i+s8= github.com/pingcap/pd/v4 v4.0.0-rc.1.0.20200422143320-428acd53eba2/go.mod h1:s+utZtXDznOiL24VK0qGmtoHjjXNsscJx3m1n8cC56s= github.com/pingcap/sysutil v0.0.0-20200206130906-2bfa6dc40bcd/go.mod h1:EB/852NMQ+aRKioCpToQ94Wl7fktV+FNnxf3CX/TTXI= @@ -723,7 +729,6 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.0.1-2020.1.3 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/sessionctx/variable/sysvar.go b/sessionctx/variable/sysvar.go index b6741a894229e..9e3391d5b7a9b 100644 --- a/sessionctx/variable/sysvar.go +++ b/sessionctx/variable/sysvar.go @@ -743,6 +743,12 @@ var SetNamesVariables = []string{ "character_set_results", } +// SetCharsetVariables is the system variable names related to set charset statements. +var SetCharsetVariables = []string{ + "character_set_client", + "character_set_results", +} + const ( // CharacterSetConnection is the name for character_set_connection system variable. CharacterSetConnection = "character_set_connection" From 003d27e670b1051e6c8c1d25544a576c108b0f97 Mon Sep 17 00:00:00 2001 From: wjHuang Date: Wed, 20 May 2020 12:01:39 +0800 Subject: [PATCH 2/6] Update set.go --- executor/set.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/executor/set.go b/executor/set.go index 6af3a8b46bd04..897377d59588f 100644 --- a/executor/set.go +++ b/executor/set.go @@ -262,9 +262,6 @@ func (e *SetExecutor) setCharset(cs, co string, isSetName bool) error { return errors.Trace(err) } } -<<<<<<< HEAD - return errors.Trace(sessionVars.SetSystemVar(variable.CollationConnection, co)) -======= csDb, err := sessionVars.GlobalVarsAccessor.GetGlobalSysVar(variable.CharsetDatabase) if err != nil { return err @@ -278,7 +275,6 @@ func (e *SetExecutor) setCharset(cs, co string, isSetName bool) error { return errors.Trace(err) } return errors.Trace(sessionVars.SetSystemVar(variable.CollationConnection, coDb)) ->>>>>>> 838de2a... executor: fix wrong behavior of set charset statement (#16984) } func (e *SetExecutor) getVarValue(v *expression.VarAssignment, sysVar *variable.SysVar) (value types.Datum, err error) { From cb4c05e753abd8eea143ae9c2fec7759ff8411e7 Mon Sep 17 00:00:00 2001 From: wjHuang Date: Wed, 20 May 2020 12:02:09 +0800 Subject: [PATCH 3/6] Update go.mod --- go.mod | 4 ---- 1 file changed, 4 deletions(-) diff --git a/go.mod b/go.mod index 3a341feb0f0b6..0a9544c2748e9 100644 --- a/go.mod +++ b/go.mod @@ -30,11 +30,7 @@ require ( github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989 github.com/pingcap/kvproto v0.0.0-20200428135407-0f5ffe459677 github.com/pingcap/log v0.0.0-20200117041106-d28c14d3b1cd -<<<<<<< HEAD - github.com/pingcap/parser v0.0.0-20200427031542-879c7bd4f27d -======= github.com/pingcap/parser v0.0.0-20200515063435-34703eeb52b3 ->>>>>>> 838de2a... executor: fix wrong behavior of set charset statement (#16984) github.com/pingcap/pd/v4 v4.0.0-rc.1.0.20200422143320-428acd53eba2 github.com/pingcap/sysutil v0.0.0-20200408114249-ed3bd6f7fdb1 github.com/pingcap/tidb-tools v4.0.0-rc.1.0.20200421113014-507d2bb3a15e+incompatible From e2593a280b70a80fd4386e3fc6d4398a3166adf3 Mon Sep 17 00:00:00 2001 From: wjHuang Date: Wed, 20 May 2020 12:02:37 +0800 Subject: [PATCH 4/6] Update go.sum --- go.sum | 5 ----- 1 file changed, 5 deletions(-) diff --git a/go.sum b/go.sum index f4be18f6ab0fc..62dfa2824c100 100644 --- a/go.sum +++ b/go.sum @@ -368,13 +368,8 @@ github.com/pingcap/log v0.0.0-20191012051959-b742a5d432e9/go.mod h1:4rbK1p9ILyIf github.com/pingcap/log v0.0.0-20200117041106-d28c14d3b1cd h1:CV3VsP3Z02MVtdpTMfEgRJ4T9NGgGTxdHpJerent7rM= github.com/pingcap/log v0.0.0-20200117041106-d28c14d3b1cd/go.mod h1:4rbK1p9ILyIfb6hU7OG2CiWSqMXnp3JMbiaVJ6mvoY8= github.com/pingcap/parser v0.0.0-20200424075042-8222d8b724a4/go.mod h1:9v0Edh8IbgjGYW2ArJr19E+bvL8zKahsFp+ixWeId+4= -<<<<<<< HEAD -github.com/pingcap/parser v0.0.0-20200427031542-879c7bd4f27d h1:iXKcmBOj5v8Vw4jbiWdY0LKyhJinSwqd1Hwyi0NvxBY= -github.com/pingcap/parser v0.0.0-20200427031542-879c7bd4f27d/go.mod h1:9v0Edh8IbgjGYW2ArJr19E+bvL8zKahsFp+ixWeId+4= -======= github.com/pingcap/parser v0.0.0-20200515063435-34703eeb52b3 h1:zF4dhoVicadrmg5vc4ip4SuwdBc5H7kHryYxGB1EJIE= github.com/pingcap/parser v0.0.0-20200515063435-34703eeb52b3/go.mod h1:vQdbJqobJAgFyiRNNtXahpMoGWwPEuWciVEK5A20NS0= ->>>>>>> 838de2a... executor: fix wrong behavior of set charset statement (#16984) github.com/pingcap/pd/v4 v4.0.0-rc.1.0.20200422143320-428acd53eba2 h1:JTzYYukREvxVSKW/ncrzNjFitd8snoQ/Xz32pw8i+s8= github.com/pingcap/pd/v4 v4.0.0-rc.1.0.20200422143320-428acd53eba2/go.mod h1:s+utZtXDznOiL24VK0qGmtoHjjXNsscJx3m1n8cC56s= github.com/pingcap/sysutil v0.0.0-20200206130906-2bfa6dc40bcd/go.mod h1:EB/852NMQ+aRKioCpToQ94Wl7fktV+FNnxf3CX/TTXI= From fd9ab6c90300c29c5648df201e2829bb5f1e42d7 Mon Sep 17 00:00:00 2001 From: wjhuang2016 Date: Wed, 8 Jul 2020 23:04:45 +0800 Subject: [PATCH 5/6] fix Signed-off-by: wjhuang2016 --- go.mod | 4 ++-- go.sum | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index d4d0fc7d97558..6ae45e9ab0a71 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989 github.com/pingcap/kvproto v0.0.0-20200518112156-d4aeb467de29 github.com/pingcap/log v0.0.0-20200511115504-543df19646ad - github.com/pingcap/parser v0.0.0-20200623164729-3a18f1e5dceb + github.com/pingcap/parser v0.0.0-20200708150102-420619df5c94 github.com/pingcap/pd/v4 v4.0.0-rc.2.0.20200520083007-2c251bd8f181 github.com/pingcap/sysutil v0.0.0-20200408114249-ed3bd6f7fdb1 github.com/pingcap/tidb-tools v4.0.0-rc.1.0.20200514040632-f76b3e428e19+incompatible @@ -54,7 +54,7 @@ require ( golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd - golang.org/x/text v0.3.2 + golang.org/x/text v0.3.3 golang.org/x/tools v0.0.0-20200325203130-f53864d0dba1 google.golang.org/grpc v1.26.0 gopkg.in/natefinch/lumberjack.v2 v2.0.0 diff --git a/go.sum b/go.sum index 92e1a0b350171..1d23c0e6d1fb4 100644 --- a/go.sum +++ b/go.sum @@ -412,6 +412,8 @@ github.com/pingcap/parser v0.0.0-20200507022230-f3bf29096657/go.mod h1:9v0Edh8Ib github.com/pingcap/parser v0.0.0-20200603032439-c4ecb4508d2f/go.mod h1:9v0Edh8IbgjGYW2ArJr19E+bvL8zKahsFp+ixWeId+4= github.com/pingcap/parser v0.0.0-20200623164729-3a18f1e5dceb h1:v9iX5qIr8nG3QxMtlcTT+1DI0YD4HqABy7tuohbp28E= github.com/pingcap/parser v0.0.0-20200623164729-3a18f1e5dceb/go.mod h1:vQdbJqobJAgFyiRNNtXahpMoGWwPEuWciVEK5A20NS0= +github.com/pingcap/parser v0.0.0-20200708150102-420619df5c94 h1:2ClwFuxJTpDMdjJesnr4bGX4uNRIMl6h8mN1gulFc2M= +github.com/pingcap/parser v0.0.0-20200708150102-420619df5c94/go.mod h1:vQdbJqobJAgFyiRNNtXahpMoGWwPEuWciVEK5A20NS0= github.com/pingcap/pd/v4 v4.0.0-rc.1.0.20200422143320-428acd53eba2/go.mod h1:s+utZtXDznOiL24VK0qGmtoHjjXNsscJx3m1n8cC56s= github.com/pingcap/pd/v4 v4.0.0-rc.2.0.20200520083007-2c251bd8f181 h1:FM+PzdoR3fmWAJx3ug+p5aOgs5aZYwFkoDL7Potdsz0= github.com/pingcap/pd/v4 v4.0.0-rc.2.0.20200520083007-2c251bd8f181/go.mod h1:q4HTx/bA8aKBa4S7L+SQKHvjRPXCRV0tA0yRw0qkZSA= @@ -697,6 +699,8 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ= From 177f0a5b6f8c115615b5f8a805cea02f098f8fcc Mon Sep 17 00:00:00 2001 From: wjhuang2016 Date: Wed, 8 Jul 2020 23:12:24 +0800 Subject: [PATCH 6/6] fix Signed-off-by: wjhuang2016 --- go.sum | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/go.sum b/go.sum index 1d23c0e6d1fb4..e18af30b94de3 100644 --- a/go.sum +++ b/go.sum @@ -410,8 +410,6 @@ github.com/pingcap/log v0.0.0-20200511115504-543df19646ad/go.mod h1:4rbK1p9ILyIf github.com/pingcap/parser v0.0.0-20200424075042-8222d8b724a4/go.mod h1:9v0Edh8IbgjGYW2ArJr19E+bvL8zKahsFp+ixWeId+4= github.com/pingcap/parser v0.0.0-20200507022230-f3bf29096657/go.mod h1:9v0Edh8IbgjGYW2ArJr19E+bvL8zKahsFp+ixWeId+4= github.com/pingcap/parser v0.0.0-20200603032439-c4ecb4508d2f/go.mod h1:9v0Edh8IbgjGYW2ArJr19E+bvL8zKahsFp+ixWeId+4= -github.com/pingcap/parser v0.0.0-20200623164729-3a18f1e5dceb h1:v9iX5qIr8nG3QxMtlcTT+1DI0YD4HqABy7tuohbp28E= -github.com/pingcap/parser v0.0.0-20200623164729-3a18f1e5dceb/go.mod h1:vQdbJqobJAgFyiRNNtXahpMoGWwPEuWciVEK5A20NS0= github.com/pingcap/parser v0.0.0-20200708150102-420619df5c94 h1:2ClwFuxJTpDMdjJesnr4bGX4uNRIMl6h8mN1gulFc2M= github.com/pingcap/parser v0.0.0-20200708150102-420619df5c94/go.mod h1:vQdbJqobJAgFyiRNNtXahpMoGWwPEuWciVEK5A20NS0= github.com/pingcap/pd/v4 v4.0.0-rc.1.0.20200422143320-428acd53eba2/go.mod h1:s+utZtXDznOiL24VK0qGmtoHjjXNsscJx3m1n8cC56s= @@ -821,6 +819,7 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +honnef.co/go/tools v0.0.1-2020.1.3 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=