From b50eea96179ab45c7f18174f102ed24e7362f8e2 Mon Sep 17 00:00:00 2001 From: JmPotato Date: Mon, 23 Dec 2024 14:37:48 +0800 Subject: [PATCH] Prepare the bazel files Signed-off-by: JmPotato --- DEPS.bzl | 36 +++++++++---------- br/pkg/backup/prepare_snap/BUILD.bazel | 2 +- br/pkg/conn/util/BUILD.bazel | 2 +- br/pkg/pdutil/BUILD.bazel | 4 ++- br/pkg/restore/internal/rawkv/BUILD.bazel | 2 +- br/pkg/restore/snap_client/BUILD.bazel | 2 +- br/pkg/restore/split/BUILD.bazel | 2 ++ br/pkg/streamhelper/BUILD.bazel | 3 ++ br/pkg/task/BUILD.bazel | 1 + br/pkg/utils/storewatch/BUILD.bazel | 2 +- br/pkg/version/BUILD.bazel | 2 ++ br/tests/br_key_locked/BUILD.bazel | 3 ++ br/tests/br_z_gc_safepoint/BUILD.bazel | 1 + dumpling/export/BUILD.bazel | 1 + go.mod | 2 +- go.sum | 2 ++ lightning/pkg/importer/BUILD.bazel | 3 +- pkg/ddl/BUILD.bazel | 3 +- pkg/ddl/ingest/BUILD.bazel | 1 + pkg/ddl/tests/tiflash/BUILD.bazel | 2 +- pkg/disttask/importinto/BUILD.bazel | 2 ++ pkg/domain/BUILD.bazel | 2 ++ pkg/domain/infosync/BUILD.bazel | 2 ++ pkg/executor/importer/BUILD.bazel | 3 ++ .../internal/calibrateresource/BUILD.bazel | 1 + pkg/lightning/backend/local/BUILD.bazel | 7 +++- pkg/lightning/tikv/BUILD.bazel | 1 + pkg/server/handler/tikvhandler/BUILD.bazel | 1 + pkg/store/copr/BUILD.bazel | 1 + pkg/store/copr/copr_test/BUILD.bazel | 1 + pkg/store/driver/BUILD.bazel | 2 ++ pkg/store/mockstore/unistore/BUILD.bazel | 5 +++ pkg/store/mockstore/unistore/pd/BUILD.bazel | 3 +- pkg/store/mockstore/unistore/tikv/BUILD.bazel | 3 +- pkg/ttl/cache/BUILD.bazel | 2 ++ pkg/util/metricsutil/BUILD.bazel | 2 ++ tests/realtikvtest/brietest/BUILD.bazel | 1 + 37 files changed, 84 insertions(+), 31 deletions(-) diff --git a/DEPS.bzl b/DEPS.bzl index e547ad7b50f38..6e652d96d53b5 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -5763,13 +5763,13 @@ def go_deps(): name = "com_github_pingcap_kvproto", build_file_proto_mode = "disable_global", importpath = "github.com/pingcap/kvproto", - sha256 = "7d3b6f6b755b027ba138d3069238f4a4e91d0d1f573de17cda00985616adc843", - strip_prefix = "github.com/pingcap/kvproto@v0.0.0-20241120022153-92b0414aeed8", + sha256 = "92a67bcc499c06fd3d76cc153362540b22eaf1b09c4bda62a1599ce876b8ed78", + strip_prefix = "github.com/pingcap/kvproto@v0.0.0-20241120071417-b5b7843d9037", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20241120022153-92b0414aeed8.zip", - "http://ats.apps.svc/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20241120022153-92b0414aeed8.zip", - "https://cache.hawkingrei.com/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20241120022153-92b0414aeed8.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20241120022153-92b0414aeed8.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20241120071417-b5b7843d9037.zip", + "http://ats.apps.svc/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20241120071417-b5b7843d9037.zip", + "https://cache.hawkingrei.com/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20241120071417-b5b7843d9037.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20241120071417-b5b7843d9037.zip", ], ) go_repository( @@ -6933,26 +6933,26 @@ def go_deps(): name = "com_github_tikv_client_go_v2", build_file_proto_mode = "disable_global", importpath = "github.com/tikv/client-go/v2", - sha256 = "844684ee6ae7decc5cadcab3f95c526b66878f8401c71cf82af68ec0cc5257d5", - strip_prefix = "github.com/tikv/client-go/v2@v2.0.8-0.20241209094930-06d7f4b9233b", + sha256 = "620533c3da6f02758df6e61310c72af9761e6f9ce7244e42962bbe882f5b4317", + strip_prefix = "github.com/tikv/client-go/v2@v2.0.8-0.20241223070848-fd950fcf9fcc", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241209094930-06d7f4b9233b.zip", - "http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241209094930-06d7f4b9233b.zip", - "https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241209094930-06d7f4b9233b.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241209094930-06d7f4b9233b.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241223070848-fd950fcf9fcc.zip", + "http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241223070848-fd950fcf9fcc.zip", + "https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241223070848-fd950fcf9fcc.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241223070848-fd950fcf9fcc.zip", ], ) go_repository( name = "com_github_tikv_pd_client", build_file_proto_mode = "disable_global", importpath = "github.com/tikv/pd/client", - sha256 = "52a62b6f6247ce31ee9d0a5dbde941ba3be3db74a713fd79643d015d98a15c5f", - strip_prefix = "github.com/tikv/pd/client@v0.0.0-20241111073742-238d4d79ea31", + sha256 = "e46a55f684df2acf06f1081a8a32750ef99bc05e9a1d6508f5c8e605bf954642", + strip_prefix = "github.com/tikv/pd/client@v0.0.0-20241220053006-461b86adc78d", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20241111073742-238d4d79ea31.zip", - "http://ats.apps.svc/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20241111073742-238d4d79ea31.zip", - "https://cache.hawkingrei.com/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20241111073742-238d4d79ea31.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20241111073742-238d4d79ea31.zip", + "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", ], ) go_repository( diff --git a/br/pkg/backup/prepare_snap/BUILD.bazel b/br/pkg/backup/prepare_snap/BUILD.bazel index 2fffcacd5e088..7860883733769 100644 --- a/br/pkg/backup/prepare_snap/BUILD.bazel +++ b/br/pkg/backup/prepare_snap/BUILD.bazel @@ -23,7 +23,7 @@ go_library( "@com_github_pingcap_kvproto//pkg/metapb", "@com_github_pingcap_log//:log", "@com_github_tikv_client_go_v2//tikv", - "@com_github_tikv_pd_client//:client", + "@com_github_tikv_pd_client//opt", "@org_golang_google_grpc//:grpc", "@org_golang_x_sync//errgroup", "@org_uber_go_zap//:zap", diff --git a/br/pkg/conn/util/BUILD.bazel b/br/pkg/conn/util/BUILD.bazel index 3411e60373c99..ef63aa5de0d79 100644 --- a/br/pkg/conn/util/BUILD.bazel +++ b/br/pkg/conn/util/BUILD.bazel @@ -10,6 +10,6 @@ go_library( "//pkg/util/engine", "@com_github_pingcap_errors//:errors", "@com_github_pingcap_kvproto//pkg/metapb", - "@com_github_tikv_pd_client//:client", + "@com_github_tikv_pd_client//opt", ], ) diff --git a/br/pkg/pdutil/BUILD.bazel b/br/pkg/pdutil/BUILD.bazel index 1e525d6a45295..cec06fda4d3f8 100644 --- a/br/pkg/pdutil/BUILD.bazel +++ b/br/pkg/pdutil/BUILD.bazel @@ -23,7 +23,9 @@ go_library( "@com_github_pingcap_log//:log", "@com_github_tikv_pd_client//:client", "@com_github_tikv_pd_client//http", - "@com_github_tikv_pd_client//retry", + "@com_github_tikv_pd_client//opt", + "@com_github_tikv_pd_client//pkg/caller", + "@com_github_tikv_pd_client//pkg/retry", "@org_golang_google_grpc//:grpc", "@org_uber_go_zap//:zap", ], diff --git a/br/pkg/restore/internal/rawkv/BUILD.bazel b/br/pkg/restore/internal/rawkv/BUILD.bazel index f6d5f8835fb94..db7dcf62a3b7f 100644 --- a/br/pkg/restore/internal/rawkv/BUILD.bazel +++ b/br/pkg/restore/internal/rawkv/BUILD.bazel @@ -11,7 +11,7 @@ go_library( "@com_github_pingcap_errors//:errors", "@com_github_tikv_client_go_v2//config", "@com_github_tikv_client_go_v2//rawkv", - "@com_github_tikv_pd_client//:client", + "@com_github_tikv_pd_client//opt", ], ) diff --git a/br/pkg/restore/snap_client/BUILD.bazel b/br/pkg/restore/snap_client/BUILD.bazel index 5df612e4750e6..0a1a31cbd01c0 100644 --- a/br/pkg/restore/snap_client/BUILD.bazel +++ b/br/pkg/restore/snap_client/BUILD.bazel @@ -112,7 +112,7 @@ go_test( "@com_github_pingcap_kvproto//pkg/kvrpcpb", "@com_github_pingcap_kvproto//pkg/metapb", "@com_github_stretchr_testify//require", - "@com_github_tikv_pd_client//:client", + "@com_github_tikv_pd_client//clients/router", "@org_golang_x_exp//slices", "@org_uber_go_goleak//:goleak", ], diff --git a/br/pkg/restore/split/BUILD.bazel b/br/pkg/restore/split/BUILD.bazel index 34eb266023809..a71fa2df65ffa 100644 --- a/br/pkg/restore/split/BUILD.bazel +++ b/br/pkg/restore/split/BUILD.bazel @@ -40,7 +40,9 @@ go_library( "@com_github_pingcap_kvproto//pkg/tikvpb", "@com_github_pingcap_log//:log", "@com_github_tikv_pd_client//:client", + "@com_github_tikv_pd_client//clients/router", "@com_github_tikv_pd_client//http", + "@com_github_tikv_pd_client//opt", "@org_golang_google_grpc//:grpc", "@org_golang_google_grpc//codes", "@org_golang_google_grpc//credentials", diff --git a/br/pkg/streamhelper/BUILD.bazel b/br/pkg/streamhelper/BUILD.bazel index 95d7cb0287141..cfea7cf900721 100644 --- a/br/pkg/streamhelper/BUILD.bazel +++ b/br/pkg/streamhelper/BUILD.bazel @@ -45,6 +45,7 @@ go_library( "@com_github_tikv_client_go_v2//txnkv/rangetask", "@com_github_tikv_client_go_v2//txnkv/txnlock", "@com_github_tikv_pd_client//:client", + "@com_github_tikv_pd_client//opt", "@io_etcd_go_etcd_client_v3//:client", "@org_golang_google_grpc//:grpc", "@org_golang_google_grpc//codes", @@ -98,6 +99,8 @@ go_test( "@com_github_tikv_client_go_v2//tikvrpc", "@com_github_tikv_client_go_v2//txnkv/txnlock", "@com_github_tikv_pd_client//:client", + "@com_github_tikv_pd_client//clients/router", + "@com_github_tikv_pd_client//opt", "@io_etcd_go_etcd_client_v3//:client", "@io_etcd_go_etcd_server_v3//embed", "@io_etcd_go_etcd_server_v3//mvcc", diff --git a/br/pkg/task/BUILD.bazel b/br/pkg/task/BUILD.bazel index b185c358a5afa..12c476f34a544 100644 --- a/br/pkg/task/BUILD.bazel +++ b/br/pkg/task/BUILD.bazel @@ -155,6 +155,7 @@ go_test( "@com_github_tikv_client_go_v2//oracle", "@com_github_tikv_pd_client//:client", "@com_github_tikv_pd_client//http", + "@com_github_tikv_pd_client//opt", "@org_golang_google_grpc//keepalive", ], ) diff --git a/br/pkg/utils/storewatch/BUILD.bazel b/br/pkg/utils/storewatch/BUILD.bazel index 640b7446d9517..e186e741b32e3 100644 --- a/br/pkg/utils/storewatch/BUILD.bazel +++ b/br/pkg/utils/storewatch/BUILD.bazel @@ -24,6 +24,6 @@ go_test( "//br/pkg/conn/util", "@com_github_pingcap_kvproto//pkg/metapb", "@com_github_stretchr_testify//require", - "@com_github_tikv_pd_client//:client", + "@com_github_tikv_pd_client//opt", ], ) diff --git a/br/pkg/version/BUILD.bazel b/br/pkg/version/BUILD.bazel index 81b31e133ddb2..09b06a01112cd 100644 --- a/br/pkg/version/BUILD.bazel +++ b/br/pkg/version/BUILD.bazel @@ -17,6 +17,7 @@ go_library( "@com_github_pingcap_kvproto//pkg/metapb", "@com_github_pingcap_log//:log", "@com_github_tikv_pd_client//:client", + "@com_github_tikv_pd_client//opt", "@org_uber_go_zap//:zap", ], ) @@ -36,5 +37,6 @@ go_test( "@com_github_pingcap_kvproto//pkg/metapb", "@com_github_stretchr_testify//require", "@com_github_tikv_pd_client//:client", + "@com_github_tikv_pd_client//opt", ], ) diff --git a/br/tests/br_key_locked/BUILD.bazel b/br/tests/br_key_locked/BUILD.bazel index e1e62ab1a4210..d178a0642d7d6 100644 --- a/br/tests/br_key_locked/BUILD.bazel +++ b/br/tests/br_key_locked/BUILD.bazel @@ -25,6 +25,9 @@ go_library( "@com_github_tikv_client_go_v2//tikv", "@com_github_tikv_client_go_v2//tikvrpc", "@com_github_tikv_pd_client//:client", + "@com_github_tikv_pd_client//clients/router", + "@com_github_tikv_pd_client//opt", + "@com_github_tikv_pd_client//pkg/caller", "@org_uber_go_zap//:zap", ], ) diff --git a/br/tests/br_z_gc_safepoint/BUILD.bazel b/br/tests/br_z_gc_safepoint/BUILD.bazel index 4afb866ddc690..39f3403cf5f52 100644 --- a/br/tests/br_z_gc_safepoint/BUILD.bazel +++ b/br/tests/br_z_gc_safepoint/BUILD.bazel @@ -9,6 +9,7 @@ go_library( "@com_github_pingcap_log//:log", "@com_github_tikv_client_go_v2//oracle", "@com_github_tikv_pd_client//:client", + "@com_github_tikv_pd_client//pkg/caller", "@org_uber_go_zap//:zap", ], ) diff --git a/dumpling/export/BUILD.bazel b/dumpling/export/BUILD.bazel index 211de117c7660..83a5305f3c1c5 100644 --- a/dumpling/export/BUILD.bazel +++ b/dumpling/export/BUILD.bazel @@ -62,6 +62,7 @@ go_library( "@com_github_spf13_pflag//:pflag", "@com_github_tikv_pd_client//:client", "@com_github_tikv_pd_client//http", + "@com_github_tikv_pd_client//pkg/caller", "@io_etcd_go_etcd_client_v3//:client", "@org_golang_x_sync//errgroup", "@org_uber_go_atomic//:atomic", diff --git a/go.mod b/go.mod index 0011256dcf69e..88af0a3affc86 100644 --- a/go.mod +++ b/go.mod @@ -109,7 +109,7 @@ require ( github.com/tdakkota/asciicheck v0.2.0 github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2 github.com/tidwall/btree v1.7.0 - github.com/tikv/client-go/v2 v2.0.8-0.20241220061251-c5d92baf4928 + github.com/tikv/client-go/v2 v2.0.8-0.20241223070848-fd950fcf9fcc github.com/tikv/pd/client v0.0.0-20241220053006-461b86adc78d github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a github.com/twmb/murmur3 v1.1.6 diff --git a/go.sum b/go.sum index ea9e4baebafc8..5ca3053c4aae0 100644 --- a/go.sum +++ b/go.sum @@ -828,6 +828,8 @@ github.com/tidwall/btree v1.7.0 h1:L1fkJH/AuEh5zBnnBbmTwQ5Lt+bRJ5A8EWecslvo9iI= github.com/tidwall/btree v1.7.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY= github.com/tikv/client-go/v2 v2.0.8-0.20241220061251-c5d92baf4928 h1:+5tDGj7EJX1go76thvv39fHIM37hWiWyImYaziDUmaw= github.com/tikv/client-go/v2 v2.0.8-0.20241220061251-c5d92baf4928/go.mod h1:n9NoEZrKGy/KzWPqRRRoRNcg3SZev0B7rZzZgH4rEaY= +github.com/tikv/client-go/v2 v2.0.8-0.20241223070848-fd950fcf9fcc h1:VLq5SWaQ6xbdI8B0tBeWm44ZPuznaRjRcC9YRVaffKw= +github.com/tikv/client-go/v2 v2.0.8-0.20241223070848-fd950fcf9fcc/go.mod h1:H+EqIN/3fOXhVgzZT91Bk1XF1kfvlBZCYcpMIC8FNbg= github.com/tikv/pd/client v0.0.0-20241220053006-461b86adc78d h1:V/LfOrlfS4Ct+AHvjbxVXAZZgqjcpuc53m0wxk0xYF4= github.com/tikv/pd/client v0.0.0-20241220053006-461b86adc78d/go.mod h1:Dsiy6gxwRqsqgJPfDSxDbdG+qFvk0cNzvHax0TOPj2Q= github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a h1:A6uKudFIfAEpoPdaal3aSqGxBzLyU8TqyXImLwo6dIo= diff --git a/lightning/pkg/importer/BUILD.bazel b/lightning/pkg/importer/BUILD.bazel index 4f2413b0832a7..5e1991e279f33 100644 --- a/lightning/pkg/importer/BUILD.bazel +++ b/lightning/pkg/importer/BUILD.bazel @@ -91,7 +91,8 @@ go_library( "@com_github_tikv_client_go_v2//util", "@com_github_tikv_pd_client//:client", "@com_github_tikv_pd_client//http", - "@com_github_tikv_pd_client//retry", + "@com_github_tikv_pd_client//pkg/caller", + "@com_github_tikv_pd_client//pkg/retry", "@io_etcd_go_etcd_client_v3//:client", "@org_golang_google_grpc//:grpc", "@org_golang_google_grpc//codes", diff --git a/pkg/ddl/BUILD.bazel b/pkg/ddl/BUILD.bazel index f81da0c4a1b6c..3b72eea1c4a57 100644 --- a/pkg/ddl/BUILD.bazel +++ b/pkg/ddl/BUILD.bazel @@ -198,8 +198,9 @@ go_library( "@com_github_tikv_client_go_v2//tikvrpc", "@com_github_tikv_client_go_v2//txnkv/rangetask", "@com_github_tikv_client_go_v2//util", - "@com_github_tikv_pd_client//:client", + "@com_github_tikv_pd_client//clients/router", "@com_github_tikv_pd_client//http", + "@com_github_tikv_pd_client//servicediscovery", "@io_etcd_go_etcd_client_v3//:client", "@org_golang_x_sync//errgroup", "@org_uber_go_atomic//:atomic", diff --git a/pkg/ddl/ingest/BUILD.bazel b/pkg/ddl/ingest/BUILD.bazel index 5eba310809d4d..e17710a88847b 100644 --- a/pkg/ddl/ingest/BUILD.bazel +++ b/pkg/ddl/ingest/BUILD.bazel @@ -52,6 +52,7 @@ go_library( "@com_github_tikv_client_go_v2//oracle", "@com_github_tikv_client_go_v2//util", "@com_github_tikv_pd_client//:client", + "@com_github_tikv_pd_client//servicediscovery", "@io_etcd_go_etcd_client_v3//:client", "@org_golang_x_exp//maps", "@org_uber_go_atomic//:atomic", diff --git a/pkg/ddl/tests/tiflash/BUILD.bazel b/pkg/ddl/tests/tiflash/BUILD.bazel index 5f675fa46b68b..c965bf3b7b88f 100644 --- a/pkg/ddl/tests/tiflash/BUILD.bazel +++ b/pkg/ddl/tests/tiflash/BUILD.bazel @@ -40,7 +40,7 @@ go_test( "@com_github_tikv_client_go_v2//oracle", "@com_github_tikv_client_go_v2//testutils", "@com_github_tikv_client_go_v2//tikv", - "@com_github_tikv_pd_client//:client", + "@com_github_tikv_pd_client//clients/router", "@org_uber_go_goleak//:goleak", "@org_uber_go_zap//:zap", ], diff --git a/pkg/disttask/importinto/BUILD.bazel b/pkg/disttask/importinto/BUILD.bazel index ecb791d104cc5..fdab24b9fd520 100644 --- a/pkg/disttask/importinto/BUILD.bazel +++ b/pkg/disttask/importinto/BUILD.bazel @@ -126,6 +126,8 @@ go_test( "@com_github_stretchr_testify//suite", "@com_github_tikv_client_go_v2//util", "@com_github_tikv_pd_client//:client", + "@com_github_tikv_pd_client//opt", + "@com_github_tikv_pd_client//pkg/caller", "@org_uber_go_mock//gomock", "@org_uber_go_zap//:zap", ], diff --git a/pkg/domain/BUILD.bazel b/pkg/domain/BUILD.bazel index 3af9c318a3c68..da7b2683981f7 100644 --- a/pkg/domain/BUILD.bazel +++ b/pkg/domain/BUILD.bazel @@ -110,6 +110,7 @@ go_library( "@com_github_tikv_client_go_v2//txnkv/transaction", "@com_github_tikv_pd_client//:client", "@com_github_tikv_pd_client//http", + "@com_github_tikv_pd_client//opt", "@com_github_tikv_pd_client//resource_group/controller", "@io_etcd_go_etcd_client_v3//:client", "@io_etcd_go_etcd_client_v3//concurrency", @@ -176,6 +177,7 @@ go_test( "@com_github_tikv_client_go_v2//oracle", "@com_github_tikv_client_go_v2//txnkv/transaction", "@com_github_tikv_pd_client//:client", + "@com_github_tikv_pd_client//opt", "@io_etcd_go_etcd_tests_v3//integration", "@org_uber_go_goleak//:goleak", ], diff --git a/pkg/domain/infosync/BUILD.bazel b/pkg/domain/infosync/BUILD.bazel index ce54ee1141255..571f9549c73e6 100644 --- a/pkg/domain/infosync/BUILD.bazel +++ b/pkg/domain/infosync/BUILD.bazel @@ -50,7 +50,9 @@ go_library( "@com_github_tikv_client_go_v2//oracle", "@com_github_tikv_client_go_v2//tikv", "@com_github_tikv_pd_client//:client", + "@com_github_tikv_pd_client//clients/router", "@com_github_tikv_pd_client//http", + "@com_github_tikv_pd_client//opt", "@io_etcd_go_etcd_client_v3//:client", "@io_etcd_go_etcd_client_v3//concurrency", "@org_uber_go_zap//:zap", diff --git a/pkg/executor/importer/BUILD.bazel b/pkg/executor/importer/BUILD.bazel index 018c6ba46f25e..be7191b77e60a 100644 --- a/pkg/executor/importer/BUILD.bazel +++ b/pkg/executor/importer/BUILD.bazel @@ -78,6 +78,7 @@ go_library( "@com_github_prometheus_client_golang//prometheus", "@com_github_tikv_client_go_v2//util", "@com_github_tikv_pd_client//:client", + "@com_github_tikv_pd_client//pkg/caller", "@io_etcd_go_etcd_client_v3//:client", "@org_uber_go_multierr//:multierr", "@org_uber_go_zap//:zap", @@ -160,6 +161,8 @@ go_test( "@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", + "@com_github_tikv_pd_client//pkg/caller", "@io_etcd_go_etcd_client_v3//:client", "@io_etcd_go_etcd_server_v3//embed", "@io_etcd_go_etcd_tests_v3//integration", diff --git a/pkg/executor/internal/calibrateresource/BUILD.bazel b/pkg/executor/internal/calibrateresource/BUILD.bazel index c7ecb061ff33d..9eab84e6d56b3 100644 --- a/pkg/executor/internal/calibrateresource/BUILD.bazel +++ b/pkg/executor/internal/calibrateresource/BUILD.bazel @@ -50,6 +50,7 @@ go_test( "@com_github_stretchr_testify//require", "@com_github_tikv_client_go_v2//tikv", "@com_github_tikv_pd_client//:client", + "@com_github_tikv_pd_client//opt", "@com_github_tikv_pd_client//resource_group/controller", "@org_uber_go_goleak//:goleak", ], diff --git a/pkg/lightning/backend/local/BUILD.bazel b/pkg/lightning/backend/local/BUILD.bazel index 80fd7691d13cc..2cb9dbc4bbeeb 100644 --- a/pkg/lightning/backend/local/BUILD.bazel +++ b/pkg/lightning/backend/local/BUILD.bazel @@ -87,7 +87,10 @@ go_library( "@com_github_tikv_pd_client//:client", "@com_github_tikv_pd_client//errs", "@com_github_tikv_pd_client//http", - "@com_github_tikv_pd_client//retry", + "@com_github_tikv_pd_client//opt", + "@com_github_tikv_pd_client//pkg/caller", + "@com_github_tikv_pd_client//pkg/retry", + "@com_github_tikv_pd_client//servicediscovery", "@org_golang_google_grpc//:grpc", "@org_golang_google_grpc//backoff", "@org_golang_google_grpc//codes", @@ -180,8 +183,10 @@ go_test( "@com_github_tikv_client_go_v2//oracle", "@com_github_tikv_client_go_v2//tikv", "@com_github_tikv_pd_client//:client", + "@com_github_tikv_pd_client//clients/router", "@com_github_tikv_pd_client//errs", "@com_github_tikv_pd_client//http", + "@com_github_tikv_pd_client//opt", "@org_golang_google_grpc//:grpc", "@org_golang_google_grpc//codes", "@org_golang_google_grpc//encoding", diff --git a/pkg/lightning/tikv/BUILD.bazel b/pkg/lightning/tikv/BUILD.bazel index 0832faef7684d..0ed37379c49b4 100644 --- a/pkg/lightning/tikv/BUILD.bazel +++ b/pkg/lightning/tikv/BUILD.bazel @@ -64,6 +64,7 @@ go_test( "@com_github_stretchr_testify//require", "@com_github_tikv_pd_client//:client", "@com_github_tikv_pd_client//http", + "@com_github_tikv_pd_client//pkg/caller", "@org_golang_google_grpc//:grpc", "@org_golang_google_grpc//credentials/insecure", ], diff --git a/pkg/server/handler/tikvhandler/BUILD.bazel b/pkg/server/handler/tikvhandler/BUILD.bazel index 79fcde99867c7..0b5decaa6d56a 100644 --- a/pkg/server/handler/tikvhandler/BUILD.bazel +++ b/pkg/server/handler/tikvhandler/BUILD.bazel @@ -41,6 +41,7 @@ go_library( "@com_github_pingcap_failpoint//:failpoint", "@com_github_pingcap_log//:log", "@com_github_tikv_client_go_v2//tikv", + "@com_github_tikv_pd_client//clients/router", "@com_github_tikv_pd_client//http", "@org_uber_go_zap//:zap", ], diff --git a/pkg/store/copr/BUILD.bazel b/pkg/store/copr/BUILD.bazel index df5dd3cb2636d..299da27a89b5d 100644 --- a/pkg/store/copr/BUILD.bazel +++ b/pkg/store/copr/BUILD.bazel @@ -63,6 +63,7 @@ go_library( "@com_github_tikv_client_go_v2//txnkv/txnsnapshot", "@com_github_tikv_client_go_v2//util", "@com_github_tikv_pd_client//:client", + "@com_github_tikv_pd_client//opt", "@com_github_twmb_murmur3//:murmur3", "@org_golang_google_grpc//codes", "@org_golang_google_grpc//status", diff --git a/pkg/store/copr/copr_test/BUILD.bazel b/pkg/store/copr/copr_test/BUILD.bazel index 3953501f6448c..0903eec3f3c74 100644 --- a/pkg/store/copr/copr_test/BUILD.bazel +++ b/pkg/store/copr/copr_test/BUILD.bazel @@ -25,6 +25,7 @@ go_test( "@com_github_tikv_client_go_v2//testutils", "@com_github_tikv_client_go_v2//tikv", "@com_github_tikv_pd_client//:client", + "@com_github_tikv_pd_client//opt", "@com_github_tikv_pd_client//resource_group/controller", "@org_uber_go_goleak//:goleak", ], diff --git a/pkg/store/driver/BUILD.bazel b/pkg/store/driver/BUILD.bazel index 46d90bca7ab50..69e3e65f68dcd 100644 --- a/pkg/store/driver/BUILD.bazel +++ b/pkg/store/driver/BUILD.bazel @@ -24,6 +24,8 @@ go_library( "@com_github_tikv_client_go_v2//util", "@com_github_tikv_pd_client//:client", "@com_github_tikv_pd_client//http", + "@com_github_tikv_pd_client//opt", + "@com_github_tikv_pd_client//pkg/caller", "@org_golang_google_grpc//:grpc", "@org_golang_google_grpc//keepalive", "@org_uber_go_zap//:zap", diff --git a/pkg/store/mockstore/unistore/BUILD.bazel b/pkg/store/mockstore/unistore/BUILD.bazel index f87d8c80e29cc..642a03f5381a3 100644 --- a/pkg/store/mockstore/unistore/BUILD.bazel +++ b/pkg/store/mockstore/unistore/BUILD.bazel @@ -41,6 +41,11 @@ go_library( "@com_github_tikv_client_go_v2//tikv", "@com_github_tikv_client_go_v2//tikvrpc", "@com_github_tikv_pd_client//:client", + "@com_github_tikv_pd_client//clients/router", + "@com_github_tikv_pd_client//clients/tso", + "@com_github_tikv_pd_client//opt", + "@com_github_tikv_pd_client//pkg/caller", + "@com_github_tikv_pd_client//servicediscovery", "@org_golang_google_grpc//:grpc", "@org_golang_google_grpc//metadata", ], diff --git a/pkg/store/mockstore/unistore/pd/BUILD.bazel b/pkg/store/mockstore/unistore/pd/BUILD.bazel index 4c6e9f562b7b9..5284b8a52ae57 100644 --- a/pkg/store/mockstore/unistore/pd/BUILD.bazel +++ b/pkg/store/mockstore/unistore/pd/BUILD.bazel @@ -10,7 +10,8 @@ go_library( "@com_github_pingcap_kvproto//pkg/metapb", "@com_github_pingcap_kvproto//pkg/pdpb", "@com_github_pingcap_log//:log", - "@com_github_tikv_pd_client//:client", + "@com_github_tikv_pd_client//clients/router", + "@com_github_tikv_pd_client//opt", "@org_golang_google_grpc//:grpc", "@org_golang_google_grpc//credentials/insecure", "@org_uber_go_zap//:zap", diff --git a/pkg/store/mockstore/unistore/tikv/BUILD.bazel b/pkg/store/mockstore/unistore/tikv/BUILD.bazel index c84ef43e1bb8c..6072b2e27ce98 100644 --- a/pkg/store/mockstore/unistore/tikv/BUILD.bazel +++ b/pkg/store/mockstore/unistore/tikv/BUILD.bazel @@ -51,7 +51,8 @@ go_library( "@com_github_pingcap_log//:log", "@com_github_pingcap_tipb//go-tipb", "@com_github_tikv_client_go_v2//oracle", - "@com_github_tikv_pd_client//:client", + "@com_github_tikv_pd_client//clients/router", + "@com_github_tikv_pd_client//opt", "@org_golang_google_grpc//:grpc", "@org_golang_google_grpc//credentials/insecure", "@org_uber_go_zap//:zap", diff --git a/pkg/ttl/cache/BUILD.bazel b/pkg/ttl/cache/BUILD.bazel index 3a6058eb270e0..03147d4983e44 100644 --- a/pkg/ttl/cache/BUILD.bazel +++ b/pkg/ttl/cache/BUILD.bazel @@ -75,6 +75,8 @@ go_test( "@com_github_stretchr_testify//require", "@com_github_tikv_client_go_v2//tikv", "@com_github_tikv_pd_client//:client", + "@com_github_tikv_pd_client//clients/router", + "@com_github_tikv_pd_client//opt", "@org_uber_go_goleak//:goleak", ], ) diff --git a/pkg/util/metricsutil/BUILD.bazel b/pkg/util/metricsutil/BUILD.bazel index ddede42f32d8a..baf93061856a5 100644 --- a/pkg/util/metricsutil/BUILD.bazel +++ b/pkg/util/metricsutil/BUILD.bazel @@ -27,5 +27,7 @@ go_library( "@com_github_pingcap_kvproto//pkg/keyspacepb", "@com_github_tikv_client_go_v2//config", "@com_github_tikv_pd_client//:client", + "@com_github_tikv_pd_client//opt", + "@com_github_tikv_pd_client//pkg/caller", ], ) diff --git a/tests/realtikvtest/brietest/BUILD.bazel b/tests/realtikvtest/brietest/BUILD.bazel index 08f31926f3355..d480c17fc9874 100644 --- a/tests/realtikvtest/brietest/BUILD.bazel +++ b/tests/realtikvtest/brietest/BUILD.bazel @@ -30,6 +30,7 @@ go_test( "@com_github_stretchr_testify//require", "@com_github_tikv_client_go_v2//oracle", "@com_github_tikv_pd_client//:client", + "@com_github_tikv_pd_client//pkg/caller", "@org_golang_google_grpc//:grpc", "@org_golang_google_grpc//credentials/insecure", "@org_uber_go_goleak//:goleak",