From 0d9a4ce8b8c2a8cebbd4737a77a8307d8134946b Mon Sep 17 00:00:00 2001 From: Weizhen Wang Date: Mon, 6 Nov 2023 15:18:41 +0800 Subject: [PATCH] *: update linter (#48252) ref pingcap/tidb#40786 --- DEPS.bzl | 551 ++++++++++-------- Makefile | 2 +- br/pkg/restore/client.go | 71 ++- br/pkg/restore/db.go | 3 +- cmd/ddltest/random_test.go | 3 +- go.mod | 22 +- go.sum | 50 +- pkg/ddl/ddl_worker.go | 6 +- pkg/ddl/partition.go | 5 +- pkg/executor/adapter.go | 6 +- pkg/executor/builder.go | 7 +- pkg/executor/compiler.go | 6 +- pkg/executor/explain.go | 3 +- pkg/executor/explain_unit_test.go | 3 +- pkg/expression/bench_test.go | 54 +- pkg/expression/builtin_arithmetic.go | 123 ++-- pkg/expression/builtin_math.go | 3 +- pkg/kv/txn.go | 5 +- pkg/parser/misc.go | 3 +- pkg/parser/mysql/charset.go | 3 +- pkg/parser/mysql/locale_format.go | 5 +- pkg/planner/core/plan_cache_test.go | 3 +- .../privileges/tidb_auth_token_test.go | 53 +- pkg/server/conn.go | 6 +- pkg/server/internal/packetio.go | 23 +- pkg/session/session.go | 9 +- pkg/session/txn.go | 3 +- pkg/store/driver/txn/union_iter.go | 19 +- pkg/tidb-binlog/node/registry.go | 5 +- pkg/types/convert.go | 14 +- pkg/types/datum.go | 5 +- pkg/types/time.go | 3 +- pkg/util/collate/collate.go | 3 +- pkg/util/keydecoder/keydecoder.go | 7 +- pkg/util/selection/selection.go | 9 +- pkg/util/stmtsummary/evicted.go | 3 +- pkg/util/stmtsummary/statement_summary.go | 3 +- 37 files changed, 579 insertions(+), 523 deletions(-) diff --git a/DEPS.bzl b/DEPS.bzl index 1992b1c5cc860..78386fb6fb70d 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -60,13 +60,13 @@ def go_deps(): name = "co_honnef_go_tools", build_file_proto_mode = "disable_global", importpath = "honnef.co/go/tools", - sha256 = "3f7c266a830f3a0727ac0b85cd7cd74a765c05d337d73af20906219f1a4ec4c3", - strip_prefix = "honnef.co/go/tools@v0.4.5", + sha256 = "75fb3afa22970eebe3b157e8be9ae02775142f702f82fbe56c0e9189e3d285db", + strip_prefix = "honnef.co/go/tools@v0.4.6", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/honnef.co/go/tools/co_honnef_go_tools-v0.4.5.zip", - "http://ats.apps.svc/gomod/honnef.co/go/tools/co_honnef_go_tools-v0.4.5.zip", - "https://cache.hawkingrei.com/gomod/honnef.co/go/tools/co_honnef_go_tools-v0.4.5.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/honnef.co/go/tools/co_honnef_go_tools-v0.4.5.zip", + "http://bazel-cache.pingcap.net:8080/gomod/honnef.co/go/tools/co_honnef_go_tools-v0.4.6.zip", + "http://ats.apps.svc/gomod/honnef.co/go/tools/co_honnef_go_tools-v0.4.6.zip", + "https://cache.hawkingrei.com/gomod/honnef.co/go/tools/co_honnef_go_tools-v0.4.6.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/honnef.co/go/tools/co_honnef_go_tools-v0.4.6.zip", ], ) go_repository( @@ -99,26 +99,26 @@ def go_deps(): name = "com_github_4meepo_tagalign", build_file_proto_mode = "disable_global", importpath = "github.com/4meepo/tagalign", - sha256 = "c2c12312927c75ba64f7ed6338af29b10759d09e5cf990581df4de7bda727d08", - strip_prefix = "github.com/4meepo/tagalign@v1.2.2", + sha256 = "7787f1327d989f71ad57d73d86a771a4e5376268991c29e4361da0a69ddecfdf", + strip_prefix = "github.com/4meepo/tagalign@v1.3.3", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/4meepo/tagalign/com_github_4meepo_tagalign-v1.2.2.zip", - "http://ats.apps.svc/gomod/github.com/4meepo/tagalign/com_github_4meepo_tagalign-v1.2.2.zip", - "https://cache.hawkingrei.com/gomod/github.com/4meepo/tagalign/com_github_4meepo_tagalign-v1.2.2.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/4meepo/tagalign/com_github_4meepo_tagalign-v1.2.2.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/4meepo/tagalign/com_github_4meepo_tagalign-v1.3.3.zip", + "http://ats.apps.svc/gomod/github.com/4meepo/tagalign/com_github_4meepo_tagalign-v1.3.3.zip", + "https://cache.hawkingrei.com/gomod/github.com/4meepo/tagalign/com_github_4meepo_tagalign-v1.3.3.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/4meepo/tagalign/com_github_4meepo_tagalign-v1.3.3.zip", ], ) go_repository( name = "com_github_abirdcfly_dupword", build_file_proto_mode = "disable_global", importpath = "github.com/Abirdcfly/dupword", - sha256 = "05d0f75b3b4ce9e1f478eefc6e6996605f056a3c1a6a2175f0140e20dd26ce5b", - strip_prefix = "github.com/Abirdcfly/dupword@v0.0.11", + sha256 = "dc4f47aeb49f248e75680fa61f10573b5d39412c4ee29a854c0cc6a1e072d9e4", + strip_prefix = "github.com/Abirdcfly/dupword@v0.0.13", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/Abirdcfly/dupword/com_github_abirdcfly_dupword-v0.0.11.zip", - "http://ats.apps.svc/gomod/github.com/Abirdcfly/dupword/com_github_abirdcfly_dupword-v0.0.11.zip", - "https://cache.hawkingrei.com/gomod/github.com/Abirdcfly/dupword/com_github_abirdcfly_dupword-v0.0.11.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/Abirdcfly/dupword/com_github_abirdcfly_dupword-v0.0.11.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/Abirdcfly/dupword/com_github_abirdcfly_dupword-v0.0.13.zip", + "http://ats.apps.svc/gomod/github.com/Abirdcfly/dupword/com_github_abirdcfly_dupword-v0.0.13.zip", + "https://cache.hawkingrei.com/gomod/github.com/Abirdcfly/dupword/com_github_abirdcfly_dupword-v0.0.13.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/Abirdcfly/dupword/com_github_abirdcfly_dupword-v0.0.13.zip", ], ) go_repository( @@ -160,6 +160,19 @@ def go_deps(): "https://storage.googleapis.com/pingcapmirror/gomod/github.com/ajstarks/svgo/com_github_ajstarks_svgo-v0.0.0-20180226025133-644b8db467af.zip", ], ) + go_repository( + name = "com_github_alecthomas_go_check_sumtype", + build_file_proto_mode = "disable_global", + importpath = "github.com/alecthomas/go-check-sumtype", + sha256 = "409b9aeffa127c273faa0517f7194786d7cd48b6ae52223358ea1ce44f24578f", + strip_prefix = "github.com/alecthomas/go-check-sumtype@v0.1.3", + urls = [ + "http://bazel-cache.pingcap.net:8080/gomod/github.com/alecthomas/go-check-sumtype/com_github_alecthomas_go_check_sumtype-v0.1.3.zip", + "http://ats.apps.svc/gomod/github.com/alecthomas/go-check-sumtype/com_github_alecthomas_go_check_sumtype-v0.1.3.zip", + "https://cache.hawkingrei.com/gomod/github.com/alecthomas/go-check-sumtype/com_github_alecthomas_go_check_sumtype-v0.1.3.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/alecthomas/go-check-sumtype/com_github_alecthomas_go_check_sumtype-v0.1.3.zip", + ], + ) go_repository( name = "com_github_alecthomas_kingpin_v2", build_file_proto_mode = "disable_global", @@ -294,26 +307,39 @@ def go_deps(): name = "com_github_antonboom_errname", build_file_proto_mode = "disable_global", importpath = "github.com/Antonboom/errname", - sha256 = "00104bccf0cd84066ed858faf0e529110769ad08823937306576b8cd2d8a2872", - strip_prefix = "github.com/Antonboom/errname@v0.1.10", + sha256 = "b153fac1a78bbeb14a1e2898307bdbb683dd62bd0f3e7a2a99610b9865081438", + strip_prefix = "github.com/Antonboom/errname@v0.1.12", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/Antonboom/errname/com_github_antonboom_errname-v0.1.10.zip", - "http://ats.apps.svc/gomod/github.com/Antonboom/errname/com_github_antonboom_errname-v0.1.10.zip", - "https://cache.hawkingrei.com/gomod/github.com/Antonboom/errname/com_github_antonboom_errname-v0.1.10.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/Antonboom/errname/com_github_antonboom_errname-v0.1.10.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/Antonboom/errname/com_github_antonboom_errname-v0.1.12.zip", + "http://ats.apps.svc/gomod/github.com/Antonboom/errname/com_github_antonboom_errname-v0.1.12.zip", + "https://cache.hawkingrei.com/gomod/github.com/Antonboom/errname/com_github_antonboom_errname-v0.1.12.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/Antonboom/errname/com_github_antonboom_errname-v0.1.12.zip", ], ) go_repository( name = "com_github_antonboom_nilnil", build_file_proto_mode = "disable_global", importpath = "github.com/Antonboom/nilnil", - sha256 = "8775b711b5b8fce6fb602864d963d814015665a54b0e34497e99ca497f157536", - strip_prefix = "github.com/Antonboom/nilnil@v0.1.5", + sha256 = "f82e42fd3a6601252d881b50ba52d91131a981e3835cc160c55c4735734feade", + strip_prefix = "github.com/Antonboom/nilnil@v0.1.7", + urls = [ + "http://bazel-cache.pingcap.net:8080/gomod/github.com/Antonboom/nilnil/com_github_antonboom_nilnil-v0.1.7.zip", + "http://ats.apps.svc/gomod/github.com/Antonboom/nilnil/com_github_antonboom_nilnil-v0.1.7.zip", + "https://cache.hawkingrei.com/gomod/github.com/Antonboom/nilnil/com_github_antonboom_nilnil-v0.1.7.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/Antonboom/nilnil/com_github_antonboom_nilnil-v0.1.7.zip", + ], + ) + go_repository( + name = "com_github_antonboom_testifylint", + build_file_proto_mode = "disable_global", + importpath = "github.com/Antonboom/testifylint", + sha256 = "d509531befb3841e7fe73f5ccf3351ddc15b4c1bfbfe84846b8714c770825abb", + strip_prefix = "github.com/Antonboom/testifylint@v0.2.3", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/Antonboom/nilnil/com_github_antonboom_nilnil-v0.1.5.zip", - "http://ats.apps.svc/gomod/github.com/Antonboom/nilnil/com_github_antonboom_nilnil-v0.1.5.zip", - "https://cache.hawkingrei.com/gomod/github.com/Antonboom/nilnil/com_github_antonboom_nilnil-v0.1.5.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/Antonboom/nilnil/com_github_antonboom_nilnil-v0.1.5.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/Antonboom/testifylint/com_github_antonboom_testifylint-v0.2.3.zip", + "http://ats.apps.svc/gomod/github.com/Antonboom/testifylint/com_github_antonboom_testifylint-v0.2.3.zip", + "https://cache.hawkingrei.com/gomod/github.com/Antonboom/testifylint/com_github_antonboom_testifylint-v0.2.3.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/Antonboom/testifylint/com_github_antonboom_testifylint-v0.2.3.zip", ], ) go_repository( @@ -411,13 +437,13 @@ def go_deps(): name = "com_github_ashanbrown_forbidigo", build_file_proto_mode = "disable_global", importpath = "github.com/ashanbrown/forbidigo", - sha256 = "0742635d0a4f168b096cfb072107cde160c0cf29a65005e36ba29f78b2c697c8", - strip_prefix = "github.com/ashanbrown/forbidigo@v1.5.3", + sha256 = "42476799732e399e46d47ced87090adb564f58c68097446296451cbae9e5580d", + strip_prefix = "github.com/ashanbrown/forbidigo@v1.6.0", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/ashanbrown/forbidigo/com_github_ashanbrown_forbidigo-v1.5.3.zip", - "http://ats.apps.svc/gomod/github.com/ashanbrown/forbidigo/com_github_ashanbrown_forbidigo-v1.5.3.zip", - "https://cache.hawkingrei.com/gomod/github.com/ashanbrown/forbidigo/com_github_ashanbrown_forbidigo-v1.5.3.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/ashanbrown/forbidigo/com_github_ashanbrown_forbidigo-v1.5.3.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/ashanbrown/forbidigo/com_github_ashanbrown_forbidigo-v1.6.0.zip", + "http://ats.apps.svc/gomod/github.com/ashanbrown/forbidigo/com_github_ashanbrown_forbidigo-v1.6.0.zip", + "https://cache.hawkingrei.com/gomod/github.com/ashanbrown/forbidigo/com_github_ashanbrown_forbidigo-v1.6.0.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/ashanbrown/forbidigo/com_github_ashanbrown_forbidigo-v1.6.0.zip", ], ) go_repository( @@ -710,26 +736,26 @@ def go_deps(): name = "com_github_breml_bidichk", build_file_proto_mode = "disable_global", importpath = "github.com/breml/bidichk", - sha256 = "c5a3b55eb8cf5e5d4839d7df414265c2a25fcd86e1377455ff95d6c059a38158", - strip_prefix = "github.com/breml/bidichk@v0.2.4", + sha256 = "ceab3b883c2afc022dbc17831abadf3ffb1ddea7be9bdf200d9d98b84cce46e8", + strip_prefix = "github.com/breml/bidichk@v0.2.7", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/breml/bidichk/com_github_breml_bidichk-v0.2.4.zip", - "http://ats.apps.svc/gomod/github.com/breml/bidichk/com_github_breml_bidichk-v0.2.4.zip", - "https://cache.hawkingrei.com/gomod/github.com/breml/bidichk/com_github_breml_bidichk-v0.2.4.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/breml/bidichk/com_github_breml_bidichk-v0.2.4.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/breml/bidichk/com_github_breml_bidichk-v0.2.7.zip", + "http://ats.apps.svc/gomod/github.com/breml/bidichk/com_github_breml_bidichk-v0.2.7.zip", + "https://cache.hawkingrei.com/gomod/github.com/breml/bidichk/com_github_breml_bidichk-v0.2.7.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/breml/bidichk/com_github_breml_bidichk-v0.2.7.zip", ], ) go_repository( name = "com_github_breml_errchkjson", build_file_proto_mode = "disable_global", importpath = "github.com/breml/errchkjson", - sha256 = "51ffd04e0d0fb51880ea0f89b50256c166c88c98d7772990152b4247f764bcf4", - strip_prefix = "github.com/breml/errchkjson@v0.3.1", + sha256 = "ce3fa45f053a2df5c88273addb0e4abeaada62ba7225e9e6248df43ca2aa1013", + strip_prefix = "github.com/breml/errchkjson@v0.3.6", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/breml/errchkjson/com_github_breml_errchkjson-v0.3.1.zip", - "http://ats.apps.svc/gomod/github.com/breml/errchkjson/com_github_breml_errchkjson-v0.3.1.zip", - "https://cache.hawkingrei.com/gomod/github.com/breml/errchkjson/com_github_breml_errchkjson-v0.3.1.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/breml/errchkjson/com_github_breml_errchkjson-v0.3.1.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/breml/errchkjson/com_github_breml_errchkjson-v0.3.6.zip", + "http://ats.apps.svc/gomod/github.com/breml/errchkjson/com_github_breml_errchkjson-v0.3.6.zip", + "https://cache.hawkingrei.com/gomod/github.com/breml/errchkjson/com_github_breml_errchkjson-v0.3.6.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/breml/errchkjson/com_github_breml_errchkjson-v0.3.6.zip", ], ) go_repository( @@ -762,13 +788,13 @@ def go_deps(): name = "com_github_butuzov_ireturn", build_file_proto_mode = "disable_global", importpath = "github.com/butuzov/ireturn", - sha256 = "b7112c147f4c1094d9d44fdc695990ed4cdfba1d72b9f1427a86734a3ee544f6", - strip_prefix = "github.com/butuzov/ireturn@v0.2.0", + sha256 = "6f3b47a8245986f1c1bcb4ebf737c53e603974b653a2e42eb0677211b6468193", + strip_prefix = "github.com/butuzov/ireturn@v0.2.2", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/butuzov/ireturn/com_github_butuzov_ireturn-v0.2.0.zip", - "http://ats.apps.svc/gomod/github.com/butuzov/ireturn/com_github_butuzov_ireturn-v0.2.0.zip", - "https://cache.hawkingrei.com/gomod/github.com/butuzov/ireturn/com_github_butuzov_ireturn-v0.2.0.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/butuzov/ireturn/com_github_butuzov_ireturn-v0.2.0.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/butuzov/ireturn/com_github_butuzov_ireturn-v0.2.2.zip", + "http://ats.apps.svc/gomod/github.com/butuzov/ireturn/com_github_butuzov_ireturn-v0.2.2.zip", + "https://cache.hawkingrei.com/gomod/github.com/butuzov/ireturn/com_github_butuzov_ireturn-v0.2.2.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/butuzov/ireturn/com_github_butuzov_ireturn-v0.2.2.zip", ], ) go_repository( @@ -797,6 +823,32 @@ def go_deps(): "https://storage.googleapis.com/pingcapmirror/gomod/github.com/carlmjohnson/flagext/com_github_carlmjohnson_flagext-v0.21.0.zip", ], ) + go_repository( + name = "com_github_catenacyber_perfsprint", + build_file_proto_mode = "disable_global", + importpath = "github.com/catenacyber/perfsprint", + sha256 = "284f41f42fc52972fe0b49fb9a0e4fe301b2b213644d2541b0eaf14f76573175", + strip_prefix = "github.com/catenacyber/perfsprint@v0.2.0", + urls = [ + "http://bazel-cache.pingcap.net:8080/gomod/github.com/catenacyber/perfsprint/com_github_catenacyber_perfsprint-v0.2.0.zip", + "http://ats.apps.svc/gomod/github.com/catenacyber/perfsprint/com_github_catenacyber_perfsprint-v0.2.0.zip", + "https://cache.hawkingrei.com/gomod/github.com/catenacyber/perfsprint/com_github_catenacyber_perfsprint-v0.2.0.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/catenacyber/perfsprint/com_github_catenacyber_perfsprint-v0.2.0.zip", + ], + ) + go_repository( + name = "com_github_ccojocar_zxcvbn_go", + build_file_proto_mode = "disable_global", + importpath = "github.com/ccojocar/zxcvbn-go", + sha256 = "28a5c8e53d71b5d34b182126a8828c5a5138cbd26f1732ba18416d77fae9533a", + strip_prefix = "github.com/ccojocar/zxcvbn-go@v1.0.1", + urls = [ + "http://bazel-cache.pingcap.net:8080/gomod/github.com/ccojocar/zxcvbn-go/com_github_ccojocar_zxcvbn_go-v1.0.1.zip", + "http://ats.apps.svc/gomod/github.com/ccojocar/zxcvbn-go/com_github_ccojocar_zxcvbn_go-v1.0.1.zip", + "https://cache.hawkingrei.com/gomod/github.com/ccojocar/zxcvbn-go/com_github_ccojocar_zxcvbn_go-v1.0.1.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/ccojocar/zxcvbn-go/com_github_ccojocar_zxcvbn_go-v1.0.1.zip", + ], + ) go_repository( name = "com_github_cenk_backoff", build_file_proto_mode = "disable_global", @@ -892,13 +944,13 @@ def go_deps(): name = "com_github_chavacava_garif", build_file_proto_mode = "disable_global", importpath = "github.com/chavacava/garif", - sha256 = "3fd289252a687a412e11f3b99670cb877740ecefa6555bc56c985a907fed58d3", - strip_prefix = "github.com/chavacava/garif@v0.0.0-20230519080132-4752330f72df", + sha256 = "b1dfcd738139918fc2008bea5115fb9ddbbf2dc361d65448c47101a23072f088", + strip_prefix = "github.com/chavacava/garif@v0.1.0", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/chavacava/garif/com_github_chavacava_garif-v0.0.0-20230519080132-4752330f72df.zip", - "http://ats.apps.svc/gomod/github.com/chavacava/garif/com_github_chavacava_garif-v0.0.0-20230519080132-4752330f72df.zip", - "https://cache.hawkingrei.com/gomod/github.com/chavacava/garif/com_github_chavacava_garif-v0.0.0-20230519080132-4752330f72df.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/chavacava/garif/com_github_chavacava_garif-v0.0.0-20230519080132-4752330f72df.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/chavacava/garif/com_github_chavacava_garif-v0.1.0.zip", + "http://ats.apps.svc/gomod/github.com/chavacava/garif/com_github_chavacava_garif-v0.1.0.zip", + "https://cache.hawkingrei.com/gomod/github.com/chavacava/garif/com_github_chavacava_garif-v0.1.0.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/chavacava/garif/com_github_chavacava_garif-v0.1.0.zip", ], ) go_repository( @@ -1399,13 +1451,13 @@ def go_deps(): name = "com_github_daixiang0_gci", build_file_proto_mode = "disable_global", importpath = "github.com/daixiang0/gci", - sha256 = "77a220852b41432c0b81aab22d95bc929c9c0092ac294b4dded0960a7705430e", - strip_prefix = "github.com/daixiang0/gci@v0.11.0", + sha256 = "2f60052212e597726044c69cebccc20c64e6e26b78beb02aedcf8c9d75aaa6f7", + strip_prefix = "github.com/daixiang0/gci@v0.11.2", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/daixiang0/gci/com_github_daixiang0_gci-v0.11.0.zip", - "http://ats.apps.svc/gomod/github.com/daixiang0/gci/com_github_daixiang0_gci-v0.11.0.zip", - "https://cache.hawkingrei.com/gomod/github.com/daixiang0/gci/com_github_daixiang0_gci-v0.11.0.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/daixiang0/gci/com_github_daixiang0_gci-v0.11.0.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/daixiang0/gci/com_github_daixiang0_gci-v0.11.2.zip", + "http://ats.apps.svc/gomod/github.com/daixiang0/gci/com_github_daixiang0_gci-v0.11.2.zip", + "https://cache.hawkingrei.com/gomod/github.com/daixiang0/gci/com_github_daixiang0_gci-v0.11.2.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/daixiang0/gci/com_github_daixiang0_gci-v0.11.2.zip", ], ) go_repository( @@ -2020,16 +2072,16 @@ def go_deps(): ], ) go_repository( - name = "com_github_gaijinentertainment_go_exhaustruct_v2", + name = "com_github_gaijinentertainment_go_exhaustruct_v3", build_file_proto_mode = "disable_global", - importpath = "github.com/GaijinEntertainment/go-exhaustruct/v2", - sha256 = "a986daa48826c4aa5ecf6d8c28e40543029f75e7f295bbce8758f5391ab24c30", - strip_prefix = "github.com/GaijinEntertainment/go-exhaustruct/v2@v2.3.0", + importpath = "github.com/GaijinEntertainment/go-exhaustruct/v3", + sha256 = "e9b9a89a5b33a648e82cbcb5e84095825f473e0e8951a1a5f75d6f21dbac4a9a", + strip_prefix = "github.com/GaijinEntertainment/go-exhaustruct/v3@v3.1.0", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/GaijinEntertainment/go-exhaustruct/v2/com_github_gaijinentertainment_go_exhaustruct_v2-v2.3.0.zip", - "http://ats.apps.svc/gomod/github.com/GaijinEntertainment/go-exhaustruct/v2/com_github_gaijinentertainment_go_exhaustruct_v2-v2.3.0.zip", - "https://cache.hawkingrei.com/gomod/github.com/GaijinEntertainment/go-exhaustruct/v2/com_github_gaijinentertainment_go_exhaustruct_v2-v2.3.0.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/GaijinEntertainment/go-exhaustruct/v2/com_github_gaijinentertainment_go_exhaustruct_v2-v2.3.0.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/GaijinEntertainment/go-exhaustruct/v3/com_github_gaijinentertainment_go_exhaustruct_v3-v3.1.0.zip", + "http://ats.apps.svc/gomod/github.com/GaijinEntertainment/go-exhaustruct/v3/com_github_gaijinentertainment_go_exhaustruct_v3-v3.1.0.zip", + "https://cache.hawkingrei.com/gomod/github.com/GaijinEntertainment/go-exhaustruct/v3/com_github_gaijinentertainment_go_exhaustruct_v3-v3.1.0.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/GaijinEntertainment/go-exhaustruct/v3/com_github_gaijinentertainment_go_exhaustruct_v3-v3.1.0.zip", ], ) go_repository( @@ -2084,6 +2136,19 @@ def go_deps(): "https://storage.googleapis.com/pingcapmirror/gomod/github.com/ghodss/yaml/com_github_ghodss_yaml-v1.0.0.zip", ], ) + go_repository( + name = "com_github_ghostiam_protogetter", + build_file_proto_mode = "disable_global", + importpath = "github.com/ghostiam/protogetter", + sha256 = "b466f595a4dce4f118a1163961d8ae3c0b05729fde154d61130013a34f352b17", + strip_prefix = "github.com/ghostiam/protogetter@v0.2.3", + urls = [ + "http://bazel-cache.pingcap.net:8080/gomod/github.com/ghostiam/protogetter/com_github_ghostiam_protogetter-v0.2.3.zip", + "http://ats.apps.svc/gomod/github.com/ghostiam/protogetter/com_github_ghostiam_protogetter-v0.2.3.zip", + "https://cache.hawkingrei.com/gomod/github.com/ghostiam/protogetter/com_github_ghostiam_protogetter-v0.2.3.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/ghostiam/protogetter/com_github_ghostiam_protogetter-v0.2.3.zip", + ], + ) go_repository( name = "com_github_gin_contrib_sse", build_file_proto_mode = "disable_global", @@ -2140,13 +2205,13 @@ def go_deps(): name = "com_github_go_critic_go_critic", build_file_proto_mode = "disable_global", importpath = "github.com/go-critic/go-critic", - sha256 = "cf7b586c837066c441d20f8174ec224a935aab15015e09a607b103df0c800f68", - strip_prefix = "github.com/go-critic/go-critic@v0.8.1", + sha256 = "20a7e573cffd388ffe7773cec8decd05871403962feae774709f32b70fb132ae", + strip_prefix = "github.com/go-critic/go-critic@v0.9.0", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/go-critic/go-critic/com_github_go_critic_go_critic-v0.8.1.zip", - "http://ats.apps.svc/gomod/github.com/go-critic/go-critic/com_github_go_critic_go_critic-v0.8.1.zip", - "https://cache.hawkingrei.com/gomod/github.com/go-critic/go-critic/com_github_go_critic_go_critic-v0.8.1.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/go-critic/go-critic/com_github_go_critic_go_critic-v0.8.1.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/go-critic/go-critic/com_github_go_critic_go_critic-v0.9.0.zip", + "http://ats.apps.svc/gomod/github.com/go-critic/go-critic/com_github_go_critic_go_critic-v0.9.0.zip", + "https://cache.hawkingrei.com/gomod/github.com/go-critic/go-critic/com_github_go_critic_go_critic-v0.9.0.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/go-critic/go-critic/com_github_go_critic_go_critic-v0.9.0.zip", ], ) go_repository( @@ -2768,26 +2833,26 @@ def go_deps(): name = "com_github_golangci_gofmt", build_file_proto_mode = "disable_global", importpath = "github.com/golangci/gofmt", - sha256 = "a63a454321bbe42e183f26af761619abf8a719f94509a9a45e31a223e9ea0e8b", - strip_prefix = "github.com/golangci/gofmt@v0.0.0-20220901101216-f2edd75033f2", + sha256 = "a60cb0138a40d62b71333b964a9b89af6c94a86bf3a44e707f0ddcc8bf33de29", + strip_prefix = "github.com/golangci/gofmt@v0.0.0-20231018234816-f50ced29576e", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/golangci/gofmt/com_github_golangci_gofmt-v0.0.0-20220901101216-f2edd75033f2.zip", - "http://ats.apps.svc/gomod/github.com/golangci/gofmt/com_github_golangci_gofmt-v0.0.0-20220901101216-f2edd75033f2.zip", - "https://cache.hawkingrei.com/gomod/github.com/golangci/gofmt/com_github_golangci_gofmt-v0.0.0-20220901101216-f2edd75033f2.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/golangci/gofmt/com_github_golangci_gofmt-v0.0.0-20220901101216-f2edd75033f2.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/golangci/gofmt/com_github_golangci_gofmt-v0.0.0-20231018234816-f50ced29576e.zip", + "http://ats.apps.svc/gomod/github.com/golangci/gofmt/com_github_golangci_gofmt-v0.0.0-20231018234816-f50ced29576e.zip", + "https://cache.hawkingrei.com/gomod/github.com/golangci/gofmt/com_github_golangci_gofmt-v0.0.0-20231018234816-f50ced29576e.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/golangci/gofmt/com_github_golangci_gofmt-v0.0.0-20231018234816-f50ced29576e.zip", ], ) go_repository( name = "com_github_golangci_golangci_lint", build_file_proto_mode = "disable_global", importpath = "github.com/golangci/golangci-lint", - sha256 = "3ec6861b33364182de20466c4745f463dfd9ce64f7d0d3d75196d3ad21152e08", - strip_prefix = "github.com/golangci/golangci-lint@v1.53.3", + sha256 = "1a42d185d1de4cc7aa7732c4047f001e699104b20ebd799e80c0c8ee87b84874", + strip_prefix = "github.com/golangci/golangci-lint@v1.55.2", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/golangci/golangci-lint/com_github_golangci_golangci_lint-v1.53.3.zip", - "http://ats.apps.svc/gomod/github.com/golangci/golangci-lint/com_github_golangci_golangci_lint-v1.53.3.zip", - "https://cache.hawkingrei.com/gomod/github.com/golangci/golangci-lint/com_github_golangci_golangci_lint-v1.53.3.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/golangci/golangci-lint/com_github_golangci_golangci_lint-v1.53.3.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/golangci/golangci-lint/com_github_golangci_golangci_lint-v1.55.2.zip", + "http://ats.apps.svc/gomod/github.com/golangci/golangci-lint/com_github_golangci_golangci_lint-v1.55.2.zip", + "https://cache.hawkingrei.com/gomod/github.com/golangci/golangci-lint/com_github_golangci_golangci_lint-v1.55.2.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/golangci/golangci-lint/com_github_golangci_golangci_lint-v1.55.2.zip", ], ) go_repository( @@ -2833,13 +2898,13 @@ def go_deps(): name = "com_github_golangci_misspell", build_file_proto_mode = "disable_global", importpath = "github.com/golangci/misspell", - sha256 = "6b48c93d2d09497940671e66dd1793648ce76286fec0f368764422765df7a153", - strip_prefix = "github.com/golangci/misspell@v0.4.0", + sha256 = "5792fe3dd490249e6288020ff82c72a716ebaf52a8e99fe787b908423587fba3", + strip_prefix = "github.com/golangci/misspell@v0.4.1", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/golangci/misspell/com_github_golangci_misspell-v0.4.0.zip", - "http://ats.apps.svc/gomod/github.com/golangci/misspell/com_github_golangci_misspell-v0.4.0.zip", - "https://cache.hawkingrei.com/gomod/github.com/golangci/misspell/com_github_golangci_misspell-v0.4.0.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/golangci/misspell/com_github_golangci_misspell-v0.4.0.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/golangci/misspell/com_github_golangci_misspell-v0.4.1.zip", + "http://ats.apps.svc/gomod/github.com/golangci/misspell/com_github_golangci_misspell-v0.4.1.zip", + "https://cache.hawkingrei.com/gomod/github.com/golangci/misspell/com_github_golangci_misspell-v0.4.1.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/golangci/misspell/com_github_golangci_misspell-v0.4.1.zip", ], ) go_repository( @@ -2859,13 +2924,13 @@ def go_deps(): name = "com_github_golangci_revgrep", build_file_proto_mode = "disable_global", importpath = "github.com/golangci/revgrep", - sha256 = "70b471277ad59e3e8393090769ca6f0ab7e670067fdf559fba429404adbdb66f", - strip_prefix = "github.com/golangci/revgrep@v0.0.0-20220804021717-745bb2f7c2e6", + sha256 = "0806458bba9e33b3a3566e5f246ed4be0f356695606c5987974effbc9081f750", + strip_prefix = "github.com/golangci/revgrep@v0.5.2", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/golangci/revgrep/com_github_golangci_revgrep-v0.0.0-20220804021717-745bb2f7c2e6.zip", - "http://ats.apps.svc/gomod/github.com/golangci/revgrep/com_github_golangci_revgrep-v0.0.0-20220804021717-745bb2f7c2e6.zip", - "https://cache.hawkingrei.com/gomod/github.com/golangci/revgrep/com_github_golangci_revgrep-v0.0.0-20220804021717-745bb2f7c2e6.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/golangci/revgrep/com_github_golangci_revgrep-v0.0.0-20220804021717-745bb2f7c2e6.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/golangci/revgrep/com_github_golangci_revgrep-v0.5.2.zip", + "http://ats.apps.svc/gomod/github.com/golangci/revgrep/com_github_golangci_revgrep-v0.5.2.zip", + "https://cache.hawkingrei.com/gomod/github.com/golangci/revgrep/com_github_golangci_revgrep-v0.5.2.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/golangci/revgrep/com_github_golangci_revgrep-v0.5.2.zip", ], ) go_repository( @@ -2924,13 +2989,13 @@ def go_deps(): name = "com_github_google_go_cmp", build_file_proto_mode = "disable_global", importpath = "github.com/google/go-cmp", - sha256 = "32450874ac756ef5d47f6b819305105304b9819045a16e3f105289b7cf252c51", - strip_prefix = "github.com/google/go-cmp@v0.5.9", + sha256 = "4b4e9bf6c48211080651b491dfb48d68b736c66a305bcf94605606e1ba2eaa4a", + strip_prefix = "github.com/google/go-cmp@v0.6.0", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/google/go-cmp/com_github_google_go_cmp-v0.5.9.zip", - "http://ats.apps.svc/gomod/github.com/google/go-cmp/com_github_google_go_cmp-v0.5.9.zip", - "https://cache.hawkingrei.com/gomod/github.com/google/go-cmp/com_github_google_go_cmp-v0.5.9.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/google/go-cmp/com_github_google_go_cmp-v0.5.9.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/google/go-cmp/com_github_google_go_cmp-v0.6.0.zip", + "http://ats.apps.svc/gomod/github.com/google/go-cmp/com_github_google_go_cmp-v0.6.0.zip", + "https://cache.hawkingrei.com/gomod/github.com/google/go-cmp/com_github_google_go_cmp-v0.6.0.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/google/go-cmp/com_github_google_go_cmp-v0.6.0.zip", ], ) go_repository( @@ -4021,13 +4086,13 @@ def go_deps(): name = "com_github_jgautheron_goconst", build_file_proto_mode = "disable_global", importpath = "github.com/jgautheron/goconst", - sha256 = "4876028bfb5f28c607984ac39c4f293f94156ce71fa4ec0e8f7a88d326a80ff3", - strip_prefix = "github.com/jgautheron/goconst@v1.5.1", + sha256 = "3900864dc0a37053f44a49ba9564ef63a29ba811954944865c0f226882860611", + strip_prefix = "github.com/jgautheron/goconst@v1.6.0", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/jgautheron/goconst/com_github_jgautheron_goconst-v1.5.1.zip", - "http://ats.apps.svc/gomod/github.com/jgautheron/goconst/com_github_jgautheron_goconst-v1.5.1.zip", - "https://cache.hawkingrei.com/gomod/github.com/jgautheron/goconst/com_github_jgautheron_goconst-v1.5.1.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/jgautheron/goconst/com_github_jgautheron_goconst-v1.5.1.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/jgautheron/goconst/com_github_jgautheron_goconst-v1.6.0.zip", + "http://ats.apps.svc/gomod/github.com/jgautheron/goconst/com_github_jgautheron_goconst-v1.6.0.zip", + "https://cache.hawkingrei.com/gomod/github.com/jgautheron/goconst/com_github_jgautheron_goconst-v1.6.0.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/jgautheron/goconst/com_github_jgautheron_goconst-v1.6.0.zip", ], ) go_repository( @@ -4532,13 +4597,13 @@ def go_deps(): name = "com_github_kunwardeep_paralleltest", build_file_proto_mode = "disable_global", importpath = "github.com/kunwardeep/paralleltest", - sha256 = "11ed0c945e877a49c02db7533156b4b193e9ede9bbacc80d25a83aa230397f2e", - strip_prefix = "github.com/kunwardeep/paralleltest@v1.0.7", + sha256 = "5fb426aab6100e9c253524f4c518344515006511cc07def3444c0825811a48b3", + strip_prefix = "github.com/kunwardeep/paralleltest@v1.0.8", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/kunwardeep/paralleltest/com_github_kunwardeep_paralleltest-v1.0.7.zip", - "http://ats.apps.svc/gomod/github.com/kunwardeep/paralleltest/com_github_kunwardeep_paralleltest-v1.0.7.zip", - "https://cache.hawkingrei.com/gomod/github.com/kunwardeep/paralleltest/com_github_kunwardeep_paralleltest-v1.0.7.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/kunwardeep/paralleltest/com_github_kunwardeep_paralleltest-v1.0.7.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/kunwardeep/paralleltest/com_github_kunwardeep_paralleltest-v1.0.8.zip", + "http://ats.apps.svc/gomod/github.com/kunwardeep/paralleltest/com_github_kunwardeep_paralleltest-v1.0.8.zip", + "https://cache.hawkingrei.com/gomod/github.com/kunwardeep/paralleltest/com_github_kunwardeep_paralleltest-v1.0.8.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/kunwardeep/paralleltest/com_github_kunwardeep_paralleltest-v1.0.8.zip", ], ) go_repository( @@ -4762,6 +4827,19 @@ def go_deps(): "https://storage.googleapis.com/pingcapmirror/gomod/github.com/lufia/plan9stats/com_github_lufia_plan9stats-v0.0.0-20230326075908-cb1d2100619a.zip", ], ) + go_repository( + name = "com_github_macabu_inamedparam", + build_file_proto_mode = "disable_global", + importpath = "github.com/macabu/inamedparam", + sha256 = "af66a64c1bdf145a8adbde9f8fe5c35414f669583d9fc7b26d2c5cbdfab22488", + strip_prefix = "github.com/macabu/inamedparam@v0.1.2", + urls = [ + "http://bazel-cache.pingcap.net:8080/gomod/github.com/macabu/inamedparam/com_github_macabu_inamedparam-v0.1.2.zip", + "http://ats.apps.svc/gomod/github.com/macabu/inamedparam/com_github_macabu_inamedparam-v0.1.2.zip", + "https://cache.hawkingrei.com/gomod/github.com/macabu/inamedparam/com_github_macabu_inamedparam-v0.1.2.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/macabu/inamedparam/com_github_macabu_inamedparam-v0.1.2.zip", + ], + ) go_repository( name = "com_github_magiconair_properties", build_file_proto_mode = "disable_global", @@ -5000,13 +5078,13 @@ def go_deps(): name = "com_github_mgechev_revive", build_file_proto_mode = "disable_global", importpath = "github.com/mgechev/revive", - sha256 = "d75f7d9a082a19d7f6ae734856bd7f74ea2677c646afc73e0ecaf7859a51c5e7", - strip_prefix = "github.com/mgechev/revive@v1.3.2", + sha256 = "7a0f503e05a0695231ff5db9c659de9b53a12bc6dad1bc5e7f814ec2a12ea388", + strip_prefix = "github.com/mgechev/revive@v1.3.4", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/mgechev/revive/com_github_mgechev_revive-v1.3.2.zip", - "http://ats.apps.svc/gomod/github.com/mgechev/revive/com_github_mgechev_revive-v1.3.2.zip", - "https://cache.hawkingrei.com/gomod/github.com/mgechev/revive/com_github_mgechev_revive-v1.3.2.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/mgechev/revive/com_github_mgechev_revive-v1.3.2.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/mgechev/revive/com_github_mgechev_revive-v1.3.4.zip", + "http://ats.apps.svc/gomod/github.com/mgechev/revive/com_github_mgechev_revive-v1.3.4.zip", + "https://cache.hawkingrei.com/gomod/github.com/mgechev/revive/com_github_mgechev_revive-v1.3.4.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/mgechev/revive/com_github_mgechev_revive-v1.3.4.zip", ], ) go_repository( @@ -5416,13 +5494,13 @@ def go_deps(): name = "com_github_nunnatsa_ginkgolinter", build_file_proto_mode = "disable_global", importpath = "github.com/nunnatsa/ginkgolinter", - sha256 = "dc7a4a696f28be478f04811b033507e3801f0ad1d8e6f9fb20f2498cbe2bbe92", - strip_prefix = "github.com/nunnatsa/ginkgolinter@v0.12.1", + sha256 = "afb93d507b8abc9fa16888bc6fc289fab5724b822ccd9041d084f20f5ad5147a", + strip_prefix = "github.com/nunnatsa/ginkgolinter@v0.14.1", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/nunnatsa/ginkgolinter/com_github_nunnatsa_ginkgolinter-v0.12.1.zip", - "http://ats.apps.svc/gomod/github.com/nunnatsa/ginkgolinter/com_github_nunnatsa_ginkgolinter-v0.12.1.zip", - "https://cache.hawkingrei.com/gomod/github.com/nunnatsa/ginkgolinter/com_github_nunnatsa_ginkgolinter-v0.12.1.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/nunnatsa/ginkgolinter/com_github_nunnatsa_ginkgolinter-v0.12.1.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/nunnatsa/ginkgolinter/com_github_nunnatsa_ginkgolinter-v0.14.1.zip", + "http://ats.apps.svc/gomod/github.com/nunnatsa/ginkgolinter/com_github_nunnatsa_ginkgolinter-v0.14.1.zip", + "https://cache.hawkingrei.com/gomod/github.com/nunnatsa/ginkgolinter/com_github_nunnatsa_ginkgolinter-v0.14.1.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/nunnatsa/ginkgolinter/com_github_nunnatsa_ginkgolinter-v0.14.1.zip", ], ) go_repository( @@ -5936,13 +6014,13 @@ def go_deps(): name = "com_github_polyfloyd_go_errorlint", build_file_proto_mode = "disable_global", importpath = "github.com/polyfloyd/go-errorlint", - sha256 = "c0eeb2ec934ce4ded0816a26a3ec47b5e47bc91b4f69e348fdc0d7a8b8acdd01", - strip_prefix = "github.com/polyfloyd/go-errorlint@v1.4.2", + sha256 = "59c41c4bc66ca7c929e81b9282cc11600a88617f0515e5ab2b3fbb041182d9da", + strip_prefix = "github.com/polyfloyd/go-errorlint@v1.4.5", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/polyfloyd/go-errorlint/com_github_polyfloyd_go_errorlint-v1.4.2.zip", - "http://ats.apps.svc/gomod/github.com/polyfloyd/go-errorlint/com_github_polyfloyd_go_errorlint-v1.4.2.zip", - "https://cache.hawkingrei.com/gomod/github.com/polyfloyd/go-errorlint/com_github_polyfloyd_go_errorlint-v1.4.2.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/polyfloyd/go-errorlint/com_github_polyfloyd_go_errorlint-v1.4.2.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/polyfloyd/go-errorlint/com_github_polyfloyd_go_errorlint-v1.4.5.zip", + "http://ats.apps.svc/gomod/github.com/polyfloyd/go-errorlint/com_github_polyfloyd_go_errorlint-v1.4.5.zip", + "https://cache.hawkingrei.com/gomod/github.com/polyfloyd/go-errorlint/com_github_polyfloyd_go_errorlint-v1.4.5.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/polyfloyd/go-errorlint/com_github_polyfloyd_go_errorlint-v1.4.5.zip", ], ) go_repository( @@ -6066,13 +6144,13 @@ def go_deps(): name = "com_github_quasilyte_go_ruleguard", build_file_proto_mode = "disable_global", importpath = "github.com/quasilyte/go-ruleguard", - sha256 = "5b7e20b885f36c87b33a204a91b2ccbac00878f34c9ae98a4ad8c09328e920d8", - strip_prefix = "github.com/quasilyte/go-ruleguard@v0.3.19", + sha256 = "3b00887b9a2f9f9b452520b8f0d52bef3c8e2ac03988ab7d3243b6a8afb9d3cd", + strip_prefix = "github.com/quasilyte/go-ruleguard@v0.4.0", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/quasilyte/go-ruleguard/com_github_quasilyte_go_ruleguard-v0.3.19.zip", - "http://ats.apps.svc/gomod/github.com/quasilyte/go-ruleguard/com_github_quasilyte_go_ruleguard-v0.3.19.zip", - "https://cache.hawkingrei.com/gomod/github.com/quasilyte/go-ruleguard/com_github_quasilyte_go_ruleguard-v0.3.19.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/quasilyte/go-ruleguard/com_github_quasilyte_go_ruleguard-v0.3.19.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/quasilyte/go-ruleguard/com_github_quasilyte_go_ruleguard-v0.4.0.zip", + "http://ats.apps.svc/gomod/github.com/quasilyte/go-ruleguard/com_github_quasilyte_go_ruleguard-v0.4.0.zip", + "https://cache.hawkingrei.com/gomod/github.com/quasilyte/go-ruleguard/com_github_quasilyte_go_ruleguard-v0.4.0.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/quasilyte/go-ruleguard/com_github_quasilyte_go_ruleguard-v0.4.0.zip", ], ) go_repository( @@ -6274,13 +6352,13 @@ def go_deps(): name = "com_github_ryanrolds_sqlclosecheck", build_file_proto_mode = "disable_global", importpath = "github.com/ryanrolds/sqlclosecheck", - sha256 = "eca7ce317f436d13d84c255883e6d25ccc581aa1db1cffd368fc8ec0f86473ca", - strip_prefix = "github.com/ryanrolds/sqlclosecheck@v0.4.0", + sha256 = "fdfe57b2a9d1b22c756acefaf4b9c254e1437e8d6ec7eb3400a8cb379a06a11b", + strip_prefix = "github.com/ryanrolds/sqlclosecheck@v0.5.1", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/ryanrolds/sqlclosecheck/com_github_ryanrolds_sqlclosecheck-v0.4.0.zip", - "http://ats.apps.svc/gomod/github.com/ryanrolds/sqlclosecheck/com_github_ryanrolds_sqlclosecheck-v0.4.0.zip", - "https://cache.hawkingrei.com/gomod/github.com/ryanrolds/sqlclosecheck/com_github_ryanrolds_sqlclosecheck-v0.4.0.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/ryanrolds/sqlclosecheck/com_github_ryanrolds_sqlclosecheck-v0.4.0.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/ryanrolds/sqlclosecheck/com_github_ryanrolds_sqlclosecheck-v0.5.1.zip", + "http://ats.apps.svc/gomod/github.com/ryanrolds/sqlclosecheck/com_github_ryanrolds_sqlclosecheck-v0.5.1.zip", + "https://cache.hawkingrei.com/gomod/github.com/ryanrolds/sqlclosecheck/com_github_ryanrolds_sqlclosecheck-v0.5.1.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/ryanrolds/sqlclosecheck/com_github_ryanrolds_sqlclosecheck-v0.5.1.zip", ], ) go_repository( @@ -6365,13 +6443,13 @@ def go_deps(): name = "com_github_sashamelentyev_usestdlibvars", build_file_proto_mode = "disable_global", importpath = "github.com/sashamelentyev/usestdlibvars", - sha256 = "8f67b4623bc0bf265f62fa54fdadaf7aea7796910747d20236735aca5961e60e", - strip_prefix = "github.com/sashamelentyev/usestdlibvars@v1.23.0", + sha256 = "4c67700a589555f173e549b862f6c6aa9f4708044dae0db8d584a8826c910cde", + strip_prefix = "github.com/sashamelentyev/usestdlibvars@v1.24.0", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/sashamelentyev/usestdlibvars/com_github_sashamelentyev_usestdlibvars-v1.23.0.zip", - "http://ats.apps.svc/gomod/github.com/sashamelentyev/usestdlibvars/com_github_sashamelentyev_usestdlibvars-v1.23.0.zip", - "https://cache.hawkingrei.com/gomod/github.com/sashamelentyev/usestdlibvars/com_github_sashamelentyev_usestdlibvars-v1.23.0.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/sashamelentyev/usestdlibvars/com_github_sashamelentyev_usestdlibvars-v1.23.0.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/sashamelentyev/usestdlibvars/com_github_sashamelentyev_usestdlibvars-v1.24.0.zip", + "http://ats.apps.svc/gomod/github.com/sashamelentyev/usestdlibvars/com_github_sashamelentyev_usestdlibvars-v1.24.0.zip", + "https://cache.hawkingrei.com/gomod/github.com/sashamelentyev/usestdlibvars/com_github_sashamelentyev_usestdlibvars-v1.24.0.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/sashamelentyev/usestdlibvars/com_github_sashamelentyev_usestdlibvars-v1.24.0.zip", ], ) go_repository( @@ -6417,13 +6495,13 @@ def go_deps(): name = "com_github_securego_gosec_v2", build_file_proto_mode = "disable_global", importpath = "github.com/securego/gosec/v2", - sha256 = "d05b561c6d3d4882fb6ccab23b5e54577ba08c56d11fffd866e8ca24e6247dd7", - strip_prefix = "github.com/securego/gosec/v2@v2.16.0", + sha256 = "fc1c75922220dcf00a16c6083111053fbc3a1a8e8544642b6f13a0c1f9b37b44", + strip_prefix = "github.com/securego/gosec/v2@v2.18.2", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/securego/gosec/v2/com_github_securego_gosec_v2-v2.16.0.zip", - "http://ats.apps.svc/gomod/github.com/securego/gosec/v2/com_github_securego_gosec_v2-v2.16.0.zip", - "https://cache.hawkingrei.com/gomod/github.com/securego/gosec/v2/com_github_securego_gosec_v2-v2.16.0.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/securego/gosec/v2/com_github_securego_gosec_v2-v2.16.0.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/securego/gosec/v2/com_github_securego_gosec_v2-v2.18.2.zip", + "http://ats.apps.svc/gomod/github.com/securego/gosec/v2/com_github_securego_gosec_v2-v2.18.2.zip", + "https://cache.hawkingrei.com/gomod/github.com/securego/gosec/v2/com_github_securego_gosec_v2-v2.18.2.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/securego/gosec/v2/com_github_securego_gosec_v2-v2.18.2.zip", ], ) go_repository( @@ -6482,13 +6560,13 @@ def go_deps(): name = "com_github_shirou_gopsutil_v3", build_file_proto_mode = "disable_global", importpath = "github.com/shirou/gopsutil/v3", - sha256 = "2203efec94b21893ce27d09aa407deef06968f646d72c9c35b337d6a06697a17", - strip_prefix = "github.com/shirou/gopsutil/v3@v3.23.5", + sha256 = "8e006d81f0b0ca5eefd72ddd07a68c74062ae0e11c287620d53a3e669179e84a", + strip_prefix = "github.com/shirou/gopsutil/v3@v3.23.10", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/shirou/gopsutil/v3/com_github_shirou_gopsutil_v3-v3.23.5.zip", - "http://ats.apps.svc/gomod/github.com/shirou/gopsutil/v3/com_github_shirou_gopsutil_v3-v3.23.5.zip", - "https://cache.hawkingrei.com/gomod/github.com/shirou/gopsutil/v3/com_github_shirou_gopsutil_v3-v3.23.5.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/shirou/gopsutil/v3/com_github_shirou_gopsutil_v3-v3.23.5.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/shirou/gopsutil/v3/com_github_shirou_gopsutil_v3-v3.23.10.zip", + "http://ats.apps.svc/gomod/github.com/shirou/gopsutil/v3/com_github_shirou_gopsutil_v3-v3.23.10.zip", + "https://cache.hawkingrei.com/gomod/github.com/shirou/gopsutil/v3/com_github_shirou_gopsutil_v3-v3.23.10.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/shirou/gopsutil/v3/com_github_shirou_gopsutil_v3-v3.23.10.zip", ], ) go_repository( @@ -6989,13 +7067,13 @@ def go_deps(): name = "com_github_tetafro_godot", build_file_proto_mode = "disable_global", importpath = "github.com/tetafro/godot", - sha256 = "f207e54086db6ac4874ecb43ab6a2303e147f159485512c8b9f1915bff190174", - strip_prefix = "github.com/tetafro/godot@v1.4.11", + sha256 = "8c0c2832ee007c5652e03c179e68dab884a55c64f4e4326d74658e5f38b6af1d", + strip_prefix = "github.com/tetafro/godot@v1.4.15", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/tetafro/godot/com_github_tetafro_godot-v1.4.11.zip", - "http://ats.apps.svc/gomod/github.com/tetafro/godot/com_github_tetafro_godot-v1.4.11.zip", - "https://cache.hawkingrei.com/gomod/github.com/tetafro/godot/com_github_tetafro_godot-v1.4.11.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/tetafro/godot/com_github_tetafro_godot-v1.4.11.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/tetafro/godot/com_github_tetafro_godot-v1.4.15.zip", + "http://ats.apps.svc/gomod/github.com/tetafro/godot/com_github_tetafro_godot-v1.4.15.zip", + "https://cache.hawkingrei.com/gomod/github.com/tetafro/godot/com_github_tetafro_godot-v1.4.15.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/tetafro/godot/com_github_tetafro_godot-v1.4.15.zip", ], ) go_repository( @@ -7080,26 +7158,26 @@ def go_deps(): name = "com_github_tklauser_go_sysconf", build_file_proto_mode = "disable_global", importpath = "github.com/tklauser/go-sysconf", - sha256 = "89b4468aaa5e5ae91cfb1638df618f1fe8aa92354c70dad1af9d82c6fd0c51cd", - strip_prefix = "github.com/tklauser/go-sysconf@v0.3.11", + sha256 = "95a4a24b6f5fc5af05d94bbab39ff847a220d30c5adb4fb0a09f9c7926a2ffe8", + strip_prefix = "github.com/tklauser/go-sysconf@v0.3.12", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/tklauser/go-sysconf/com_github_tklauser_go_sysconf-v0.3.11.zip", - "http://ats.apps.svc/gomod/github.com/tklauser/go-sysconf/com_github_tklauser_go_sysconf-v0.3.11.zip", - "https://cache.hawkingrei.com/gomod/github.com/tklauser/go-sysconf/com_github_tklauser_go_sysconf-v0.3.11.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/tklauser/go-sysconf/com_github_tklauser_go_sysconf-v0.3.11.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/tklauser/go-sysconf/com_github_tklauser_go_sysconf-v0.3.12.zip", + "http://ats.apps.svc/gomod/github.com/tklauser/go-sysconf/com_github_tklauser_go_sysconf-v0.3.12.zip", + "https://cache.hawkingrei.com/gomod/github.com/tklauser/go-sysconf/com_github_tklauser_go_sysconf-v0.3.12.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/tklauser/go-sysconf/com_github_tklauser_go_sysconf-v0.3.12.zip", ], ) go_repository( name = "com_github_tklauser_numcpus", build_file_proto_mode = "disable_global", importpath = "github.com/tklauser/numcpus", - sha256 = "b9c629ac8c472aeb85c5020141c23a1866927209ff9c9be867cac31e8987b451", - strip_prefix = "github.com/tklauser/numcpus@v0.6.0", + sha256 = "267c7f91c5be3f1d091ee215825f91c315196f45e1fd6c4e8abb447f38549e03", + strip_prefix = "github.com/tklauser/numcpus@v0.6.1", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/tklauser/numcpus/com_github_tklauser_numcpus-v0.6.0.zip", - "http://ats.apps.svc/gomod/github.com/tklauser/numcpus/com_github_tklauser_numcpus-v0.6.0.zip", - "https://cache.hawkingrei.com/gomod/github.com/tklauser/numcpus/com_github_tklauser_numcpus-v0.6.0.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/tklauser/numcpus/com_github_tklauser_numcpus-v0.6.0.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/tklauser/numcpus/com_github_tklauser_numcpus-v0.6.1.zip", + "http://ats.apps.svc/gomod/github.com/tklauser/numcpus/com_github_tklauser_numcpus-v0.6.1.zip", + "https://cache.hawkingrei.com/gomod/github.com/tklauser/numcpus/com_github_tklauser_numcpus-v0.6.1.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/tklauser/numcpus/com_github_tklauser_numcpus-v0.6.1.zip", ], ) go_repository( @@ -7210,13 +7288,13 @@ def go_deps(): name = "com_github_ultraware_funlen", build_file_proto_mode = "disable_global", importpath = "github.com/ultraware/funlen", - sha256 = "47979840aa9e7e0c39b1572364a1b0da4dd3b33e65e4d80ef9892e80dbd717ff", - strip_prefix = "github.com/ultraware/funlen@v0.0.3", + sha256 = "8c7d8c936def91004546b6ae231505373ce7863540ad826a7a9cd51a5aae0c0f", + strip_prefix = "github.com/ultraware/funlen@v0.1.0", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/ultraware/funlen/com_github_ultraware_funlen-v0.0.3.zip", - "http://ats.apps.svc/gomod/github.com/ultraware/funlen/com_github_ultraware_funlen-v0.0.3.zip", - "https://cache.hawkingrei.com/gomod/github.com/ultraware/funlen/com_github_ultraware_funlen-v0.0.3.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/ultraware/funlen/com_github_ultraware_funlen-v0.0.3.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/ultraware/funlen/com_github_ultraware_funlen-v0.1.0.zip", + "http://ats.apps.svc/gomod/github.com/ultraware/funlen/com_github_ultraware_funlen-v0.1.0.zip", + "https://cache.hawkingrei.com/gomod/github.com/ultraware/funlen/com_github_ultraware_funlen-v0.1.0.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/ultraware/funlen/com_github_ultraware_funlen-v0.1.0.zip", ], ) go_repository( @@ -7249,13 +7327,13 @@ def go_deps(): name = "com_github_uudashr_gocognit", build_file_proto_mode = "disable_global", importpath = "github.com/uudashr/gocognit", - sha256 = "08c44ae19834c348c6e3b56c0b70ce50bfbf0030f9d2b6d796e4de7619268ae9", - strip_prefix = "github.com/uudashr/gocognit@v1.0.6", + sha256 = "fc0b179859880b38cf2c356abac5261852afff67b7f61c8517a7f9b18f4a7c4e", + strip_prefix = "github.com/uudashr/gocognit@v1.1.2", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/uudashr/gocognit/com_github_uudashr_gocognit-v1.0.6.zip", - "http://ats.apps.svc/gomod/github.com/uudashr/gocognit/com_github_uudashr_gocognit-v1.0.6.zip", - "https://cache.hawkingrei.com/gomod/github.com/uudashr/gocognit/com_github_uudashr_gocognit-v1.0.6.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/uudashr/gocognit/com_github_uudashr_gocognit-v1.0.6.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/uudashr/gocognit/com_github_uudashr_gocognit-v1.1.2.zip", + "http://ats.apps.svc/gomod/github.com/uudashr/gocognit/com_github_uudashr_gocognit-v1.1.2.zip", + "https://cache.hawkingrei.com/gomod/github.com/uudashr/gocognit/com_github_uudashr_gocognit-v1.1.2.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/uudashr/gocognit/com_github_uudashr_gocognit-v1.1.2.zip", ], ) go_repository( @@ -7431,13 +7509,13 @@ def go_deps(): name = "com_github_xen0n_gosmopolitan", build_file_proto_mode = "disable_global", importpath = "github.com/xen0n/gosmopolitan", - sha256 = "af0cb23fbeefd7a4982cf45ba15f658c187a4050391eb2a2d9e2d4677af87042", - strip_prefix = "github.com/xen0n/gosmopolitan@v1.2.1", + sha256 = "bd5a8adb28bbaffd2b8cb7f7000cad640cd0dd3f1ce3e396958555665c45277b", + strip_prefix = "github.com/xen0n/gosmopolitan@v1.2.2", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/xen0n/gosmopolitan/com_github_xen0n_gosmopolitan-v1.2.1.zip", - "http://ats.apps.svc/gomod/github.com/xen0n/gosmopolitan/com_github_xen0n_gosmopolitan-v1.2.1.zip", - "https://cache.hawkingrei.com/gomod/github.com/xen0n/gosmopolitan/com_github_xen0n_gosmopolitan-v1.2.1.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/xen0n/gosmopolitan/com_github_xen0n_gosmopolitan-v1.2.1.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/xen0n/gosmopolitan/com_github_xen0n_gosmopolitan-v1.2.2.zip", + "http://ats.apps.svc/gomod/github.com/xen0n/gosmopolitan/com_github_xen0n_gosmopolitan-v1.2.2.zip", + "https://cache.hawkingrei.com/gomod/github.com/xen0n/gosmopolitan/com_github_xen0n_gosmopolitan-v1.2.2.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/xen0n/gosmopolitan/com_github_xen0n_gosmopolitan-v1.2.2.zip", ], ) go_repository( @@ -7548,13 +7626,13 @@ def go_deps(): name = "com_github_ykadowak_zerologlint", build_file_proto_mode = "disable_global", importpath = "github.com/ykadowak/zerologlint", - sha256 = "6c7de865179b66a78d61441c93a103af616971ec88df50b55e8ab08379bb35ad", - strip_prefix = "github.com/ykadowak/zerologlint@v0.1.2", + sha256 = "b03223405a22d438505f9fcd293b9866b9ce0d3ffd590ecbdab31ee145c636ba", + strip_prefix = "github.com/ykadowak/zerologlint@v0.1.3", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/ykadowak/zerologlint/com_github_ykadowak_zerologlint-v0.1.2.zip", - "http://ats.apps.svc/gomod/github.com/ykadowak/zerologlint/com_github_ykadowak_zerologlint-v0.1.2.zip", - "https://cache.hawkingrei.com/gomod/github.com/ykadowak/zerologlint/com_github_ykadowak_zerologlint-v0.1.2.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/ykadowak/zerologlint/com_github_ykadowak_zerologlint-v0.1.2.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/ykadowak/zerologlint/com_github_ykadowak_zerologlint-v0.1.3.zip", + "http://ats.apps.svc/gomod/github.com/ykadowak/zerologlint/com_github_ykadowak_zerologlint-v0.1.3.zip", + "https://cache.hawkingrei.com/gomod/github.com/ykadowak/zerologlint/com_github_ykadowak_zerologlint-v0.1.3.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/ykadowak/zerologlint/com_github_ykadowak_zerologlint-v0.1.3.zip", ], ) go_repository( @@ -7626,13 +7704,13 @@ def go_deps(): name = "com_gitlab_bosi_decorder", build_file_proto_mode = "disable_global", importpath = "gitlab.com/bosi/decorder", - sha256 = "beb676d2dd396a7634c96a7b93f09198a8463075b65d290edef1c55f52855568", - strip_prefix = "gitlab.com/bosi/decorder@v0.2.3", + sha256 = "ada0aaccd3bee67d4eabb98c83c320f00c65dca36441ed92c5638cf269c60ba6", + strip_prefix = "gitlab.com/bosi/decorder@v0.4.1", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/gitlab.com/bosi/decorder/com_gitlab_bosi_decorder-v0.2.3.zip", - "http://ats.apps.svc/gomod/gitlab.com/bosi/decorder/com_gitlab_bosi_decorder-v0.2.3.zip", - "https://cache.hawkingrei.com/gomod/gitlab.com/bosi/decorder/com_gitlab_bosi_decorder-v0.2.3.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/gitlab.com/bosi/decorder/com_gitlab_bosi_decorder-v0.2.3.zip", + "http://bazel-cache.pingcap.net:8080/gomod/gitlab.com/bosi/decorder/com_gitlab_bosi_decorder-v0.4.1.zip", + "http://ats.apps.svc/gomod/gitlab.com/bosi/decorder/com_gitlab_bosi_decorder-v0.4.1.zip", + "https://cache.hawkingrei.com/gomod/gitlab.com/bosi/decorder/com_gitlab_bosi_decorder-v0.4.1.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/gitlab.com/bosi/decorder/com_gitlab_bosi_decorder-v0.4.1.zip", ], ) go_repository( @@ -9225,13 +9303,13 @@ def go_deps(): name = "dev_tmz_go_musttag", build_file_proto_mode = "disable_global", importpath = "go.tmz.dev/musttag", - sha256 = "48d2a63695ac1b8e3daf16d7764e8392e53b22e7f261cac888dfad64a7b0b961", - strip_prefix = "go.tmz.dev/musttag@v0.7.0", + sha256 = "8c45db4ed6b66392c68c4109e9d209920d8d9beb49ce96ec96e7b409da59ad5f", + strip_prefix = "go.tmz.dev/musttag@v0.7.2", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/go.tmz.dev/musttag/dev_tmz_go_musttag-v0.7.0.zip", - "http://ats.apps.svc/gomod/go.tmz.dev/musttag/dev_tmz_go_musttag-v0.7.0.zip", - "https://cache.hawkingrei.com/gomod/go.tmz.dev/musttag/dev_tmz_go_musttag-v0.7.0.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/go.tmz.dev/musttag/dev_tmz_go_musttag-v0.7.0.zip", + "http://bazel-cache.pingcap.net:8080/gomod/go.tmz.dev/musttag/dev_tmz_go_musttag-v0.7.2.zip", + "http://ats.apps.svc/gomod/go.tmz.dev/musttag/dev_tmz_go_musttag-v0.7.2.zip", + "https://cache.hawkingrei.com/gomod/go.tmz.dev/musttag/dev_tmz_go_musttag-v0.7.2.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/go.tmz.dev/musttag/dev_tmz_go_musttag-v0.7.2.zip", ], ) go_repository( @@ -9953,6 +10031,19 @@ def go_deps(): "https://storage.googleapis.com/pingcapmirror/gomod/go.starlark.net/net_starlark_go-v0.0.0-20210223155950-e043a3d3c984.zip", ], ) + go_repository( + name = "org_go_simpler_sloglint", + build_file_proto_mode = "disable_global", + importpath = "go-simpler.org/sloglint", + sha256 = "299097a8512b654733cd9b4b2d965213adadda98827a34341b94d36c62577e8e", + strip_prefix = "go-simpler.org/sloglint@v0.1.2", + urls = [ + "http://bazel-cache.pingcap.net:8080/gomod/go-simpler.org/sloglint/org_go_simpler_sloglint-v0.1.2.zip", + "http://ats.apps.svc/gomod/go-simpler.org/sloglint/org_go_simpler_sloglint-v0.1.2.zip", + "https://cache.hawkingrei.com/gomod/go-simpler.org/sloglint/org_go_simpler_sloglint-v0.1.2.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/go-simpler.org/sloglint/org_go_simpler_sloglint-v0.1.2.zip", + ], + ) go_repository( name = "org_golang_google_api", build_file_proto_mode = "disable_global", @@ -10087,13 +10178,13 @@ def go_deps(): name = "org_golang_x_exp_typeparams", build_file_proto_mode = "disable_global", importpath = "golang.org/x/exp/typeparams", - sha256 = "1113b29eb80ff666c87898cb9ffca08571702f32e59bd05d08e7c2eafdcb4ece", - strip_prefix = "golang.org/x/exp/typeparams@v0.0.0-20230224173230-c95f2b4c22f2", + sha256 = "e1d4a28584e13a4c73c6a0d61073fd171eee69073dcc7a67489d8ae2622be50e", + strip_prefix = "golang.org/x/exp/typeparams@v0.0.0-20230307190834-24139beb5833", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/golang.org/x/exp/typeparams/org_golang_x_exp_typeparams-v0.0.0-20230224173230-c95f2b4c22f2.zip", - "http://ats.apps.svc/gomod/golang.org/x/exp/typeparams/org_golang_x_exp_typeparams-v0.0.0-20230224173230-c95f2b4c22f2.zip", - "https://cache.hawkingrei.com/gomod/golang.org/x/exp/typeparams/org_golang_x_exp_typeparams-v0.0.0-20230224173230-c95f2b4c22f2.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/golang.org/x/exp/typeparams/org_golang_x_exp_typeparams-v0.0.0-20230224173230-c95f2b4c22f2.zip", + "http://bazel-cache.pingcap.net:8080/gomod/golang.org/x/exp/typeparams/org_golang_x_exp_typeparams-v0.0.0-20230307190834-24139beb5833.zip", + "http://ats.apps.svc/gomod/golang.org/x/exp/typeparams/org_golang_x_exp_typeparams-v0.0.0-20230307190834-24139beb5833.zip", + "https://cache.hawkingrei.com/gomod/golang.org/x/exp/typeparams/org_golang_x_exp_typeparams-v0.0.0-20230307190834-24139beb5833.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/golang.org/x/exp/typeparams/org_golang_x_exp_typeparams-v0.0.0-20230307190834-24139beb5833.zip", ], ) go_repository( diff --git a/Makefile b/Makefile index 84c60380f0376..fafa1ec44f669 100644 --- a/Makefile +++ b/Makefile @@ -267,7 +267,7 @@ tools/bin/gotestsum: GOBIN=$(shell pwd)/tools/bin $(GO) install gotest.tools/gotestsum@v1.8.1 tools/bin/mockgen: - GOBIN=$(shell pwd)/tools/bin $(GO) install go.uber.org/mock/mockgen@v0.2.0 + GOBIN=$(shell pwd)/tools/bin $(GO) install go.uber.org/mock/mockgen@v0.3.0 # Usage: # diff --git a/br/pkg/restore/client.go b/br/pkg/restore/client.go index 5b1a1503bf829..bff70be345932 100644 --- a/br/pkg/restore/client.go +++ b/br/pkg/restore/client.go @@ -1827,49 +1827,48 @@ func (rc *Client) GoWaitTiFlashReady(ctx context.Context, inCh <-chan *CreatedTa updateCh.Inc() return nil } - if rc.dom != nil { - log.Info("table has tiflash replica, start sync..", - zap.Stringer("table", tbl.OldTable.Info.Name), - zap.Stringer("db", tbl.OldTable.DB.Name)) - for { - var progress float64 - if pi := tbl.Table.GetPartitionInfo(); pi != nil && len(pi.Definitions) > 0 { - for _, p := range pi.Definitions { - progressOfPartition, err := infosync.MustGetTiFlashProgress(p.ID, tbl.Table.TiFlashReplica.Count, &tiFlashStores) - if err != nil { - log.Warn("failed to get progress for tiflash partition replica, retry it", - zap.Int64("tableID", tbl.Table.ID), zap.Int64("partitionID", p.ID), zap.Error(err)) - time.Sleep(time.Second) - continue - } - progress += progressOfPartition - } - progress = progress / float64(len(pi.Definitions)) - } else { - var err error - progress, err = infosync.MustGetTiFlashProgress(tbl.Table.ID, tbl.Table.TiFlashReplica.Count, &tiFlashStores) + if rc.dom == nil { + // unreachable, current we have initial domain in mgr. + log.Fatal("unreachable, domain is nil") + } + log.Info("table has tiflash replica, start sync..", + zap.Stringer("table", tbl.OldTable.Info.Name), + zap.Stringer("db", tbl.OldTable.DB.Name)) + for { + var progress float64 + if pi := tbl.Table.GetPartitionInfo(); pi != nil && len(pi.Definitions) > 0 { + for _, p := range pi.Definitions { + progressOfPartition, err := infosync.MustGetTiFlashProgress(p.ID, tbl.Table.TiFlashReplica.Count, &tiFlashStores) if err != nil { - log.Warn("failed to get progress for tiflash replica, retry it", - zap.Int64("tableID", tbl.Table.ID), zap.Error(err)) + log.Warn("failed to get progress for tiflash partition replica, retry it", + zap.Int64("tableID", tbl.Table.ID), zap.Int64("partitionID", p.ID), zap.Error(err)) time.Sleep(time.Second) continue } + progress += progressOfPartition } - // check until progress is 1 - if progress == 1 { - log.Info("tiflash replica synced", - zap.Stringer("table", tbl.OldTable.Info.Name), - zap.Stringer("db", tbl.OldTable.DB.Name)) - break + progress = progress / float64(len(pi.Definitions)) + } else { + var err error + progress, err = infosync.MustGetTiFlashProgress(tbl.Table.ID, tbl.Table.TiFlashReplica.Count, &tiFlashStores) + if err != nil { + log.Warn("failed to get progress for tiflash replica, retry it", + zap.Int64("tableID", tbl.Table.ID), zap.Error(err)) + time.Sleep(time.Second) + continue } - // just wait for next check - // tiflash check the progress every 2s - // we can wait 2.5x times - time.Sleep(5 * time.Second) } - } else { - // unreachable, current we have initial domain in mgr. - log.Fatal("unreachable, domain is nil") + // check until progress is 1 + if progress == 1 { + log.Info("tiflash replica synced", + zap.Stringer("table", tbl.OldTable.Info.Name), + zap.Stringer("db", tbl.OldTable.DB.Name)) + break + } + // just wait for next check + // tiflash check the progress every 2s + // we can wait 2.5x times + time.Sleep(5 * time.Second) } updateCh.Inc() return nil diff --git a/br/pkg/restore/db.go b/br/pkg/restore/db.go index 6bf06504eeb31..136e8ee93d8fd 100644 --- a/br/pkg/restore/db.go +++ b/br/pkg/restore/db.go @@ -490,9 +490,8 @@ func GetExistedUserDBs(dom *domain.Domain) []*model.DBInfo { // tidb create test db on fresh cluster // if it's empty we don't take it as user db continue - } else { - existedDatabases = append(existedDatabases, db) } + existedDatabases = append(existedDatabases, db) } return existedDatabases diff --git a/cmd/ddltest/random_test.go b/cmd/ddltest/random_test.go index 1b6238c9ed4bf..ef8cdc96aacec 100644 --- a/cmd/ddltest/random_test.go +++ b/cmd/ddltest/random_test.go @@ -52,7 +52,6 @@ func randomNum(args ...int) int { return args[0] + randomIntn(args[1]-args[0]) } else if len(args) == 1 { return randomIntn(args[0]) - } else { - return randomInt() } + return randomInt() } diff --git a/go.mod b/go.mod index 6a2fc305a3780..c448510f635b0 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( github.com/coocood/freecache v1.2.1 github.com/coreos/go-semver v0.3.1 github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 - github.com/daixiang0/gci v0.11.0 + github.com/daixiang0/gci v0.11.2 github.com/danjacques/gofslock v0.0.0-20191023191349-0a45f885bc37 github.com/dgraph-io/ristretto v0.1.1 github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 @@ -45,10 +45,10 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/golang/protobuf v1.5.3 github.com/golang/snappy v0.0.4 - github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2 - github.com/golangci/golangci-lint v1.53.3 + github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e + github.com/golangci/golangci-lint v1.55.2 github.com/golangci/gosec v0.0.0-20180901114220-8afd9cbb6cfb - github.com/golangci/misspell v0.4.0 + github.com/golangci/misspell v0.4.1 github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21 github.com/google/btree v1.1.2 github.com/google/pprof v0.0.0-20211122183932-1daafda22083 @@ -70,7 +70,7 @@ require ( github.com/ks3sdklib/aws-sdk-go v1.2.6 github.com/kyoh86/exportloopref v0.1.11 github.com/lestrrat-go/jwx/v2 v2.0.11 - github.com/mgechev/revive v1.3.2 + github.com/mgechev/revive v1.3.4 github.com/ngaut/pools v0.0.0-20180318154953-b7bc8c42aac7 github.com/ngaut/sync2 v0.0.0-20141008032647-7a24ed77b2ef github.com/nishanths/predeclared v0.2.2 @@ -92,7 +92,7 @@ require ( github.com/prometheus/prometheus v0.0.0-20190525122359-d20e84d0fb64 github.com/robfig/cron/v3 v3.0.1 github.com/sasha-s/go-deadlock v0.2.0 - github.com/shirou/gopsutil/v3 v3.23.5 + github.com/shirou/gopsutil/v3 v3.23.10 github.com/shurcooL/httpgzip v0.0.0-20190720172056-320755c1c1b0 github.com/soheilhy/cmux v0.1.5 github.com/spf13/cobra v1.7.0 @@ -135,7 +135,7 @@ require ( google.golang.org/api v0.128.0 google.golang.org/grpc v1.59.0 gopkg.in/yaml.v2 v2.4.0 - honnef.co/go/tools v0.4.5 + honnef.co/go/tools v0.4.6 k8s.io/api v0.27.2 sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0 sourcegraph.com/sourcegraph/appdash-data v0.0.0-20151005221446-73f23eafcf67 @@ -180,7 +180,7 @@ require ( github.com/bmatcuk/doublestar/v2 v2.0.4 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/chavacava/garif v0.0.0-20230519080132-4752330f72df // indirect + github.com/chavacava/garif v0.1.0 // indirect github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f // indirect github.com/cockroachdb/redact v1.0.8 // indirect github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 // indirect @@ -273,8 +273,8 @@ require ( github.com/spf13/cast v1.5.0 // indirect github.com/stretchr/objx v0.5.0 // indirect github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a - github.com/tklauser/go-sysconf v0.3.11 // indirect - github.com/tklauser/numcpus v0.6.0 // indirect + github.com/tklauser/go-sysconf v0.3.12 // indirect + github.com/tklauser/numcpus v0.6.1 // indirect github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect @@ -289,7 +289,7 @@ require ( go.opentelemetry.io/otel/trace v1.0.1 // indirect go.opentelemetry.io/proto/otlp v0.9.0 // indirect golang.org/x/crypto v0.14.0 // indirect - golang.org/x/exp/typeparams v0.0.0-20230224173230-c95f2b4c22f2 // indirect + golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833 // indirect golang.org/x/mod v0.13.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect gonum.org/v1/gonum v0.8.2 // indirect diff --git a/go.sum b/go.sum index a051ab782e7e3..6f01671bcb4d8 100644 --- a/go.sum +++ b/go.sum @@ -166,8 +166,8 @@ github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/charithe/durationcheck v0.0.10 h1:wgw73BiocdBDQPik+zcEoBG/ob8uyBHf2iyoHGPf5w4= github.com/charithe/durationcheck v0.0.10/go.mod h1:bCWXb7gYRysD1CU3C+u4ceO49LoGOY1C1L6uouGNreQ= -github.com/chavacava/garif v0.0.0-20230519080132-4752330f72df h1:1uGdlpQT0irrGcFFOUuitqSCE6BjttfHd+k3k9OQ0fg= -github.com/chavacava/garif v0.0.0-20230519080132-4752330f72df/go.mod h1:cFP7fAFavJ2DrYBmZYBETNKwSTFJiOIirm5N4/PqY/I= +github.com/chavacava/garif v0.1.0 h1:2JHa3hbYf5D9dsgseMKAmc/MZ109otzgNFk5s87H9Pc= +github.com/chavacava/garif v0.1.0/go.mod h1:XMyYCkEL58DF0oyW4qDjjnPWONs2HBqYKI+UIPD+Gww= github.com/cheggaaa/pb/v3 v3.0.8 h1:bC8oemdChbke2FHIIGy9mn4DPJ2caZYQnfbRqwmdCoA= github.com/cheggaaa/pb/v3 v3.0.8/go.mod h1:UICbiLec/XO6Hw6k+BHEtHeQFzzBH4i2/qk/ow1EJTA= github.com/cheynewallace/tabby v1.1.1 h1:JvUR8waht4Y0S3JF17G6Vhyt+FRhnqVCkk8l4YrOU54= @@ -228,8 +228,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 h1:iwZdTE0PVqJCos1vaoKsclOGD3ADKpshg3SRtYBbwso= github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548/go.mod h1:e6NPNENfs9mPDVNRekM7lKScauxd5kXTr1Mfyig6TDM= -github.com/daixiang0/gci v0.11.0 h1:XeQbFKkCRxvVyn06EOuNY6LPGBLVuB/W130c8FrnX6A= -github.com/daixiang0/gci v0.11.0/go.mod h1:xtHP9N7AHdNvtRNfcx9gwTDfw7FRJx4bZUsiEfiNNAI= +github.com/daixiang0/gci v0.11.2 h1:Oji+oPsp3bQ6bNNgX30NBAVT18P4uBH4sRZnlOlTj7Y= +github.com/daixiang0/gci v0.11.2/go.mod h1:xtHP9N7AHdNvtRNfcx9gwTDfw7FRJx4bZUsiEfiNNAI= github.com/danjacques/gofslock v0.0.0-20191023191349-0a45f885bc37 h1:X6mKGhCFOxrKeeHAjv/3UvT6e5RRxW6wRdlqlV6/H4w= github.com/danjacques/gofslock v0.0.0-20191023191349-0a45f885bc37/go.mod h1:DC3JtzuG7kxMvJ6dZmf2ymjNyoXwgtklr7FN+Um2B0U= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -407,14 +407,14 @@ github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2 h1:amWTbTGqOZ71ruzrdA+Nx5WA3tV1N0goTspwmKCQvBY= -github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2/go.mod h1:9wOXstvyDRshQ9LggQuzBCGysxs3b6Uo/1MvYCR2NMs= -github.com/golangci/golangci-lint v1.53.3 h1:CUcRafczT4t1F+mvdkUm6KuOpxUZTl0yWN/rSU6sSMo= -github.com/golangci/golangci-lint v1.53.3/go.mod h1:W4Gg3ONq6p3Jl+0s/h9Gr0j7yEgHJWWZO2bHl2tBUXM= +github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e h1:ULcKCDV1LOZPFxGZaA6TlQbiM3J2GCPnkx/bGF6sX/g= +github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e/go.mod h1:Pm5KhLPA8gSnQwrQ6ukebRcapGb/BG9iUkdaiCcGHJM= +github.com/golangci/golangci-lint v1.55.2 h1:yllEIsSJ7MtlDBwDJ9IMBkyEUz2fYE0b5B8IUgO1oP8= +github.com/golangci/golangci-lint v1.55.2/go.mod h1:H60CZ0fuqoTwlTvnbyjhpZPWp7KmsjwV2yupIMiMXbM= github.com/golangci/gosec v0.0.0-20180901114220-8afd9cbb6cfb h1:Bi7BYmZVg4C+mKGi8LeohcP2GGUl2XJD4xCkJoZSaYc= github.com/golangci/gosec v0.0.0-20180901114220-8afd9cbb6cfb/go.mod h1:ON/c2UR0VAAv6ZEAFKhjCLplESSmRFfZcDLASbI1GWo= -github.com/golangci/misspell v0.4.0 h1:KtVB/hTK4bbL/S6bs64rYyk8adjmh1BygbBiaAiX+a0= -github.com/golangci/misspell v0.4.0/go.mod h1:W6O/bwV6lGDxUCChm2ykw9NQdd5bYd1Xkjo88UcWyJc= +github.com/golangci/misspell v0.4.1 h1:+y73iSicVy2PqyX7kmUefHusENlrP9YwuHZHPLGQj/g= +github.com/golangci/misspell v0.4.1/go.mod h1:9mAN1quEo3DlpbaIKKyEvRxK1pwqR9s/Sea1bJCtlNI= github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21 h1:leSNB7iYzLYSSx3J/s5sVf4Drkc68W2wm4Ixh/mr0us= github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21/go.mod h1:tf5+bzsHdTM0bsB7+8mt0GUMvjCgwLpTapNZHU8AajI= github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= @@ -434,8 +434,9 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-github/v33 v33.0.0/go.mod h1:GMdDnVZY/2TsWgp/lkYnpSAh6TrzhANBBwm6k6TTEXg= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= @@ -706,8 +707,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zk github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mediocregopher/mediocre-go-lib v0.0.0-20181029021733-cb65787f37ed/go.mod h1:dSsfyI2zABAdhcbvkXqgxOxrCsbYeHCPgrZkku60dSg= github.com/mediocregopher/radix/v3 v3.3.0/go.mod h1:EmfVyvspXz1uZEyPBMyGK+kjWiKQGvsUt6O3Pj+LDCQ= -github.com/mgechev/revive v1.3.2 h1:Wb8NQKBaALBJ3xrrj4zpwJwqwNA6nDpyJSEQWcCka6U= -github.com/mgechev/revive v1.3.2/go.mod h1:UCLtc7o5vg5aXCwdUTU1kEBQ1v+YXPAkYDIDXbrs5I0= +github.com/mgechev/revive v1.3.4 h1:k/tO3XTaWY4DEHal9tWBkkUMJYO/dLDVyMmAQxmIMDc= +github.com/mgechev/revive v1.3.4/go.mod h1:W+pZCMu9qj8Uhfs1iJMQsEFLRozUfvwFwqVvRbSNLVw= github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/dns v1.1.10/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= @@ -911,8 +912,8 @@ github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNX github.com/shabbyrobe/gocovmerge v0.0.0-20190829150210-3e036491d500 h1:WnNuhiq+FOY3jNj6JXFT+eLN3CQ/oPIsDPRanvwsmbI= github.com/shabbyrobe/gocovmerge v0.0.0-20190829150210-3e036491d500/go.mod h1:+njLrG5wSeoG4Ds61rFgEzKvenR2UHbjMoDHsczxly0= github.com/shirou/gopsutil/v3 v3.21.12/go.mod h1:BToYZVTlSVlfazpDDYFnsVZLaoRG+g8ufT6fPQLdJzA= -github.com/shirou/gopsutil/v3 v3.23.5 h1:5SgDCeQ0KW0S4N0znjeM/eFHXXOKyv2dVNgRq/c9P6Y= -github.com/shirou/gopsutil/v3 v3.23.5/go.mod h1:Ng3Maa27Q2KARVJ0SPZF5NdrQSC3XHKP8IIWrHgMeLY= +github.com/shirou/gopsutil/v3 v3.23.10 h1:/N42opWlYzegYaVkWejXWJpbzKv2JDy3mrgGzKsh9hM= +github.com/shirou/gopsutil/v3 v3.23.10/go.mod h1:JIE26kpucQi+innVlAUnIEOSBhBUkirr5b44yr55+WE= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= @@ -978,7 +979,6 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/tdakkota/asciicheck v0.2.0 h1:o8jvnUANo0qXtnslk2d3nMKTFNlOnJjRrNcj0j9qkHM= @@ -998,11 +998,11 @@ github.com/tikv/pd/client v0.0.0-20230912103610-2f57a9f050eb/go.mod h1:E+6qtPu8f github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 h1:quvGphlmUVU+nhpFa4gg4yJyTRJ13reZMDHrKwYw53M= github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966/go.mod h1:27bSVNWSBOHm+qRp1T9qzaIpsWEP6TbUnei/43HK+PQ= github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs= -github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= -github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= +github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= +github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8= -github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= -github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= +github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk= +github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 h1:uruHq4dN7GR16kFc5fp3d1RIYzJW5onx8Ybykw2YQFA= github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/twmb/murmur3 v1.1.6 h1:mqrRot1BRxm+Yct+vavLMou2/iJt0tNVTTC0QoIjaZg= @@ -1165,8 +1165,8 @@ golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMk golang.org/x/exp v0.0.0-20200513190911-00229845015e/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= -golang.org/x/exp/typeparams v0.0.0-20230224173230-c95f2b4c22f2 h1:J74nGeMgeFnYQJN59eFwh06jX/V8g0lB7LWpjSLxtgU= -golang.org/x/exp/typeparams v0.0.0-20230224173230-c95f2b4c22f2/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= +golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833 h1:jWGQJV4niP+CCmFW9ekjA9Zx8vYORzOUH2/Nl5WPuLQ= +golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= @@ -1348,11 +1348,11 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -1624,8 +1624,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.4.5 h1:YGD4H+SuIOOqsyoLOpZDWcieM28W47/zRO7f+9V3nvo= -honnef.co/go/tools v0.4.5/go.mod h1:GUV+uIBCLpdf0/v6UhHHG/yzI/z6qPskBeQCjcNB96k= +honnef.co/go/tools v0.4.6 h1:oFEHCKeID7to/3autwsWfnuv69j3NsfcXbvJKuIcep8= +honnef.co/go/tools v0.4.6/go.mod h1:+rnGS1THNh8zMwnd2oVOTL9QF6vmfyG6ZXBULae2uc0= k8s.io/api v0.0.0-20190409021203-6e4e0e4f393b/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= k8s.io/api v0.27.2 h1:+H17AJpUMvl+clT+BPnKf0E3ksMAzoBBg7CntpSuADo= k8s.io/api v0.27.2/go.mod h1:ENmbocXfBT2ADujUXcBhHV55RIT31IIEvkntP6vZKS4= diff --git a/pkg/ddl/ddl_worker.go b/pkg/ddl/ddl_worker.go index 12bfeef693ed2..f218519a967cb 100644 --- a/pkg/ddl/ddl_worker.go +++ b/pkg/ddl/ddl_worker.go @@ -1229,9 +1229,8 @@ func waitSchemaSyncedForMDL(d *ddlCtx, job *model.Job, latestSchemaVersion int64 if val.(bool) { if mockDDLErrOnce > 0 && mockDDLErrOnce != latestSchemaVersion { panic("check down before update global version failed") - } else { - mockDDLErrOnce = -1 } + mockDDLErrOnce = -1 } }) @@ -1273,9 +1272,8 @@ func waitSchemaSynced(d *ddlCtx, job *model.Job, waitTime time.Duration) error { if val.(bool) { if mockDDLErrOnce > 0 && mockDDLErrOnce != latestSchemaVersion { panic("check down before update global version failed") - } else { - mockDDLErrOnce = -1 } + mockDDLErrOnce = -1 } }) diff --git a/pkg/ddl/partition.go b/pkg/ddl/partition.go index 718e21fcc969b..970c3c36e815f 100644 --- a/pkg/ddl/partition.go +++ b/pkg/ddl/partition.go @@ -3593,10 +3593,9 @@ func buildCheckSQLConditionForRangeColumnsPartition(pi *model.PartitionInfo, ind } else if index == len(pi.Definitions)-1 && strings.EqualFold(pi.Definitions[index].LessThan[0], partitionMaxValue) { paramList = append(paramList, colName, driver.UnwrapFromSingleQuotes(pi.Definitions[index-1].LessThan[0])) return "%n < %?", paramList - } else { - paramList = append(paramList, colName, driver.UnwrapFromSingleQuotes(pi.Definitions[index-1].LessThan[0]), colName, driver.UnwrapFromSingleQuotes(pi.Definitions[index].LessThan[0])) - return "%n < %? or %n >= %?", paramList } + paramList = append(paramList, colName, driver.UnwrapFromSingleQuotes(pi.Definitions[index-1].LessThan[0]), colName, driver.UnwrapFromSingleQuotes(pi.Definitions[index].LessThan[0])) + return "%n < %? or %n >= %?", paramList } func buildCheckSQLConditionForListPartition(pi *model.PartitionInfo, index int) string { diff --git a/pkg/executor/adapter.go b/pkg/executor/adapter.go index aa12b8e8ef085..d7fb0824cdab3 100644 --- a/pkg/executor/adapter.go +++ b/pkg/executor/adapter.go @@ -462,14 +462,14 @@ func (a *ExecStmt) Exec(ctx context.Context) (_ sqlexec.RecordSet, err error) { } return } - if recoverdErr, ok := r.(error); !ok || !(exeerrors.ErrMemoryExceedForQuery.Equal(recoverdErr) || + recoverdErr, ok := r.(error) + if !ok || !(exeerrors.ErrMemoryExceedForQuery.Equal(recoverdErr) || exeerrors.ErrMemoryExceedForInstance.Equal(recoverdErr) || exeerrors.ErrQueryInterrupted.Equal(recoverdErr) || exeerrors.ErrMaxExecTimeExceeded.Equal(recoverdErr)) { panic(r) - } else { - err = recoverdErr } + err = recoverdErr logutil.Logger(ctx).Error("execute sql panic", zap.String("sql", a.GetTextToLog(false)), zap.Stack("stack")) }() diff --git a/pkg/executor/builder.go b/pkg/executor/builder.go index 2572946d6d2aa..a980eb1d37fe5 100644 --- a/pkg/executor/builder.go +++ b/pkg/executor/builder.go @@ -5434,10 +5434,9 @@ func (b *executorBuilder) getCacheTable(tblInfo *model.TableInfo, startTS uint64 return cacheData } else if loading { return nil - } else { - if !b.ctx.GetSessionVars().StmtCtx.InExplainStmt && !b.inDeleteStmt && !b.inUpdateStmt { - tbl.(table.CachedTable).UpdateLockForRead(context.Background(), b.ctx.GetStore(), startTS, leaseDuration) - } + } + if !b.ctx.GetSessionVars().StmtCtx.InExplainStmt && !b.inDeleteStmt && !b.inUpdateStmt { + tbl.(table.CachedTable).UpdateLockForRead(context.Background(), b.ctx.GetStore(), startTS, leaseDuration) } return nil } diff --git a/pkg/executor/compiler.go b/pkg/executor/compiler.go index 1f1bc6c690c4b..60cc8b4d96452 100644 --- a/pkg/executor/compiler.go +++ b/pkg/executor/compiler.go @@ -48,14 +48,14 @@ func (c *Compiler) Compile(ctx context.Context, stmtNode ast.StmtNode) (_ *ExecS if r == nil { return } - if recoveredErr, ok := r.(error); !ok || !(exeerrors.ErrMemoryExceedForQuery.Equal(recoveredErr) || + recoveredErr, ok := r.(error) + if !ok || !(exeerrors.ErrMemoryExceedForQuery.Equal(recoveredErr) || exeerrors.ErrMemoryExceedForInstance.Equal(recoveredErr) || exeerrors.ErrQueryInterrupted.Equal(recoveredErr) || exeerrors.ErrMaxExecTimeExceeded.Equal(recoveredErr)) { panic(r) - } else { - err = recoveredErr } + err = recoveredErr logutil.Logger(ctx).Error("compile SQL panic", zap.String("SQL", stmtNode.Text()), zap.Stack("stack"), zap.Any("recover", r)) }() diff --git a/pkg/executor/explain.go b/pkg/executor/explain.go index 610368a8852cd..d1e4db3d40269 100644 --- a/pkg/executor/explain.go +++ b/pkg/executor/explain.go @@ -219,9 +219,8 @@ func updateTriggerIntervalByHeapInUse(heapInUse uint64) (time.Duration, int) { return 5 * time.Second, 6 } else if heapInUse < 40*size.GB { return 15 * time.Second, 2 - } else { - return 30 * time.Second, 1 } + return 30 * time.Second, 1 } func (h *memoryDebugModeHandler) run() { diff --git a/pkg/executor/explain_unit_test.go b/pkg/executor/explain_unit_test.go index 4761e7d3a337e..897cbd3a6e0c5 100644 --- a/pkg/executor/explain_unit_test.go +++ b/pkg/executor/explain_unit_test.go @@ -46,9 +46,8 @@ func (e *mockErrorOperator) Open(_ context.Context) error { func (e *mockErrorOperator) Next(_ context.Context, _ *chunk.Chunk) error { if e.toPanic { panic("next panic") - } else { - return errors.New("next error") } + return errors.New("next error") } func (e *mockErrorOperator) Close() error { diff --git a/pkg/expression/bench_test.go b/pkg/expression/bench_test.go index 3f179f9d21f7b..b50cae9456cfb 100644 --- a/pkg/expression/bench_test.go +++ b/pkg/expression/bench_test.go @@ -102,53 +102,49 @@ func (h *benchHelper) init() { } h.exprs = make([]Expression, 0, 10) - if expr, err := NewFunction(h.ctx, ast.Substr, h.inputTypes[3], []Expression{cols[3], cols[2]}...); err != nil { + expr, err := NewFunction(h.ctx, ast.Substr, h.inputTypes[3], []Expression{cols[3], cols[2]}...) + if err != nil { panic("create SUBSTR function failed.") - } else { - h.exprs = append(h.exprs, expr) } - - if expr, err := NewFunction(h.ctx, ast.Plus, h.inputTypes[0], []Expression{cols[1], cols[2]}...); err != nil { + h.exprs = append(h.exprs, expr) + expr1, err := NewFunction(h.ctx, ast.Plus, h.inputTypes[0], []Expression{cols[1], cols[2]}...) + if err != nil { panic("create PLUS function failed.") - } else { - h.exprs = append(h.exprs, expr) } - - if expr, err := NewFunction(h.ctx, ast.GT, h.inputTypes[2], []Expression{cols[11], cols[8]}...); err != nil { + h.exprs = append(h.exprs, expr1) + expr2, err := NewFunction(h.ctx, ast.GT, h.inputTypes[2], []Expression{cols[11], cols[8]}...) + if err != nil { panic("create GT function failed.") - } else { - h.exprs = append(h.exprs, expr) } - - if expr, err := NewFunction(h.ctx, ast.GT, h.inputTypes[2], []Expression{cols[19], cols[10]}...); err != nil { + h.exprs = append(h.exprs, expr2) + expr3, err := NewFunction(h.ctx, ast.GT, h.inputTypes[2], []Expression{cols[19], cols[10]}...) + if err != nil { panic("create GT function failed.") - } else { - h.exprs = append(h.exprs, expr) } - - if expr, err := NewFunction(h.ctx, ast.GT, h.inputTypes[2], []Expression{cols[17], cols[4]}...); err != nil { + h.exprs = append(h.exprs, expr3) + expr4, err := NewFunction(h.ctx, ast.GT, h.inputTypes[2], []Expression{cols[17], cols[4]}...) + if err != nil { panic("create GT function failed.") - } else { - h.exprs = append(h.exprs, expr) } - - if expr, err := NewFunction(h.ctx, ast.GT, h.inputTypes[2], []Expression{cols[18], cols[5]}...); err != nil { + h.exprs = append(h.exprs, expr4) + expr5, err := NewFunction(h.ctx, ast.GT, h.inputTypes[2], []Expression{cols[18], cols[5]}...) + if err != nil { panic("create GT function failed.") - } else { - h.exprs = append(h.exprs, expr) } + h.exprs = append(h.exprs, expr5) - if expr, err := NewFunction(h.ctx, ast.LE, h.inputTypes[2], []Expression{cols[19], cols[4]}...); err != nil { + expr6, err := NewFunction(h.ctx, ast.LE, h.inputTypes[2], []Expression{cols[19], cols[4]}...) + if err != nil { panic("create LE function failed.") - } else { - h.exprs = append(h.exprs, expr) } + h.exprs = append(h.exprs, expr6) - if expr, err := NewFunction(h.ctx, ast.EQ, h.inputTypes[2], []Expression{cols[20], cols[3]}...); err != nil { + expr7, err := NewFunction(h.ctx, ast.EQ, h.inputTypes[2], []Expression{cols[20], cols[3]}...) + if err != nil { panic("create EQ function failed.") - } else { - h.exprs = append(h.exprs, expr) } + h.exprs = append(h.exprs, expr7) + h.exprs = append(h.exprs, cols[2]) h.exprs = append(h.exprs, cols[2]) diff --git a/pkg/expression/builtin_arithmetic.go b/pkg/expression/builtin_arithmetic.go index 1bff34ccd91a1..4ff9792c46817 100644 --- a/pkg/expression/builtin_arithmetic.go +++ b/pkg/expression/builtin_arithmetic.go @@ -190,18 +190,17 @@ func (c *arithmeticPlusFunctionClass) getFunction(ctx sessionctx.Context, args [ sig := &builtinArithmeticPlusDecimalSig{bf} sig.setPbCode(tipb.ScalarFuncSig_PlusDecimal) return sig, nil - } else { - bf, err := newBaseBuiltinFuncWithTp(ctx, c.funcName, args, types.ETInt, types.ETInt, types.ETInt) - if err != nil { - return nil, err - } - if mysql.HasUnsignedFlag(args[0].GetType().GetFlag()) || mysql.HasUnsignedFlag(args[1].GetType().GetFlag()) { - bf.tp.AddFlag(mysql.UnsignedFlag) - } - sig := &builtinArithmeticPlusIntSig{bf} - sig.setPbCode(tipb.ScalarFuncSig_PlusInt) - return sig, nil } + bf, err := newBaseBuiltinFuncWithTp(ctx, c.funcName, args, types.ETInt, types.ETInt, types.ETInt) + if err != nil { + return nil, err + } + if mysql.HasUnsignedFlag(args[0].GetType().GetFlag()) || mysql.HasUnsignedFlag(args[1].GetType().GetFlag()) { + bf.tp.AddFlag(mysql.UnsignedFlag) + } + sig := &builtinArithmeticPlusIntSig{bf} + sig.setPbCode(tipb.ScalarFuncSig_PlusInt) + return sig, nil } type builtinArithmeticPlusIntSig struct { @@ -341,18 +340,17 @@ func (c *arithmeticMinusFunctionClass) getFunction(ctx sessionctx.Context, args sig := &builtinArithmeticMinusDecimalSig{bf} sig.setPbCode(tipb.ScalarFuncSig_MinusDecimal) return sig, nil - } else { - bf, err := newBaseBuiltinFuncWithTp(ctx, c.funcName, args, types.ETInt, types.ETInt, types.ETInt) - if err != nil { - return nil, err - } - if (mysql.HasUnsignedFlag(args[0].GetType().GetFlag()) || mysql.HasUnsignedFlag(args[1].GetType().GetFlag())) && !ctx.GetSessionVars().SQLMode.HasNoUnsignedSubtractionMode() { - bf.tp.AddFlag(mysql.UnsignedFlag) - } - sig := &builtinArithmeticMinusIntSig{baseBuiltinFunc: bf} - sig.setPbCode(tipb.ScalarFuncSig_MinusInt) - return sig, nil } + bf, err := newBaseBuiltinFuncWithTp(ctx, c.funcName, args, types.ETInt, types.ETInt, types.ETInt) + if err != nil { + return nil, err + } + if (mysql.HasUnsignedFlag(args[0].GetType().GetFlag()) || mysql.HasUnsignedFlag(args[1].GetType().GetFlag())) && !ctx.GetSessionVars().SQLMode.HasNoUnsignedSubtractionMode() { + bf.tp.AddFlag(mysql.UnsignedFlag) + } + sig := &builtinArithmeticMinusIntSig{baseBuiltinFunc: bf} + sig.setPbCode(tipb.ScalarFuncSig_MinusInt) + return sig, nil } type builtinArithmeticMinusRealSig struct { @@ -526,21 +524,20 @@ func (c *arithmeticMultiplyFunctionClass) getFunction(ctx sessionctx.Context, ar sig := &builtinArithmeticMultiplyDecimalSig{bf} sig.setPbCode(tipb.ScalarFuncSig_MultiplyDecimal) return sig, nil - } else { - bf, err := newBaseBuiltinFuncWithTp(ctx, c.funcName, args, types.ETInt, types.ETInt, types.ETInt) - if err != nil { - return nil, err - } - if mysql.HasUnsignedFlag(lhsTp.GetFlag()) || mysql.HasUnsignedFlag(rhsTp.GetFlag()) { - bf.tp.AddFlag(mysql.UnsignedFlag) - sig := &builtinArithmeticMultiplyIntUnsignedSig{bf} - sig.setPbCode(tipb.ScalarFuncSig_MultiplyIntUnsigned) - return sig, nil - } - sig := &builtinArithmeticMultiplyIntSig{bf} - sig.setPbCode(tipb.ScalarFuncSig_MultiplyInt) + } + bf, err := newBaseBuiltinFuncWithTp(ctx, c.funcName, args, types.ETInt, types.ETInt, types.ETInt) + if err != nil { + return nil, err + } + if mysql.HasUnsignedFlag(lhsTp.GetFlag()) || mysql.HasUnsignedFlag(rhsTp.GetFlag()) { + bf.tp.AddFlag(mysql.UnsignedFlag) + sig := &builtinArithmeticMultiplyIntUnsignedSig{bf} + sig.setPbCode(tipb.ScalarFuncSig_MultiplyIntUnsigned) return sig, nil } + sig := &builtinArithmeticMultiplyIntSig{bf} + sig.setPbCode(tipb.ScalarFuncSig_MultiplyInt) + return sig, nil } type builtinArithmeticMultiplyRealSig struct{ baseBuiltinFunc } @@ -936,35 +933,33 @@ func (c *arithmeticModFunctionClass) getFunction(ctx sessionctx.Context, args [] sig := &builtinArithmeticModDecimalSig{bf} sig.setPbCode(tipb.ScalarFuncSig_ModDecimal) return sig, nil - } else { - bf, err := newBaseBuiltinFuncWithTp(ctx, c.funcName, args, types.ETInt, types.ETInt, types.ETInt) - if err != nil { - return nil, err - } - if mysql.HasUnsignedFlag(lhsTp.GetFlag()) { - bf.tp.AddFlag(mysql.UnsignedFlag) - } - isLHSUnsigned := mysql.HasUnsignedFlag(args[0].GetType().GetFlag()) - isRHSUnsigned := mysql.HasUnsignedFlag(args[1].GetType().GetFlag()) - - switch { - case isLHSUnsigned && isRHSUnsigned: - sig := &builtinArithmeticModIntUnsignedUnsignedSig{bf} - sig.setPbCode(tipb.ScalarFuncSig_ModIntUnsignedUnsigned) - return sig, nil - case isLHSUnsigned && !isRHSUnsigned: - sig := &builtinArithmeticModIntUnsignedSignedSig{bf} - sig.setPbCode(tipb.ScalarFuncSig_ModIntUnsignedSigned) - return sig, nil - case !isLHSUnsigned && isRHSUnsigned: - sig := &builtinArithmeticModIntSignedUnsignedSig{bf} - sig.setPbCode(tipb.ScalarFuncSig_ModIntSignedUnsigned) - return sig, nil - default: - sig := &builtinArithmeticModIntSignedSignedSig{bf} - sig.setPbCode(tipb.ScalarFuncSig_ModIntSignedSigned) - return sig, nil - } + } + bf, err := newBaseBuiltinFuncWithTp(ctx, c.funcName, args, types.ETInt, types.ETInt, types.ETInt) + if err != nil { + return nil, err + } + if mysql.HasUnsignedFlag(lhsTp.GetFlag()) { + bf.tp.AddFlag(mysql.UnsignedFlag) + } + isLHSUnsigned := mysql.HasUnsignedFlag(args[0].GetType().GetFlag()) + isRHSUnsigned := mysql.HasUnsignedFlag(args[1].GetType().GetFlag()) + switch { + case isLHSUnsigned && isRHSUnsigned: + sig := &builtinArithmeticModIntUnsignedUnsignedSig{bf} + sig.setPbCode(tipb.ScalarFuncSig_ModIntUnsignedUnsigned) + return sig, nil + case isLHSUnsigned && !isRHSUnsigned: + sig := &builtinArithmeticModIntUnsignedSignedSig{bf} + sig.setPbCode(tipb.ScalarFuncSig_ModIntUnsignedSigned) + return sig, nil + case !isLHSUnsigned && isRHSUnsigned: + sig := &builtinArithmeticModIntSignedUnsignedSig{bf} + sig.setPbCode(tipb.ScalarFuncSig_ModIntSignedUnsigned) + return sig, nil + default: + sig := &builtinArithmeticModIntSignedSignedSig{bf} + sig.setPbCode(tipb.ScalarFuncSig_ModIntSignedSigned) + return sig, nil } } diff --git a/pkg/expression/builtin_math.go b/pkg/expression/builtin_math.go index d09b1ce9967ba..eaca3267432ac 100644 --- a/pkg/expression/builtin_math.go +++ b/pkg/expression/builtin_math.go @@ -1364,9 +1364,8 @@ func (b *builtinSignSig) evalInt(row chunk.Row) (int64, bool, error) { return 1, false, nil } else if val == 0 { return 0, false, nil - } else { - return -1, false, nil } + return -1, false, nil } type sqrtFunctionClass struct { diff --git a/pkg/kv/txn.go b/pkg/kv/txn.go index 714f7ebe37e3c..d5d5e949fcc4f 100644 --- a/pkg/kv/txn.go +++ b/pkg/kv/txn.go @@ -215,10 +215,9 @@ func setRequestSourceForInnerTxn(ctx context.Context, txn Transaction) { if intest.InTest { panic("unexpected no source type context, if you see this error, " + "the `RequestSourceTypeKey` is missing in your context") - } else { - logutil.Logger(ctx).Warn("unexpected no source type context, if you see this warning, " + - "the `RequestSourceTypeKey` is missing in the context") } + logutil.Logger(ctx).Warn("unexpected no source type context, if you see this warning, " + + "the `RequestSourceTypeKey` is missing in the context") } // SetTxnResourceGroup update the resource group name of target txn. diff --git a/pkg/parser/misc.go b/pkg/parser/misc.go index dabecd89f1b25..434edb2d790ac 100644 --- a/pkg/parser/misc.go +++ b/pkg/parser/misc.go @@ -1078,9 +1078,8 @@ func (s *Scanner) isTokenIdentifier(lit string, offset int) int { continue } else if s.r.s[idx] == '.' { return 0 - } else { - break } + break } buf := &s.buf diff --git a/pkg/parser/mysql/charset.go b/pkg/parser/mysql/charset.go index 9d65464a71041..29a729e2590bc 100644 --- a/pkg/parser/mysql/charset.go +++ b/pkg/parser/mysql/charset.go @@ -29,9 +29,8 @@ func CharsetNameToID(charset string) uint8 { return ASCIIDefaultCollationID } else if charset == "latin1" { return Latin1DefaultCollationID - } else { - return CharsetIDs[charset] } + return CharsetIDs[charset] } // CharsetIDs maps charset name to its default collation ID. diff --git a/pkg/parser/mysql/locale_format.go b/pkg/parser/mysql/locale_format.go index 30f13841b3bc9..9d92c2a465615 100644 --- a/pkg/parser/mysql/locale_format.go +++ b/pkg/parser/mysql/locale_format.go @@ -49,10 +49,9 @@ func formatENUS(number string, precision string) (string, error) { continue } else if v == '.' && number[1] != '.' { continue - } else { - number = number[:i] - break } + number = number[:i] + break } comma := []byte{','} diff --git a/pkg/planner/core/plan_cache_test.go b/pkg/planner/core/plan_cache_test.go index 2c45bc31f0d48..3f3d63652ed70 100644 --- a/pkg/planner/core/plan_cache_test.go +++ b/pkg/planner/core/plan_cache_test.go @@ -755,9 +755,8 @@ func planCachePointGetQueries(isNonPrep bool) []string { return fmt.Sprintf("%v %v (%v, %v, %v)", col, op, v(), v(), v()) } else if op == "is null" { return fmt.Sprintf("%v %v", col, op) - } else { - return fmt.Sprintf("%v %v %v", col, op, v()) } + return fmt.Sprintf("%v %v %v", col, op, v()) } var queries []string for i := 0; i < 50; i++ { diff --git a/pkg/privilege/privileges/tidb_auth_token_test.go b/pkg/privilege/privileges/tidb_auth_token_test.go index 8fc8739892f0d..8e92bcdfe6c35 100644 --- a/pkg/privilege/privileges/tidb_auth_token_test.go +++ b/pkg/privilege/privileges/tidb_auth_token_test.go @@ -160,42 +160,47 @@ type pair struct { func init() { for i := range publicKeyStrings { - if v, rest, err := jwkRepo.DecodePEM(([]byte)(privateKeyStrings[i])); err != nil { + v, rest, err := jwkRepo.DecodePEM(([]byte)(privateKeyStrings[i])) + if err != nil { log.Println(err.Error()) log.Fatal("Error in decode private key") - } else if len(rest) > 0 { + } + if len(rest) > 0 { log.Fatal("Rest in decode private key") - } else if priKey, ok := v.(*rsa.PrivateKey); !ok { + } + priKey, ok := v.(*rsa.PrivateKey) + if !ok { log.Fatal("Wrong type of private key") - } else { - priKeys = append(priKeys, priKey) } - if v, rest, err := jwkRepo.DecodePEM(([]byte)(publicKeyStrings[i])); err != nil { + priKeys = append(priKeys, priKey) + v, rest, err = jwkRepo.DecodePEM(([]byte)(publicKeyStrings[i])) + if err != nil { log.Println(err.Error()) log.Fatal("Error in decode public key") } else if len(rest) > 0 { log.Fatal("Rest in decode public key") - } else if pubKey, ok := v.(*rsa.PublicKey); !ok { + } + pubKey, ok := v.(*rsa.PublicKey) + if !ok { log.Fatal("Wrong type of public key") - } else { - pubKeys = append(pubKeys, pubKey) - jwk, err := jwkRepo.FromRaw(pubKey) - if err != nil { - log.Fatal("Error when generate jwk") - } - keyAttributes := []pair{ - {jwkRepo.AlgorithmKey, jwaRepo.RS256}, - {jwkRepo.KeyIDKey, fmt.Sprintf("the-key-id-%d", i)}, - {jwkRepo.KeyUsageKey, "sig"}, - } - for _, keyAttribute := range keyAttributes { - if err = jwk.Set(keyAttribute.name, keyAttribute.value); err != nil { - log.Println(err.Error()) - log.Fatalf("Error when set %s for key %d", keyAttribute.name, i) - } + } + pubKeys = append(pubKeys, pubKey) + jwk, err := jwkRepo.FromRaw(pubKey) + if err != nil { + log.Fatal("Error when generate jwk") + } + keyAttributes := []pair{ + {jwkRepo.AlgorithmKey, jwaRepo.RS256}, + {jwkRepo.KeyIDKey, fmt.Sprintf("the-key-id-%d", i)}, + {jwkRepo.KeyUsageKey, "sig"}, + } + for _, keyAttribute := range keyAttributes { + if err = jwk.Set(keyAttribute.name, keyAttribute.value); err != nil { + log.Println(err.Error()) + log.Fatalf("Error when set %s for key %d", keyAttribute.name, i) } - jwkArray = append(jwkArray, jwk) } + jwkArray = append(jwkArray, jwk) } for i := range path { diff --git a/pkg/server/conn.go b/pkg/server/conn.go index f8ff7732a834c..2af3c01dd468c 100644 --- a/pkg/server/conn.go +++ b/pkg/server/conn.go @@ -2148,14 +2148,14 @@ func (cc *clientConn) writeResultSet(ctx context.Context, rs resultset.ResultSet if r == nil { return } - if recoverdErr, ok := r.(error); !ok || !(exeerrors.ErrMemoryExceedForQuery.Equal(recoverdErr) || + recoverdErr, ok := r.(error) + if !ok || !(exeerrors.ErrMemoryExceedForQuery.Equal(recoverdErr) || exeerrors.ErrMemoryExceedForInstance.Equal(recoverdErr) || exeerrors.ErrQueryInterrupted.Equal(recoverdErr) || exeerrors.ErrMaxExecTimeExceeded.Equal(recoverdErr)) { panic(r) - } else { - runErr = recoverdErr } + runErr = recoverdErr // TODO(jianzhang.zj: add metrics here) logutil.Logger(ctx).Error("write query result panic", zap.Stringer("lastSQL", getLastStmtInConn{cc}), zap.Stack("stack"), zap.Any("recover", r)) }() diff --git a/pkg/server/internal/packetio.go b/pkg/server/internal/packetio.go index cf1b10d55901a..c7d4ebf82c86a 100644 --- a/pkg/server/internal/packetio.go +++ b/pkg/server/internal/packetio.go @@ -275,21 +275,18 @@ func (p *PacketIO) WritePacket(data []byte) error { return errors.Trace(mysql.ErrBadConn) } else if n != len(data) { return errors.Trace(mysql.ErrBadConn) - } else { - p.sequence++ - return nil - } - } else { - if n, err := p.bufWriter.Write(data); err != nil { - terror.Log(errors.Trace(err)) - return errors.Trace(mysql.ErrBadConn) - } else if n != len(data) { - return errors.Trace(mysql.ErrBadConn) - } else { - p.sequence++ - return nil } + p.sequence++ + return nil } + if n, err := p.bufWriter.Write(data); err != nil { + terror.Log(errors.Trace(err)) + return errors.Trace(mysql.ErrBadConn) + } else if n != len(data) { + return errors.Trace(mysql.ErrBadConn) + } + p.sequence++ + return nil } // Flush flushes buffered data to network. diff --git a/pkg/session/session.go b/pkg/session/session.go index f80cc6d4fccde..4c1a62e08e6ad 100644 --- a/pkg/session/session.go +++ b/pkg/session/session.go @@ -4376,12 +4376,11 @@ func (s *session) setRequestSource(ctx context.Context, stmtLabel string, stmtNo if intest.InTest { panic("unexpected no source type context, if you see this error, " + "the `RequestSourceTypeKey` is missing in your context") - } else { - logutil.Logger(ctx).Warn("unexpected no source type context, if you see this warning, "+ - "the `RequestSourceTypeKey` is missing in the context", - zap.Bool("internal", s.isInternal()), - zap.String("sql", stmtNode.Text())) } + logutil.Logger(ctx).Warn("unexpected no source type context, if you see this warning, "+ + "the `RequestSourceTypeKey` is missing in the context", + zap.Bool("internal", s.isInternal()), + zap.String("sql", stmtNode.Text())) } // RemoveLockDDLJobs removes the DDL jobs which doesn't get the metadata lock from job2ver. diff --git a/pkg/session/txn.go b/pkg/session/txn.go index 8bf5d66ef529c..3ab0a6e22c781 100644 --- a/pkg/session/txn.go +++ b/pkg/session/txn.go @@ -544,9 +544,8 @@ func (txn *LazyTxn) IsInFairLockingMode() bool { return txn.Transaction.IsInFairLockingMode() } else if txn.pending() { return txn.enterFairLockingOnValid - } else { - return false } + return false } func (txn *LazyTxn) reset() { diff --git a/pkg/store/driver/txn/union_iter.go b/pkg/store/driver/txn/union_iter.go index 0e47776f2f79b..3aa2d87e080b8 100644 --- a/pkg/store/driver/txn/union_iter.go +++ b/pkg/store/driver/txn/union_iter.go @@ -119,18 +119,17 @@ func (iter *UnionIter) updateCur() error { // record from snapshot comes first iter.curIsDirty = false break - } else { - // record from dirty comes first - if len(iter.dirtyIt.Value()) == 0 { - // jump over this deletion - if err := iter.dirtyNext(); err != nil { - return err - } - continue + } + // record from dirty comes first + if len(iter.dirtyIt.Value()) == 0 { + // jump over this deletion + if err := iter.dirtyNext(); err != nil { + return err } - iter.curIsDirty = true - break + continue } + iter.curIsDirty = true + break } } return nil diff --git a/pkg/tidb-binlog/node/registry.go b/pkg/tidb-binlog/node/registry.go index 27c17a83cada4..e9c4a292adbe1 100644 --- a/pkg/tidb-binlog/node/registry.go +++ b/pkg/tidb-binlog/node/registry.go @@ -97,10 +97,9 @@ func (r *EtcdRegistry) UpdateNode(pctx context.Context, prefix string, status *S // not found then create a new node log.Info("node dosen't exist, will create one", zap.String("NodeID", status.NodeID)) return r.createNode(ctx, prefix, status) - } else { - // found it, update status information of the node - return r.updateNode(ctx, prefix, status) } + // found it, update status information of the node + return r.updateNode(ctx, prefix, status) } func (r *EtcdRegistry) checkNodeExists(ctx context.Context, prefix, nodeID string) (bool, error) { diff --git a/pkg/types/convert.go b/pkg/types/convert.go index 7a860843d6afd..9927ecf879151 100644 --- a/pkg/types/convert.go +++ b/pkg/types/convert.go @@ -219,14 +219,14 @@ func convertScientificNotation(str string) (string, error) { } // 123.456 >> 5 = 12345600 return f[:point] + f[point+1:] + strings.Repeat("0", point+int(exp)-len(f)+1), nil - } else { // move point left - exp = -exp - if int(exp) < point { // 123.456 << 2 = 1.23456 - return f[:point-int(exp)] + "." + f[point-int(exp):point] + f[point+1:], nil - } - // 123.456 << 5 = 0.00123456 - return "0." + strings.Repeat("0", int(exp)-point) + f[:point] + f[point+1:], nil } + // move point left + exp = -exp + if int(exp) < point { // 123.456 << 2 = 1.23456 + return f[:point-int(exp)] + "." + f[point-int(exp):point] + f[point+1:], nil + } + // 123.456 << 5 = 0.00123456 + return "0." + strings.Repeat("0", int(exp)-point) + f[:point] + f[point+1:], nil } func convertDecimalStrToUint(str string, upperBound uint64, tp byte) (uint64, error) { diff --git a/pkg/types/datum.go b/pkg/types/datum.go index 5d5a804eba54e..50ec3035fead6 100644 --- a/pkg/types/datum.go +++ b/pkg/types/datum.go @@ -1118,10 +1118,9 @@ func ProduceStrWithSpecifiedTp(s string, tp *FieldType, ctx Context, padZero boo } else if r == utf8.RuneError && size == 1 { // Invalid string continue - } else { - // Get the truncate position - break } + // Get the truncate position + break } overflowed = s[truncateLen:] s = truncateStr(s, truncateLen) diff --git a/pkg/types/time.go b/pkg/types/time.go index cadb6968cfa07..19df35a56b996 100644 --- a/pkg/types/time.go +++ b/pkg/types/time.go @@ -1544,9 +1544,8 @@ func (d Duration) Compare(o Duration) int { return 1 } else if d.Duration == o.Duration { return 0 - } else { - return -1 } + return -1 } // CompareString is like Compare, diff --git a/pkg/util/collate/collate.go b/pkg/util/collate/collate.go index 442db4cbc67c4..1883e2dd37cd5 100644 --- a/pkg/util/collate/collate.go +++ b/pkg/util/collate/collate.go @@ -106,9 +106,8 @@ func CompatibleCollate(collate1, collate2 string) bool { return true } else if (collate1 == "utf8mb4_unicode_ci" || collate1 == "utf8_unicode_ci") && (collate2 == "utf8mb4_unicode_ci" || collate2 == "utf8_unicode_ci") { return true - } else { - return collate1 == collate2 } + return collate1 == collate2 } // RewriteNewCollationIDIfNeeded rewrites a collation id if the new collations are enabled. diff --git a/pkg/util/keydecoder/keydecoder.go b/pkg/util/keydecoder/keydecoder.go index fa2200405c3c8..4924879e4b487 100644 --- a/pkg/util/keydecoder/keydecoder.go +++ b/pkg/util/keydecoder/keydecoder.go @@ -62,11 +62,10 @@ func handleType(handle kv.Handle) HandleType { return handleType(h.Handle) } else if h, ok := handle.(*kv.PartitionHandle); ok { return handleType(h.Handle) - } else { - logutil.BgLogger().Warn("Unexpected kv.Handle type", - zap.String("handle Type", fmt.Sprintf("%T", handle)), - ) } + logutil.BgLogger().Warn("Unexpected kv.Handle type", + zap.String("handle Type", fmt.Sprintf("%T", handle)), + ) return UnknownHandle } diff --git a/pkg/util/selection/selection.go b/pkg/util/selection/selection.go index 3974188ed3503..8c3aafd86b55f 100644 --- a/pkg/util/selection/selection.go +++ b/pkg/util/selection/selection.go @@ -47,9 +47,8 @@ func introselect(data Interface, left, right, k int, depth int) int { return k } else if k < pivotIndex { return introselect(data, left, pivotIndex-1, k, depth-1) - } else { - return introselect(data, pivotIndex+1, right, k, depth-1) } + return introselect(data, pivotIndex+1, right, k, depth-1) } // quickselect is used in test for comparison. @@ -64,9 +63,8 @@ func quickselect(data Interface, left, right, k int) int { return k } else if k < pivotIndex { return quickselect(data, left, pivotIndex-1, k) - } else { - return quickselect(data, pivotIndex+1, right, k) } + return quickselect(data, pivotIndex+1, right, k) } func medianOfMedians(data Interface, left, right, k int) int { @@ -79,9 +77,8 @@ func medianOfMedians(data Interface, left, right, k int) int { return k } else if k < pivotIndex { return medianOfMedians(data, left, pivotIndex-1, k) - } else { - return medianOfMedians(data, pivotIndex+1, right, k) } + return medianOfMedians(data, pivotIndex+1, right, k) } func randomPivot(_ Interface, left, right int) int { diff --git a/pkg/util/stmtsummary/evicted.go b/pkg/util/stmtsummary/evicted.go index 580029dad12ce..ab1e45a4723ac 100644 --- a/pkg/util/stmtsummary/evicted.go +++ b/pkg/util/stmtsummary/evicted.go @@ -179,9 +179,8 @@ func (seElement *stmtSummaryByDigestEvictedElement) matchAndAdd(digestKey *stmtS return isMatch } else if eEndTime <= sBeginTime { return isTooOld - } else { - return isTooYoung } + return isTooYoung } // ToEvictedCountDatum converts history evicted record to `evicted count` record's datum diff --git a/pkg/util/stmtsummary/statement_summary.go b/pkg/util/stmtsummary/statement_summary.go index b778171356d6c..9b428a48d2756 100644 --- a/pkg/util/stmtsummary/statement_summary.go +++ b/pkg/util/stmtsummary/statement_summary.go @@ -290,9 +290,8 @@ func (ssMap *stmtSummaryByDigestMap) AddStatement(sei *StmtExecInfo) { unixTime, err := strconv.ParseInt(unixTimeStr, 10, 64) if err != nil { panic(err.Error()) - } else { - now = unixTime } + now = unixTime } })