test: fix part of unit tests for next-gen (#63192)

ref #61702

Author: tangenta

br/pkg/mock/BUILD.bazel

@@ -23,6 +23,7 @@ go_library(
         "//pkg/server",
         "//pkg/session",
         "//pkg/store/mockstore",
+        "//pkg/store/mockstore/teststore",
         "//pkg/types",
         "@com_github_aws_aws_sdk_go//aws/request",
         "@com_github_aws_aws_sdk_go//service/s3",

br/pkg/mock/mock_cluster.go

@@ -21,6 +21,7 @@ import (
 	"github.com/pingcap/tidb/pkg/server"
 	"github.com/pingcap/tidb/pkg/session"
 	"github.com/pingcap/tidb/pkg/store/mockstore"
+	"github.com/pingcap/tidb/pkg/store/mockstore/teststore"
 	"github.com/tikv/client-go/v2/testutils"
 	"github.com/tikv/client-go/v2/tikv"
 	pd "github.com/tikv/pd/client"
@@ -61,7 +62,7 @@ func NewCluster() (*Cluster, error) {
 		}()
 	})
 
-	storage, err := mockstore.NewMockStore(
+	storage, err := teststore.NewMockStoreWithoutBootstrap(
 		mockstore.WithClusterInspector(func(c testutils.Cluster) {
 			mockstore.BootstrapWithSingleStore(c)
 			cluster.Cluster = c

pkg/ddl/db_test.go

@@ -607,6 +607,9 @@ func TestCancelJobWriteConflict(t *testing.T) {
 }
 
 func TestTxnSavepointWithDDL(t *testing.T) {
+	if kerneltype.IsNextGen() {
+		t.Skip("MDL is always enabled and read only in nextgen")
+	}
 	store := testkit.CreateMockStoreWithSchemaLease(t, dbTestLease)
 	tk := testkit.NewTestKit(t, store)
 	tk2 := testkit.NewTestKit(t, store)
@@ -1361,6 +1364,9 @@ func TestGetAllTableInfos(t *testing.T) {
 }
 
 func TestGetVersionFailed(t *testing.T) {
+	if kerneltype.IsNextGen() {
+		t.Skip("MDL is always enabled and read only in nextgen")
+	}
 	store := testkit.CreateMockStore(t)
 
 	tk := testkit.NewTestKit(t, store)

pkg/ddl/ddl_test.go

@@ -33,7 +33,6 @@ import (
 	"github.com/pingcap/tidb/pkg/parser/charset"
 	"github.com/pingcap/tidb/pkg/parser/mysql"
 	"github.com/pingcap/tidb/pkg/parser/terror"
-	"github.com/pingcap/tidb/pkg/store/mockstore"
 	"github.com/pingcap/tidb/pkg/tablecodec"
 	"github.com/pingcap/tidb/pkg/testkit/testfailpoint"
 	"github.com/pingcap/tidb/pkg/util/dbterror"
@@ -76,12 +75,6 @@ func (s *JobSubmitter) DDLJobDoneChMap() *generic.SyncMap[int64, chan struct{}]
 	return s.ddlJobDoneChMap
 }
 
-func createMockStore(t *testing.T) kv.Storage {
-	store, err := mockstore.NewMockStore()
-	require.NoError(t, err)
-	return store
-}
-
 func TestGetIntervalFromPolicy(t *testing.T) {
 	policy := []time.Duration{
 		1 * time.Second,

pkg/ddl/multi_schema_change_test.go

@@ -21,6 +21,7 @@ import (
 	"testing"
 
 	"github.com/pingcap/failpoint"
+	"github.com/pingcap/tidb/pkg/config/kerneltype"
 	"github.com/pingcap/tidb/pkg/ddl"
 	"github.com/pingcap/tidb/pkg/errno"
 	"github.com/pingcap/tidb/pkg/kv"
@@ -848,6 +849,9 @@ func TestMultiSchemaChangeMDLView(t *testing.T) {
 }
 
 func TestMultiSchemaChangeWithoutMDL(t *testing.T) {
+	if kerneltype.IsNextGen() {
+		t.Skip("MDL is always enabled and read only in nextgen")
+	}
 	store := testkit.CreateMockStore(t)
 	tk := testkit.NewTestKit(t, store)
 	tk.MustExec("use test")

pkg/ddl/schematracker/BUILD.bazel

@@ -34,8 +34,10 @@ go_library(
         "//pkg/table/tables",
         "//pkg/util/collate",
         "//pkg/util/dbterror",
+        "//pkg/util/logutil",
         "@com_github_ngaut_pools//:pools",
         "@com_github_pingcap_errors//:errors",
+        "@org_uber_go_zap//:zap",
     ],
 )
 

pkg/ddl/schematracker/checker.go

@@ -40,6 +40,8 @@ import (
 	"github.com/pingcap/tidb/pkg/statistics/handle"
 	"github.com/pingcap/tidb/pkg/store/helper"
 	"github.com/pingcap/tidb/pkg/store/mockstore"
+	"github.com/pingcap/tidb/pkg/util/logutil"
+	"go.uber.org/zap"
 )
 
 var (
@@ -573,6 +575,13 @@ func (d *Checker) DoDDLJobWrapper(ctx sessionctx.Context, jobW *ddl.JobWrapper)
 	return de.DoDDLJobWrapper(ctx, jobW)
 }
 
+// InitFromIS initializes the schema tracker from an InfoSchema.
+func (d *Checker) InitFromIS(is infoschema.InfoSchema) {
+	if err := d.tracker.InitFromIS(is); err != nil {
+		logutil.BgLogger().Warn("failed to init schema tracker from info schema", zap.Error(err))
+	}
+}
+
 type storageAndMore interface {
 	kv.Storage
 	kv.StorageWithPD

pkg/ddl/schematracker/info_store.go

@@ -41,6 +41,24 @@ func NewInfoStore(lowerCaseTableNames int) *InfoStore {
 	}
 }
 
+// InitFromIS initializes InfoStore from an InfoSchema.
+func (i *InfoStore) InitFromIS(is infoschema.InfoSchema) error {
+	ctx := context.Background()
+	for _, db := range is.AllSchemas() {
+		i.PutSchema(db)
+		tbls, err := is.SchemaTableInfos(ctx, db.Name)
+		if err != nil {
+			return err
+		}
+		for _, tbl := range tbls {
+			if err = i.PutTable(db.Name, tbl); err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
 func (i *InfoStore) ciStr2Key(name ast.CIStr) string {
 	if i.lowerCaseTableNames == 0 {
 		return name.O

pkg/ddl/tests/fail/BUILD.bazel

@@ -12,6 +12,7 @@ go_test(
     shard_count = 11,
     deps = [
         "//pkg/config",
+        "//pkg/config/kerneltype",
         "//pkg/ddl",
         "//pkg/ddl/schematracker",
         "//pkg/ddl/schemaver",
@@ -21,6 +22,7 @@ go_test(
         "//pkg/session",
         "//pkg/sessionctx/vardef",
         "//pkg/store/mockstore",
+        "//pkg/store/mockstore/teststore",
         "//pkg/tablecodec",
         "//pkg/testkit",
         "//pkg/testkit/testfailpoint",

pkg/ddl/tests/fail/fail_db_test.go

@@ -22,6 +22,7 @@ import (
 	"time"
 
 	"github.com/pingcap/failpoint"
+	"github.com/pingcap/tidb/pkg/config/kerneltype"
 	"github.com/pingcap/tidb/pkg/ddl/schematracker"
 	"github.com/pingcap/tidb/pkg/ddl/schemaver"
 	"github.com/pingcap/tidb/pkg/domain"
@@ -30,6 +31,7 @@ import (
 	"github.com/pingcap/tidb/pkg/session"
 	"github.com/pingcap/tidb/pkg/sessionctx/vardef"
 	"github.com/pingcap/tidb/pkg/store/mockstore"
+	"github.com/pingcap/tidb/pkg/store/mockstore/teststore"
 	"github.com/pingcap/tidb/pkg/tablecodec"
 	"github.com/pingcap/tidb/pkg/testkit"
 	"github.com/pingcap/tidb/pkg/testkit/testfailpoint"
@@ -51,7 +53,7 @@ func createFailDBSuite(t *testing.T) (s *failedSuite) {
 func createFailDBSuiteWithLease(t *testing.T, lease time.Duration) (s *failedSuite) {
 	s = new(failedSuite)
 	var err error
-	s.store, err = mockstore.NewMockStore(
+	s.store, err = teststore.NewMockStoreWithoutBootstrap(
 		mockstore.WithClusterInspector(func(c testutils.Cluster) {
 			mockstore.BootstrapWithSingleStore(c)
 			s.cluster = c
@@ -211,6 +213,9 @@ func TestAddIndexFailed(t *testing.T) {
 
 	// Split the table.
 	tableStart := tablecodec.GenTableRecordPrefix(tblID)
+	if kerneltype.IsNextGen() {
+		tableStart = s.store.GetCodec().EncodeKey(tableStart)
+	}
 	s.cluster.SplitKeys(tableStart, tableStart.PrefixNext(), 100)
 
 	tk.MustExec("alter table t add index idx_b(b)")