Skip to content

pkg/util/hack: split map ABI for go1.25 and go1.26 #66254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ti-chi-bot merged 16 commits into from
Feb 25, 2026
+512 −16
Merged

pkg/util/hack: split map ABI for go1.25 and go1.26 #66254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
31af02f
pkg/util/hack: split map ABI for go1.25 and go1.26
hawkingrei Feb 13, 2026
b19c713
pkg/util/hack: align go1.26 map ABI naming with runtime
hawkingrei Feb 13, 2026
6ec0e42
pkg/util/hack: conditionally compile map ABI tests for go1.25 and go1.26
hawkingrei Feb 13, 2026
ff9d313
update
hawkingrei Feb 13, 2026
2c1fb87
use go1.26
hawkingrei Feb 13, 2026
1869085
lint: exclude revive var-naming for go126 map ABI mirror
hawkingrei Feb 13, 2026
7aa075c
makefile: run revive via golangci-lint in lint target
hawkingrei Feb 13, 2026
d8e2c2c
makefile: build golangci-lint with go.mod toolchain
hawkingrei Feb 13, 2026
7bf7e35
lint: align revive rules with tools/check/revive.toml
hawkingrei Feb 13, 2026
3049244
lint: exclude selected revive var-naming and dot-import findings
hawkingrei Feb 13, 2026
d0ce1c6
lint: restore master lint setup and exclude pkg/util/hack in revive
hawkingrei Feb 13, 2026
809622b
lint: use revive Exclude key for pkg/util/hack filters
hawkingrei Feb 13, 2026
dd9bae3
lint: use top-level revive exclude for pkg/util/hack
hawkingrei Feb 13, 2026
73c811f
lint: exclude pkg/util/hack via revive CLI flags
hawkingrei Feb 13, 2026
378371a
update
hawkingrei Feb 13, 2026
5d16af1
build: skip lint on pkg/util/hack and clean grep regex
hawkingrei Feb 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ errdoc:tools/bin/errdoc-gen
.PHONY: lint
lint:tools/bin/revive
@echo "linting"
@tools/bin/revive -formatter friendly -config tools/check/revive.toml $(FILES_TIDB_TESTS)
@tools/bin/revive -formatter friendly -config tools/check/revive.toml \
-exclude pkg/util/hack/... -exclude ./pkg/util/hack/... $(FILES_TIDB_TESTS)
@tools/bin/revive -formatter friendly -config tools/check/revive.toml ./lightning/...
go run tools/dashboard-linter/main.go pkg/metrics/grafana/overview.json
go run tools/dashboard-linter/main.go pkg/metrics/grafana/performance_overview.json
Expand Down
10 changes: 5 additions & 5 deletions Makefile.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,15 @@ LINUX := "Linux"
MAC := "Darwin"

PACKAGE_LIST := go list ./...
PACKAGE_LIST_TIDB_TESTS := go list ./... | grep -vE "github.com\/pingcap\/tidb\/br|github.com\/pingcap\/tidb\/cmd|github.com\/pingcap\/tidb\/dumpling"
PACKAGE_LIST_TIDB_TESTS := go list ./... | grep -vE "github.com/pingcap/tidb/br|github.com/pingcap/tidb/cmd|github.com/pingcap/tidb/dumpling"
PACKAGES ?= $$($(PACKAGE_LIST))
PACKAGES_TIDB_TESTS ?= $$($(PACKAGE_LIST_TIDB_TESTS))
PACKAGE_DIRECTORIES := $(PACKAGE_LIST) | sed 's|github.com/pingcap/$(PROJECT)/||'
PACKAGE_DIRECTORIES_TIDB_TESTS := $(PACKAGE_LIST_TIDB_TESTS) | sed 's|github.com/pingcap/$(PROJECT)/||'
FILES := $$(find $$($(PACKAGE_DIRECTORIES)) -name "*.go")
FILES_TIDB_TESTS := $$(find $$($(PACKAGE_DIRECTORIES_TIDB_TESTS)) -name "*.go")
FILES_TIDB_TESTS := $$(find $$($(PACKAGE_DIRECTORIES_TIDB_TESTS)) -name "*.go" -not -path "pkg/util/hack/*")

UNCONVERT_PACKAGES_LIST := go list ./...| grep -vE "lightning\/checkpoints|lightning\/manual|lightning\/common|tidb-binlog\/proto\/go-binlog"
UNCONVERT_PACKAGES_LIST := go list ./...| grep -vE "lightning/checkpoints|lightning/manual|lightning/common|tidb-binlog/proto/go-binlog"
UNCONVERT_PACKAGES := $$($(UNCONVERT_PACKAGES_LIST))

FAILPOINT_ENABLE := find $$PWD/ -mindepth 1 -type d | grep -vE "(\.git|\.idea|tools)" | xargs tools/bin/failpoint-ctl enable
Expand Down Expand Up @@ -114,7 +114,7 @@ ifeq ("$(WITH_CHECK)", "1")
endif

BR_PKG := github.com/pingcap/tidb/br
BR_PACKAGES := go list ./...| grep "github.com\/pingcap\/tidb\/br"
BR_PACKAGES := go list ./...| grep "github.com/pingcap/tidb/br"
BR_PACKAGE_DIRECTORIES := $(BR_PACKAGES) | sed 's|github.com/pingcap/$(PROJECT)/||'
LIGHTNING_BIN := bin/tidb-lightning
LIGHTNING_CTL_BIN := bin/tidb-lightning-ctl
Expand All @@ -123,7 +123,7 @@ TEST_DIR := /tmp/backup_restore_test


DUMPLING_PKG := github.com/pingcap/tidb/dumpling
DUMPLING_PACKAGES := go list ./... | grep 'github.com\/pingcap\/tidb\/dumpling'
DUMPLING_PACKAGES := go list ./... | grep 'github.com/pingcap/tidb/dumpling'
DUMPLING_PACKAGE_DIRECTORIES := $(DUMPLING_PACKAGES) | sed 's|github.com/pingcap/$(PROJECT)/||'
DUMPLING_BIN := bin/dumpling
DUMPLING_CHECKER := awk '{ print } END { if (NR > 0) { exit 1 } }'
Expand Down
3 changes: 3 additions & 0 deletions pkg/util/hack/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ go_library(
srcs = [
"hack.go",
"map_abi.go",
"map_abi_go126.go",
],
importpath = "github.com/pingcap/tidb/pkg/util/hack",
visibility = ["//visibility:public"],
Expand All @@ -17,6 +18,8 @@ go_test(
"hack_test.go",
"main_test.go",
"map_abi_test.go",
"map_abi_test_type_go125_test.go",
"map_abi_test_type_go126_test.go",
],
embed = [":hack"],
flaky = True,
Expand Down
2 changes: 2 additions & 0 deletions pkg/util/hack/map_abi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//go:build go1.25 && !go1.26
Copy link
Contributor

@lance6716 lance6716 Feb 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where does the build process add go1.25 tag? I didn't find the doc related to it 😂

And seems we only need one version tag?

//go:build go1.25

//go:build go1.26

should be enough

Copy link
Member Author

@hawkingrei hawkingrei Feb 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/kakkoyun/client_golang/blob/95d71bd58822329fd53f5c563b771ba49df5dc1b/prometheus/collectors/go_collector_go126_test.go#L12-L16

This way of writing is a standard.

Copy link
Contributor

@lance6716 lance6716 Feb 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gemini says it's called ReleaseTags, golang will assign all tags <= current version, so we should use

//go:build go1.25 && !go1.26

However I didn't find the official document for it. Do you have more authorized materials for this feature?


package hack

import (
Expand Down
Loading