br: enhance version info logging, trim keyspace prefix for region merging

Makefile

@@ -427,7 +427,7 @@ lightning_web: ## Build Lightning web UI
 
 .PHONY: build_br
 build_br: ## Build BR (backup and restore) tool
-	CGO_ENABLED=1 $(GOBUILD_NO_TAGS) -tags codes $(RACE_FLAG) -ldflags '$(LDFLAGS) $(CHECK_FLAG)' -o $(BR_BIN) ./br/cmd/br
+	CGO_ENABLED=1 $(GOBUILD) $(RACE_FLAG) -ldflags '$(LDFLAGS) $(CHECK_FLAG)' -o $(BR_BIN) ./br/cmd/br
 
 .PHONY: build_lightning_for_web
 build_lightning_for_web:

br/pkg/rtree/rtree.go

@@ -15,6 +15,7 @@ import (
 	"github.com/pingcap/tidb/br/pkg/utils"
 	"github.com/pingcap/tidb/pkg/tablecodec"
 	"github.com/pingcap/tidb/pkg/util/redact"
+	"github.com/tikv/client-go/v2/tikv"
 	"go.uber.org/zap"
 )
 
@@ -160,8 +161,19 @@ func NeedsMerge(left, right *RangeStats, splitSizeBytes, splitKeyCount uint64) b
 	if leftKeys+rightKeys > splitKeyCount {
 		return false
 	}
-	tableID1, indexID1, isRecord1, err1 := tablecodec.DecodeKeyHead(left.StartKey)
-	tableID2, indexID2, isRecord2, err2 := tablecodec.DecodeKeyHead(right.StartKey)
+
+	parseInnerKey := func(key []byte) (int64, int64, bool, error) {
+		// Trim the keyspace prefix.
+		_, innerKey, err := tikv.DecodeKey(key, kvrpcpb.APIVersion_V2)
+		if err != nil {
+			// Not a V2 (keyspaced) key.
+			return tablecodec.DecodeKeyHead(key)
+		}
+		return tablecodec.DecodeKeyHead(innerKey)
+	}
+
+	tableID1, indexID1, isRecord1, err1 := parseInnerKey(left.StartKey)
+	tableID2, indexID2, isRecord2, err2 := parseInnerKey(right.StartKey)
 
 	// Failed to decode the file key head... can this happen?
 	if err1 != nil || err2 != nil {

br/pkg/rtree/rtree_test.go

@@ -8,13 +8,15 @@ import (
 	"testing"
 
 	backuppb "github.com/pingcap/kvproto/pkg/brpb"
+	"github.com/pingcap/kvproto/pkg/keyspacepb"
 	"github.com/pingcap/kvproto/pkg/kvrpcpb"
 	"github.com/pingcap/tidb/br/pkg/metautil"
 	"github.com/pingcap/tidb/br/pkg/rtree"
 	"github.com/pingcap/tidb/br/pkg/storage"
 	"github.com/pingcap/tidb/pkg/kv"
 	"github.com/pingcap/tidb/pkg/tablecodec"
 	"github.com/stretchr/testify/require"
+	"github.com/tikv/client-go/v2/tikv"
 )
 
 func newRange(start, end []byte) *rtree.Range {
@@ -323,7 +325,27 @@ func encodeTableRecord(prefix kv.Key, rowID uint64) []byte {
 	return tablecodec.EncodeRecordKey(prefix, kv.IntHandle(rowID))
 }
 
-func TestRangeTreeMerge(t *testing.T) {
+func makeEncodeKeyspacedTableRecord(keyspace uint32) func(prefix kv.Key, rowID uint64) []byte {
+	codec, err := tikv.NewCodecV2(tikv.ModeTxn, &keyspacepb.KeyspaceMeta{
+		Id:   keyspace,
+		Name: "test",
+	})
+	if err != nil {
+		panic(err)
+	}
+	return func(prefix kv.Key, rowID uint64) []byte {
+		return codec.EncodeKey(tablecodec.EncodeRecordKey(prefix, kv.IntHandle(rowID)))
+	}
+}
+
+func TestRangeTreeMerge(t0 *testing.T) {
+	t0.Run("default-keyspace", func(t *testing.T) { testRangeTreeMerge(t, encodeTableRecord) })
+	t0.Run("keyspaced", func(t *testing.T) {
+		testRangeTreeMerge(t, makeEncodeKeyspacedTableRecord(1))
+	})
+}
+
+func testRangeTreeMerge(t *testing.T, encodeTableRecord func(kv.Key, uint64) []byte) {
 	rangeTree := rtree.NewRangeStatsTree()
 	tablePrefix := tablecodec.GenTableRecordPrefix(1)
 	for i := uint64(0); i < 10000; i += 1 {

br/pkg/version/build/info.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 
 	"github.com/pingcap/log"
+	"github.com/pingcap/tidb/pkg/config/kerneltype"
 	"github.com/pingcap/tidb/pkg/parser/mysql"
 	"github.com/pingcap/tidb/pkg/util/israce"
 	"github.com/pingcap/tidb/pkg/util/versioninfo"
@@ -56,7 +57,9 @@ func LogInfo(name AppName) {
 		zap.String("git-branch", GitBranch),
 		zap.String("go-version", goVersion),
 		zap.String("utc-build-time", BuildTS),
-		zap.Bool("race-enabled", israce.RaceEnabled))
+		zap.Bool("race-enabled", israce.RaceEnabled),
+		zap.Bool("for-next-gen?", kerneltype.IsNextGen()),
+	)
 }
 
 // Info returns version information.
@@ -67,6 +70,11 @@ func Info() string {
 	fmt.Fprintf(&buf, "Git Branch: %s\n", GitBranch)
 	fmt.Fprintf(&buf, "Go Version: %s\n", goVersion)
 	fmt.Fprintf(&buf, "UTC Build Time: %s\n", BuildTS)
-	fmt.Fprintf(&buf, "Race Enabled: %t", israce.RaceEnabled)
+	fmt.Fprintf(&buf, "Race Enabled: %t\n", israce.RaceEnabled)
+	kt := "Classic"
+	if kerneltype.IsNextGen() {
+		kt = "Next-Gen"
+	}
+	fmt.Fprintf(&buf, "Kernel Type: %s", kt)
 	return buf.String()
 }

br/pkg/version/build/info_test.go

@@ -17,6 +17,8 @@ func TestInfo(t *testing.T) {
 	require.Regexp(t, "^Git Branch", lines[2])
 	require.Regexp(t, "^Go Version", lines[3])
 	require.Regexp(t, "^UTC Build Time", lines[4])
+	require.Regexp(t, "^Race Enabled", lines[5])
+	require.Regexp(t, "^Kernel Type", lines[6])
 }
 
 func TestLogInfo(*testing.T) {