From 73c4edaaaeb4c631cf2f7e1459c8e2749e54452a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= Date: Tue, 28 May 2024 09:31:58 +0200 Subject: [PATCH 1/2] util: use runtime.Version() to get Go version --- pkg/util/printer/printer.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkg/util/printer/printer.go b/pkg/util/printer/printer.go index 495053475e4c2..2d2122f4b0da8 100644 --- a/pkg/util/printer/printer.go +++ b/pkg/util/printer/printer.go @@ -18,6 +18,7 @@ import ( "bytes" "encoding/json" "fmt" + "runtime" _ "runtime" // import link package _ "unsafe" // required by go:linkname @@ -29,6 +30,12 @@ import ( "go.uber.org/zap" ) +var buildVersion string + +func init() { + buildVersion = runtime.Version() +} + // PrintTiDBInfo prints the TiDB version information. func PrintTiDBInfo() { fields := []zap.Field{ @@ -175,6 +182,3 @@ func GetPrintResult(cols []string, datas [][]string) (string, bool) { value = append(value, getPrintDivLine(maxColLen)...) return string(value), true } - -//go:linkname buildVersion runtime.buildVersion -var buildVersion string From c78e4e4f489a333b61ad66ef673601011613b3d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= Date: Tue, 28 May 2024 09:45:51 +0200 Subject: [PATCH 2/2] Remove runtime and unsafe --- pkg/util/printer/printer.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkg/util/printer/printer.go b/pkg/util/printer/printer.go index 2d2122f4b0da8..ac102ebf3f9c6 100644 --- a/pkg/util/printer/printer.go +++ b/pkg/util/printer/printer.go @@ -19,8 +19,6 @@ import ( "encoding/json" "fmt" "runtime" - _ "runtime" // import link package - _ "unsafe" // required by go:linkname "github.com/pingcap/tidb/pkg/config" "github.com/pingcap/tidb/pkg/parser/mysql"