fix build

Signed-off-by: hillium <[email protected]>

br/pkg/restore/snap_client/BUILD.bazel

@@ -41,9 +41,8 @@ go_library(
         "//pkg/kv",
         "//pkg/meta",
         "//pkg/meta/model",
-        "//pkg/parser/model",
         "//pkg/metrics",
-        "//pkg/parser/ast",
+        "//pkg/parser/model",
         "//pkg/parser/mysql",
         "//pkg/tablecodec",
         "//pkg/util",

br/pkg/storage/local.go

@@ -15,7 +15,6 @@ import (
 	"github.com/pingcap/failpoint"
 	"github.com/pingcap/log"
 	berrors "github.com/pingcap/tidb/br/pkg/errors"
-	"github.com/pingcap/tidb/br/pkg/logutil"
 	"go.uber.org/zap"
 )
 

br/pkg/stream/BUILD.bazel

@@ -34,6 +34,7 @@ go_library(
         "//pkg/util/codec",
         "//pkg/util/mathutil",
         "//pkg/util/table-filter",
+        "//pkg/util/versioninfo",
         "@com_github_docker_go_units//:go-units",
         "@com_github_fatih_color//:color",
         "@com_github_google_uuid//:uuid",
@@ -66,7 +67,7 @@ go_test(
     ],
     embed = [":stream"],
     flaky = True,
-    shard_count = 48,
+    shard_count = 49,
     deps = [
         "//br/pkg/storage",
         "//br/pkg/streamhelper",

br/pkg/streamhelper/basic_lib_for_test.go

@@ -94,6 +94,12 @@ type fakeStore struct {
 	onGetRegionCheckpoint func(*logbackup.GetLastFlushTSOfRegionRequest) error
 }
 
+// FlushNow implements logbackup.LogBackupClient.
+func (f *fakeStore) FlushNow(ctx context.Context, in *logbackup.FlushNowRequest, opts ...grpc.CallOption) (*logbackup.FlushNowResponse, error) {
+	f.flush()
+	return &logbackup.FlushNowResponse{}, nil
+}
+
 type fakeCluster struct {
 	mu        sync.Mutex
 	idAlloced uint64

br/pkg/task/BUILD.bazel

@@ -59,9 +59,8 @@ go_library(
         "//pkg/infoschema/context",
         "//pkg/kv",
         "//pkg/meta/model",
-        "//pkg/parser/model",
         "//pkg/metrics",
-        "//pkg/parser/ast",
+        "//pkg/parser/model",
         "//pkg/parser/mysql",
         "//pkg/sessionctx/stmtctx",
         "//pkg/sessionctx/variable",

br/pkg/task/operator/BUILD.bazel

@@ -43,7 +43,6 @@ go_library(
         "@com_github_tikv_client_go_v2//tikv",
         "@com_github_tikv_client_go_v2//util",
         "@com_github_tikv_pd_client//:client",
-        "@com_github_tikv_pd_client//opt",
         "@org_golang_google_grpc//:grpc",
         "@org_golang_google_grpc//keepalive",
         "@org_golang_x_sync//errgroup",

br/pkg/task/operator/force_flush.go

@@ -10,14 +10,13 @@ import (
 	"github.com/pingcap/log"
 	"github.com/pingcap/tidb/pkg/util/engine"
 	pd "github.com/tikv/pd/client"
-	"github.com/tikv/pd/client/opt"
 	"go.uber.org/zap"
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/grpc"
 )
 
 func getAllTiKVs(ctx context.Context, p pd.Client) ([]*metapb.Store, error) {
-	stores, err := p.GetAllStores(ctx, opt.WithExcludeTombstone())
+	stores, err := p.GetAllStores(ctx, pd.WithExcludeTombstone())
 	if err != nil {
 		return nil, err
 	}

br/pkg/task/restore.go

@@ -41,7 +41,6 @@ import (
 	"github.com/pingcap/tidb/pkg/kv"
 	"github.com/pingcap/tidb/pkg/meta/model"
 	"github.com/pingcap/tidb/pkg/metrics"
-	"github.com/pingcap/tidb/pkg/parser/ast"
 	pmodel "github.com/pingcap/tidb/pkg/parser/model"
 	"github.com/pingcap/tidb/pkg/util"
 	"github.com/pingcap/tidb/pkg/util/collate"

go.mod

@@ -86,8 +86,8 @@ require (
 	github.com/pingcap/errors v0.11.5-0.20240318064555-6bd07397691f
 	github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86
 	github.com/pingcap/fn v1.0.0
-	github.com/pingcap/log v1.1.1-0.20240314023424-862ccc32f18d
 	github.com/pingcap/kvproto v0.0.0-20250108041715-3b77f2c65c63
+	github.com/pingcap/log v1.1.1-0.20240314023424-862ccc32f18d
 	github.com/pingcap/sysutil v1.0.1-0.20240311050922-ae81ee01f3a5
 	github.com/pingcap/tidb/pkg/parser v0.0.0-20211011031125-9b13dc409c5e
 	github.com/pingcap/tipb v0.0.0-20241022082558-0607513e7fa4