Merge commit '510d0037b18f258f505abc6cf13a8128563e9359' into wenxuan/…

…long-vector * commit '510d0037b18f258f505abc6cf13a8128563e9359': *: upgrade pd client to make sure tso client initiate successfully (#58752) ttl, test: scale TTL workers during the fault tests (#58750) planner: improve warning messages for unsupported HASH_JOIN hints (#58646) planner: prealloc the slices in the SplitCorColAccessCondFromFilters (#58785) ddl: supports non-unique global index (#58678) util/stmtsummary: add the network traffic related fields (#58101) var: enable `pd_enable_follower_handle_region` as default (#58385) statistics: refactor stats meta handling to use DeltaUpdate for multi-table support (#58657) parser: move 'model' to 'ast' pkg (#58704) statistics: add recover to protect background task (#58739) disttask: cancel subtask context if scheduled away (#58615) *: don't handle live updates of column size (#58596) *: fix a bug for default_authentication_plugin (2) (#58723) dupdetect: gRPC cancel should trigger retry (#58542) *: fix a bug for default_authentication_plugin (#57391) distsql: Fix backoff execution info inaccurate issue (#58707)
pingcap · Jan 8, 2025 · 3f825ba · 3f825ba
2 parents 8a776af + 510d003
commit 3f825ba
Show file tree

Hide file tree

Showing 629 changed files with 5,865 additions and 5,746 deletions.
diff --git a/DEPS.bzl b/DEPS.bzl
@@ -7050,13 +7050,13 @@ def go_deps():
         name = "com_github_tikv_pd_client",
         build_file_proto_mode = "disable_global",
         importpath = "github.com/tikv/pd/client",
-        sha256 = "e46a55f684df2acf06f1081a8a32750ef99bc05e9a1d6508f5c8e605bf954642",
-        strip_prefix = "github.com/tikv/pd/[email protected]20241220053006-461b86adc78d",
+        sha256 = "a704b691889a87001a40bbcf40b69df8b0d801f063bf07bc15542088df15682a",
+        strip_prefix = "github.com/tikv/pd/[email protected]20250107032658-5c4ab57d68de",
         urls = [
-            "http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20241220053006-461b86adc78d.zip",
-            "http://ats.apps.svc/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20241220053006-461b86adc78d.zip",
-            "https://cache.hawkingrei.com/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20241220053006-461b86adc78d.zip",
-            "https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20241220053006-461b86adc78d.zip",
+            "http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20250107032658-5c4ab57d68de.zip",
+            "http://ats.apps.svc/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20250107032658-5c4ab57d68de.zip",
+            "https://cache.hawkingrei.com/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20250107032658-5c4ab57d68de.zip",
+            "https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20250107032658-5c4ab57d68de.zip",
         ],
     )
     go_repository(

diff --git a/br/pkg/checkpoint/BUILD.bazel b/br/pkg/checkpoint/BUILD.bazel
@@ -25,7 +25,7 @@ go_library(
         "//pkg/domain",
         "//pkg/kv",
         "//pkg/meta/model",
-        "//pkg/parser/model",
+        "//pkg/parser/ast",
         "//pkg/util",
         "//pkg/util/sqlexec",
         "@com_github_google_uuid//:uuid",
@@ -53,7 +53,7 @@ go_test(
         "//br/pkg/storage",
         "//br/pkg/utiltest",
         "//pkg/meta/model",
-        "//pkg/parser/model",
+        "//pkg/parser/ast",
         "@com_github_pingcap_failpoint//:failpoint",
         "@com_github_pingcap_kvproto//pkg/brpb",
         "@com_github_pingcap_kvproto//pkg/encryptionpb",

diff --git a/br/pkg/checkpoint/checkpoint_test.go b/br/pkg/checkpoint/checkpoint_test.go
@@ -31,7 +31,7 @@ import (
 	"github.com/pingcap/tidb/br/pkg/storage"
 	"github.com/pingcap/tidb/br/pkg/utiltest"
 	"github.com/pingcap/tidb/pkg/meta/model"
-	pmodel "github.com/pingcap/tidb/pkg/parser/model"
+	"github.com/pingcap/tidb/pkg/parser/ast"
 	"github.com/stretchr/testify/require"
 	"github.com/tikv/client-go/v2/oracle"
 )
@@ -128,8 +128,8 @@ func TestCheckpointMetaForRestore(t *testing.T) {
 		SQLs: []checkpoint.CheckpointIngestIndexRepairSQL{
 			{
 				IndexID:    1,
-				SchemaName: pmodel.NewCIStr("2"),
-				TableName:  pmodel.NewCIStr("3"),
+				SchemaName: ast.NewCIStr("2"),
+				TableName:  ast.NewCIStr("3"),
 				IndexName:  "4",
 				AddSQL:     "5",
 				AddArgs:    []any{"6", "7", "8"},
@@ -140,8 +140,8 @@ func TestCheckpointMetaForRestore(t *testing.T) {
 	repairSQLs, err := checkpoint.LoadCheckpointIngestIndexRepairSQLs(ctx, se.GetSessionCtx().GetRestrictedSQLExecutor())
 	require.NoError(t, err)
 	require.Equal(t, repairSQLs.SQLs[0].IndexID, int64(1))
-	require.Equal(t, repairSQLs.SQLs[0].SchemaName, pmodel.NewCIStr("2"))
-	require.Equal(t, repairSQLs.SQLs[0].TableName, pmodel.NewCIStr("3"))
+	require.Equal(t, repairSQLs.SQLs[0].SchemaName, ast.NewCIStr("2"))
+	require.Equal(t, repairSQLs.SQLs[0].TableName, ast.NewCIStr("3"))
 	require.Equal(t, repairSQLs.SQLs[0].IndexName, "4")
 	require.Equal(t, repairSQLs.SQLs[0].AddSQL, "5")
 	require.Equal(t, repairSQLs.SQLs[0].AddArgs, []any{"6", "7", "8"})
@@ -360,7 +360,7 @@ func TestCheckpointRestoreRunner(t *testing.T) {
 
 	exists := checkpoint.ExistsSstRestoreCheckpoint(ctx, s.Mock.Domain, checkpoint.SnapshotRestoreCheckpointDatabaseName)
 	require.False(t, exists)
-	exists = s.Mock.Domain.InfoSchema().SchemaExists(pmodel.NewCIStr(checkpoint.SnapshotRestoreCheckpointDatabaseName))
+	exists = s.Mock.Domain.InfoSchema().SchemaExists(ast.NewCIStr(checkpoint.SnapshotRestoreCheckpointDatabaseName))
 	require.False(t, exists)
 }
 
@@ -545,7 +545,7 @@ func TestCheckpointLogRestoreRunner(t *testing.T) {
 
 	exists := checkpoint.ExistsLogRestoreCheckpointMetadata(ctx, s.Mock.Domain)
 	require.False(t, exists)
-	exists = s.Mock.Domain.InfoSchema().SchemaExists(pmodel.NewCIStr(checkpoint.LogRestoreCheckpointDatabaseName))
+	exists = s.Mock.Domain.InfoSchema().SchemaExists(ast.NewCIStr(checkpoint.LogRestoreCheckpointDatabaseName))
 	require.False(t, exists)
 }
 
@@ -640,6 +640,6 @@ func TestCheckpointCompactedRestoreRunner(t *testing.T) {
 
 	exists = checkpoint.ExistsSstRestoreCheckpoint(ctx, s.Mock.Domain, checkpoint.CustomSSTRestoreCheckpointDatabaseName)
 	require.False(t, exists)
-	exists = s.Mock.Domain.InfoSchema().SchemaExists(pmodel.NewCIStr(checkpoint.CustomSSTRestoreCheckpointDatabaseName))
+	exists = s.Mock.Domain.InfoSchema().SchemaExists(ast.NewCIStr(checkpoint.CustomSSTRestoreCheckpointDatabaseName))
 	require.False(t, exists)
 }
diff --git a/br/pkg/checkpoint/log_restore.go b/br/pkg/checkpoint/log_restore.go
@@ -23,7 +23,7 @@ import (
 	"github.com/pingcap/tidb/br/pkg/glue"
 	"github.com/pingcap/tidb/pkg/domain"
 	"github.com/pingcap/tidb/pkg/meta/model"
-	pmodel "github.com/pingcap/tidb/pkg/parser/model"
+	"github.com/pingcap/tidb/pkg/parser/ast"
 	"github.com/pingcap/tidb/pkg/util/sqlexec"
 )
 
@@ -191,7 +191,7 @@ func ExistsLogRestoreCheckpointMetadata(
 	dom *domain.Domain,
 ) bool {
 	return dom.InfoSchema().
-		TableExists(pmodel.NewCIStr(LogRestoreCheckpointDatabaseName), pmodel.NewCIStr(checkpointMetaTableName))
+		TableExists(ast.NewCIStr(LogRestoreCheckpointDatabaseName), ast.NewCIStr(checkpointMetaTableName))
 }
 
 // A progress type for snapshot + log restore.
@@ -251,7 +251,7 @@ func ExistsCheckpointProgress(
 	dom *domain.Domain,
 ) bool {
 	return dom.InfoSchema().
-		TableExists(pmodel.NewCIStr(LogRestoreCheckpointDatabaseName), pmodel.NewCIStr(checkpointProgressTableName))
+		TableExists(ast.NewCIStr(LogRestoreCheckpointDatabaseName), ast.NewCIStr(checkpointProgressTableName))
 }
 
 // CheckpointTaskInfo is unique information within the same cluster id. It represents the last
@@ -298,12 +298,12 @@ func TryToGetCheckpointTaskInfo(
 }
 
 type CheckpointIngestIndexRepairSQL struct {
-	IndexID    int64        `json:"index-id"`
-	SchemaName pmodel.CIStr `json:"schema-name"`
-	TableName  pmodel.CIStr `json:"table-name"`
-	IndexName  string       `json:"index-name"`
-	AddSQL     string       `json:"add-sql"`
-	AddArgs    []any        `json:"add-args"`
+	IndexID    int64     `json:"index-id"`
+	SchemaName ast.CIStr `json:"schema-name"`
+	TableName  ast.CIStr `json:"table-name"`
+	IndexName  string    `json:"index-name"`
+	AddSQL     string    `json:"add-sql"`
+	AddArgs    []any     `json:"add-args"`
 }
 
 type CheckpointIngestIndexRepairSQLs struct {
@@ -321,7 +321,7 @@ func LoadCheckpointIngestIndexRepairSQLs(
 
 func ExistsCheckpointIngestIndexRepairSQLs(ctx context.Context, dom *domain.Domain) bool {
 	return dom.InfoSchema().
-		TableExists(pmodel.NewCIStr(LogRestoreCheckpointDatabaseName), pmodel.NewCIStr(checkpointIngestTableName))
+		TableExists(ast.NewCIStr(LogRestoreCheckpointDatabaseName), ast.NewCIStr(checkpointIngestTableName))
 }
 
 func SaveCheckpointIngestIndexRepairSQLs(

diff --git a/br/pkg/checkpoint/restore.go b/br/pkg/checkpoint/restore.go
@@ -23,7 +23,7 @@ import (
 	"github.com/pingcap/tidb/br/pkg/glue"
 	"github.com/pingcap/tidb/br/pkg/pdutil"
 	"github.com/pingcap/tidb/pkg/domain"
-	pmodel "github.com/pingcap/tidb/pkg/parser/model"
+	"github.com/pingcap/tidb/pkg/parser/ast"
 	"github.com/pingcap/tidb/pkg/util/sqlexec"
 )
 
@@ -173,7 +173,7 @@ func ExistsSstRestoreCheckpoint(
 	// we only check the existence of the checkpoint data table
 	// because the checkpoint metadata is not used for restore
 	return dom.InfoSchema().
-		TableExists(pmodel.NewCIStr(dbName), pmodel.NewCIStr(checkpointDataTableName))
+		TableExists(ast.NewCIStr(dbName), ast.NewCIStr(checkpointDataTableName))
 }
 
 func RemoveCheckpointDataForSstRestore(ctx context.Context, dom *domain.Domain, se glue.Session, dbName string) error {

diff --git a/br/pkg/checkpoint/storage.go b/br/pkg/checkpoint/storage.go
@@ -27,7 +27,7 @@ import (
 	"github.com/pingcap/tidb/br/pkg/glue"
 	"github.com/pingcap/tidb/pkg/domain"
 	"github.com/pingcap/tidb/pkg/kv"
-	pmodel "github.com/pingcap/tidb/pkg/parser/model"
+	"github.com/pingcap/tidb/pkg/parser/ast"
 	"github.com/pingcap/tidb/pkg/util/sqlexec"
 	"go.uber.org/zap"
 )
@@ -89,7 +89,7 @@ const (
 )
 
 // IsCheckpointDB checks whether the dbname is checkpoint database.
-func IsCheckpointDB(dbname pmodel.CIStr) bool {
+func IsCheckpointDB(dbname ast.CIStr) bool {
 	return dbname.O == LogRestoreCheckpointDatabaseName ||
 		dbname.O == SnapshotRestoreCheckpointDatabaseName ||
 		dbname.O == CustomSSTRestoreCheckpointDatabaseName
@@ -333,7 +333,7 @@ func dropCheckpointTables(
 		}
 	}
 	// check if any user table is created in the checkpoint database
-	tables, err := dom.InfoSchema().SchemaTableInfos(ctx, pmodel.NewCIStr(dbName))
+	tables, err := dom.InfoSchema().SchemaTableInfos(ctx, ast.NewCIStr(dbName))
 	if err != nil {
 		return errors.Trace(err)
 	}

diff --git a/br/pkg/checksum/BUILD.bazel b/br/pkg/checksum/BUILD.bazel
@@ -45,7 +45,7 @@ go_test(
         "//pkg/distsql",
         "//pkg/kv",
         "//pkg/meta/model",
-        "//pkg/parser/model",
+        "//pkg/parser/ast",
         "//pkg/sessionctx/variable",
         "//pkg/testkit",
         "//pkg/testkit/testsetup",

diff --git a/br/pkg/checksum/executor_test.go b/br/pkg/checksum/executor_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/pingcap/tidb/pkg/distsql"
 	"github.com/pingcap/tidb/pkg/kv"
 	"github.com/pingcap/tidb/pkg/meta/model"
-	pmodel "github.com/pingcap/tidb/pkg/parser/model"
+	"github.com/pingcap/tidb/pkg/parser/ast"
 	"github.com/pingcap/tidb/pkg/sessionctx/variable"
 	"github.com/pingcap/tidb/pkg/testkit"
 	"github.com/stretchr/testify/require"
@@ -23,8 +23,8 @@ import (
 func getTableInfo(t *testing.T, mock *mock.Cluster, db, table string) *model.TableInfo {
 	info, err := mock.Domain.GetSnapshotInfoSchema(math.MaxUint64)
 	require.NoError(t, err)
-	cDBName := pmodel.NewCIStr(db)
-	cTableName := pmodel.NewCIStr(table)
+	cDBName := ast.NewCIStr(db)
+	cTableName := ast.NewCIStr(table)
 	tableInfo, err := info.TableByName(context.Background(), cDBName, cTableName)
 	require.NoError(t, err)
 	return tableInfo.Meta()

diff --git a/br/pkg/glue/BUILD.bazel b/br/pkg/glue/BUILD.bazel
@@ -15,7 +15,7 @@ go_library(
         "//pkg/domain",
         "//pkg/kv",
         "//pkg/meta/model",
-        "//pkg/parser/model",
+        "//pkg/parser/ast",
         "//pkg/sessionctx",
         "@com_github_fatih_color//:color",
         "@com_github_pingcap_log//:log",

diff --git a/br/pkg/glue/glue.go b/br/pkg/glue/glue.go
@@ -9,7 +9,7 @@ import (
 	"github.com/pingcap/tidb/pkg/domain"
 	"github.com/pingcap/tidb/pkg/kv"
 	"github.com/pingcap/tidb/pkg/meta/model"
-	pmodel "github.com/pingcap/tidb/pkg/parser/model"
+	"github.com/pingcap/tidb/pkg/parser/ast"
 	"github.com/pingcap/tidb/pkg/sessionctx"
 	pd "github.com/tikv/pd/client"
 )
@@ -54,7 +54,7 @@ type Session interface {
 	Execute(ctx context.Context, sql string) error
 	ExecuteInternal(ctx context.Context, sql string, args ...any) error
 	CreateDatabase(ctx context.Context, schema *model.DBInfo) error
-	CreateTable(ctx context.Context, dbName pmodel.CIStr, table *model.TableInfo,
+	CreateTable(ctx context.Context, dbName ast.CIStr, table *model.TableInfo,
 		cs ...ddl.CreateTableOption) error
 	CreatePlacementPolicy(ctx context.Context, policy *model.PolicyInfo) error
 	Close()

diff --git a/br/pkg/gluetidb/BUILD.bazel b/br/pkg/gluetidb/BUILD.bazel
@@ -15,7 +15,7 @@ go_library(
         "//pkg/executor",
         "//pkg/kv",
         "//pkg/meta/model",
-        "//pkg/parser/model",
+        "//pkg/parser/ast",
         "//pkg/session",
         "//pkg/session/types",
         "//pkg/sessionctx",
@@ -35,7 +35,7 @@ go_test(
     deps = [
         "//br/pkg/glue",
         "//pkg/meta/model",
-        "//pkg/parser/model",
+        "//pkg/parser/ast",
         "//pkg/session",
         "//pkg/testkit",
         "//pkg/types",

diff --git a/br/pkg/gluetidb/glue.go b/br/pkg/gluetidb/glue.go
@@ -18,7 +18,7 @@ import (
 	"github.com/pingcap/tidb/pkg/executor"
 	"github.com/pingcap/tidb/pkg/kv"
 	"github.com/pingcap/tidb/pkg/meta/model"
-	pmodel "github.com/pingcap/tidb/pkg/parser/model"
+	"github.com/pingcap/tidb/pkg/parser/ast"
 	"github.com/pingcap/tidb/pkg/session"
 	sessiontypes "github.com/pingcap/tidb/pkg/session/types"
 	"github.com/pingcap/tidb/pkg/sessionctx"
@@ -250,7 +250,7 @@ func (gs *tidbSession) CreateTables(_ context.Context,
 }
 
 // CreateTable implements glue.Session.
-func (gs *tidbSession) CreateTable(_ context.Context, dbName pmodel.CIStr,
+func (gs *tidbSession) CreateTable(_ context.Context, dbName ast.CIStr,
 	table *model.TableInfo, cs ...ddl.CreateTableOption) error {
 	return errors.Trace(executor.BRIECreateTable(gs.se, dbName, table, brComment, cs...))
 }

diff --git a/br/pkg/gluetidb/glue_test.go b/br/pkg/gluetidb/glue_test.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/pingcap/tidb/br/pkg/glue"
 	"github.com/pingcap/tidb/pkg/meta/model"
-	pmodel "github.com/pingcap/tidb/pkg/parser/model"
+	"github.com/pingcap/tidb/pkg/parser/ast"
 	"github.com/pingcap/tidb/pkg/session"
 	"github.com/pingcap/tidb/pkg/testkit"
 	"github.com/pingcap/tidb/pkg/types"
@@ -45,7 +45,7 @@ func TestTheSessionIsoation(t *testing.T) {
 	})
 
 	require.NoError(t, glueSe.CreateDatabase(ctx, &model.DBInfo{
-		Name: pmodel.NewCIStr("test_db"),
+		Name: ast.NewCIStr("test_db"),
 	}))
 	tk := testkit.NewTestKit(t, store)
 	tk.MustExec("use test_db")
@@ -54,41 +54,41 @@ func TestTheSessionIsoation(t *testing.T) {
 	req.NoError(glueSe.ExecuteInternal(ctx, "use test;"))
 	infos := []*model.TableInfo{}
 	infos = append(infos, &model.TableInfo{
-		Name: pmodel.NewCIStr("tables_1"),
+		Name: ast.NewCIStr("tables_1"),
 		Columns: []*model.ColumnInfo{
-			{Name: pmodel.NewCIStr("foo"), FieldType: *types.NewFieldType(types.KindBinaryLiteral), State: model.StatePublic},
+			{Name: ast.NewCIStr("foo"), FieldType: *types.NewFieldType(types.KindBinaryLiteral), State: model.StatePublic},
 		},
 	})
 	infos = append(infos, &model.TableInfo{
-		Name: pmodel.NewCIStr("tables_2"),
+		Name: ast.NewCIStr("tables_2"),
 		PlacementPolicyRef: &model.PolicyRefInfo{
-			Name: pmodel.NewCIStr("threereplication"),
+			Name: ast.NewCIStr("threereplication"),
 		},
 		Columns: []*model.ColumnInfo{
-			{Name: pmodel.NewCIStr("foo"), FieldType: *types.NewFieldType(types.KindBinaryLiteral), State: model.StatePublic},
+			{Name: ast.NewCIStr("foo"), FieldType: *types.NewFieldType(types.KindBinaryLiteral), State: model.StatePublic},
 		},
 	})
 	infos = append(infos, &model.TableInfo{
-		Name: pmodel.NewCIStr("tables_3"),
+		Name: ast.NewCIStr("tables_3"),
 		PlacementPolicyRef: &model.PolicyRefInfo{
-			Name: pmodel.NewCIStr("fivereplication"),
+			Name: ast.NewCIStr("fivereplication"),
 		},
 		Columns: []*model.ColumnInfo{
-			{Name: pmodel.NewCIStr("foo"), FieldType: *types.NewFieldType(types.KindBinaryLiteral), State: model.StatePublic},
+			{Name: ast.NewCIStr("foo"), FieldType: *types.NewFieldType(types.KindBinaryLiteral), State: model.StatePublic},
 		},
 	})
 	polices := []*model.PolicyInfo{
 		{
 			PlacementSettings: &model.PlacementSettings{
 				Followers: 4,
 			},
-			Name: pmodel.NewCIStr("fivereplication"),
+			Name: ast.NewCIStr("fivereplication"),
 		},
 		{
 			PlacementSettings: &model.PlacementSettings{
 				Followers: 2,
 			},
-			Name: pmodel.NewCIStr("threereplication"),
+			Name: ast.NewCIStr("threereplication"),
 		},
 	}
 	for _, pinfo := range polices {

diff --git a/br/pkg/gluetidb/mock/BUILD.bazel b/br/pkg/gluetidb/mock/BUILD.bazel
@@ -11,7 +11,7 @@ go_library(
         "//pkg/domain",
         "//pkg/kv",
         "//pkg/meta/model",
-        "//pkg/parser/model",
+        "//pkg/parser/ast",
         "//pkg/session/types",
         "//pkg/sessionctx",
         "@com_github_tikv_pd_client//:client",

diff --git a/br/pkg/gluetidb/mock/mock.go b/br/pkg/gluetidb/mock/mock.go
@@ -23,7 +23,7 @@ import (
 	"github.com/pingcap/tidb/pkg/domain"
 	"github.com/pingcap/tidb/pkg/kv"
 	"github.com/pingcap/tidb/pkg/meta/model"
-	pmodel "github.com/pingcap/tidb/pkg/parser/model"
+	"github.com/pingcap/tidb/pkg/parser/ast"
 	sessiontypes "github.com/pingcap/tidb/pkg/session/types"
 	"github.com/pingcap/tidb/pkg/sessionctx"
 	pd "github.com/tikv/pd/client"
@@ -86,7 +86,7 @@ func (*mockSession) CreateTables(_ context.Context, _ map[string][]*model.TableI
 }
 
 // CreateTable implements glue.Session.
-func (*mockSession) CreateTable(_ context.Context, _ pmodel.CIStr,
+func (*mockSession) CreateTable(_ context.Context, _ ast.CIStr,
 	_ *model.TableInfo, _ ...ddl.CreateTableOption) error {
 	log.Fatal("unimplemented CreateDatabase for mock session")
 	return nil

diff --git a/br/pkg/metautil/BUILD.bazel b/br/pkg/metautil/BUILD.bazel
@@ -52,7 +52,7 @@ go_test(
         "//br/pkg/storage",
         "//br/pkg/utils",
         "//pkg/meta/model",
-        "//pkg/parser/model",
+        "//pkg/parser/ast",
         "//pkg/statistics/handle/types",
         "//pkg/statistics/util",
         "//pkg/tablecodec",