*: remove cockroach deps (pingcap#37703)

Dousir9 · Sep 8, 2022 · abb1fd1 · abb1fd1
1 parent ec9e43e
commit abb1fd1
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 5 deletions.
diff --git a/br/pkg/lightning/common/BUILD.bazel b/br/pkg/lightning/common/BUILD.bazel
@@ -23,6 +23,8 @@ go_library(
         "//br/pkg/utils",
         "//errno",
         "//parser/model",
+        "//store/driver/error",
+        "//util",
         "@com_github_go_sql_driver_mysql//:mysql",
         "@com_github_pingcap_errors//:errors",
         "@com_github_pingcap_failpoint//:failpoint",
@@ -56,6 +58,7 @@ go_test(
         "//br/pkg/errors",
         "//br/pkg/lightning/log",
         "//errno",
+        "//store/driver/error",
         "//testkit/testsetup",
         "@com_github_data_dog_go_sqlmock//:go-sqlmock",
         "@com_github_go_sql_driver_mysql//:mysql",

diff --git a/br/pkg/lightning/config/BUILD.bazel b/br/pkg/lightning/config/BUILD.bazel
@@ -17,12 +17,14 @@ go_library(
         "//br/pkg/version/build",
         "//config",
         "//parser/mysql",
+        "//util",
         "//util/table-filter",
         "//util/table-router",
         "@com_github_burntsushi_toml//:toml",
         "@com_github_carlmjohnson_flagext//:flagext",
         "@com_github_docker_go_units//:go-units",
         "@com_github_go_sql_driver_mysql//:mysql",
+        "@com_github_google_uuid//:uuid",
         "@com_github_pingcap_errors//:errors",
         "@org_uber_go_atomic//:atomic",
         "@org_uber_go_zap//:zap",

diff --git a/ddl/BUILD.bazel b/ddl/BUILD.bazel
@@ -250,6 +250,7 @@ go_test(
         "@com_github_tikv_client_go_v2//testutils",
         "@com_github_tikv_client_go_v2//tikv",
         "@io_etcd_go_etcd_client_v3//:client",
+        "@io_etcd_go_etcd_tests_v3//integration",
         "@org_golang_x_exp//slices",
         "@org_uber_go_atomic//:atomic",
         "@org_uber_go_goleak//:goleak",

diff --git a/dumpling/export/BUILD.bazel b/dumpling/export/BUILD.bazel
@@ -49,6 +49,7 @@ go_library(
         "@com_github_coreos_go_semver//semver",
         "@com_github_docker_go_units//:go-units",
         "@com_github_go_sql_driver_mysql//:mysql",
+        "@com_github_google_uuid//:uuid",
         "@com_github_pingcap_errors//:errors",
         "@com_github_pingcap_failpoint//:failpoint",
         "@com_github_pingcap_log//:log",

diff --git a/go.mod b/go.mod
@@ -18,7 +18,6 @@ require (
 	github.com/charithe/durationcheck v0.0.9
 	github.com/cheggaaa/pb/v3 v3.0.8
 	github.com/cheynewallace/tabby v1.1.1
-	github.com/cockroachdb/errors v1.8.1
 	github.com/cockroachdb/pebble v0.0.0-20210719141320-8c3bd06debb5
 	github.com/coocood/freecache v1.2.1
 	github.com/coreos/go-semver v0.3.0
@@ -131,6 +130,7 @@ require (
 	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/chavacava/garif v0.0.0-20220630083739-93517212f375 // indirect
+	github.com/cockroachdb/errors v1.8.1 // indirect
 	github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f // indirect
 	github.com/cockroachdb/redact v1.0.8 // indirect
 	github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 // indirect

diff --git a/planner/cascades/BUILD.bazel b/planner/cascades/BUILD.bazel
@@ -56,6 +56,7 @@ go_test(
         "//testkit",
         "//testkit/testdata",
         "//testkit/testsetup",
+        "@com_github_pingcap_failpoint//:failpoint",
         "@com_github_stretchr_testify//require",
         "@org_uber_go_goleak//:goleak",
     ],

diff --git a/testkit/testfork/BUILD.bazel b/testkit/testfork/BUILD.bazel
@@ -6,7 +6,7 @@ go_library(
     importpath = "github.com/pingcap/tidb/testkit/testfork",
     visibility = ["//visibility:public"],
     deps = [
-        "@com_github_cockroachdb_errors//:errors",
+        "@com_github_pingcap_errors//:errors",
         "@com_github_stretchr_testify//require",
     ],
 )

diff --git a/testkit/testfork/fork.go b/testkit/testfork/fork.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/cockroachdb/errors"
+	"github.com/pingcap/errors"
 	"github.com/stretchr/testify/require"
 )
 
@@ -57,7 +57,7 @@ func (s *pickStack) PickValue(values []any) (any, error) {
 
 	stackLen := len(s.stack)
 	if s.pos > stackLen {
-		return nil, errors.Newf("illegal state %d > %d", s.pos, stackLen)
+		return nil, errors.Errorf("illegal state %d > %d", s.pos, stackLen)
 	}
 
 	defer func() {

diff --git a/util/BUILD.bazel b/util/BUILD.bazel
@@ -42,7 +42,6 @@ go_library(
         "@io_etcd_go_etcd_client_v3//:client",
         "@io_etcd_go_etcd_client_v3//concurrency",
         "@org_golang_google_grpc//:grpc",
-        "@org_golang_google_grpc//credentials",
         "@org_uber_go_zap//:zap",
     ],
 )

diff --git a/util/chunk/BUILD.bazel b/util/chunk/BUILD.bazel
@@ -33,6 +33,7 @@ go_library(
         "//util/memory",
         "@com_github_pingcap_errors//:errors",
         "@com_github_pingcap_failpoint//:failpoint",
+        "@org_golang_x_sys//cpu",
         "@org_uber_go_zap//:zap",
     ],
 )