*: update deps (#595)

* *: update deps close #593 Signed-off-by: disksing <[email protected]> * fix test Signed-off-by: disksing <[email protected]> * fix test Signed-off-by: disksing <[email protected]>
pingcap · Feb 21, 2022 · 00998a9 · 00998a9
1 parent 5ab2963
commit 00998a9
Show file tree

Hide file tree

Showing 10 changed files with 418 additions and 195 deletions.
diff --git a/go.mod1 b/go.mod1
@@ -3,41 +3,39 @@ module github.com/pingcap/tidb-tools
 require (
 	github.com/BurntSushi/toml v0.3.1
 	github.com/DATA-DOG/go-sqlmock v1.5.0
-	github.com/Shopify/sarama v1.27.2
+	github.com/Shopify/sarama v1.31.1
 	github.com/coreos/go-semver v0.3.0
-	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
-	github.com/go-openapi/swag v0.19.8 // indirect
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/golang/protobuf v1.5.2
-	github.com/mailru/easyjson v0.7.1 // indirect
-	github.com/olekukonko/tablewriter v0.0.4
-	github.com/pingcap/check v0.0.0-20200212061837-5e12011dc712
-	github.com/pingcap/errors v0.11.5-0.20211009033009-93128226aaa3
-	github.com/pingcap/failpoint v0.0.0-20210316064728-7acb0f0a3dfd
-	github.com/pingcap/kvproto v0.0.0-20211202065422-a412f7a319c3
-	github.com/pingcap/log v0.0.0-20210906054005-afc726e70354
-	github.com/pingcap/tidb v1.1.0-beta.0.20211209055157-9f744cdf8266
-	github.com/pingcap/tidb/parser v0.0.0-20211209055157-9f744cdf8266
-	github.com/pingcap/tiflow v0.0.0-20211220021146-bf29e42c75ae
-	github.com/pingcap/tipb v0.0.0-20211201080053-bd104bb270ba
-	github.com/shirou/gopsutil v3.21.4+incompatible // indirect
+	github.com/olekukonko/tablewriter v0.0.5
+	github.com/pingcap/check v0.0.0-20211026125417-57bd13f7b5f0
+	github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c
+	github.com/pingcap/failpoint v0.0.0-20210918120811-547c13e3eb00
+	github.com/pingcap/kvproto v0.0.0-20220215045702-d229fcc888c8
+	github.com/pingcap/log v0.0.0-20211215031037-e024ba4eb0ee
+	github.com/pingcap/tidb v1.1.0-beta.0.20220210065735-92f5a6340ca2
+	github.com/pingcap/tidb/parser v0.0.0-20220218045740-61986869ea19
+	github.com/pingcap/tiflow v0.0.0-20220217071740-1e3dd1550494
+	github.com/pingcap/tipb v0.0.0-20220215045658-d12dec7a7609
 	github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726
-	github.com/siddontang/go-log v0.0.0-20190221022429-1e957dd83bed // indirect
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0
-	github.com/tikv/pd v1.1.0-beta.0.20211118054146-02848d2660ee
-	github.com/tklauser/go-sysconf v0.3.6 // indirect
-	go.etcd.io/etcd v0.5.0-alpha.5.0.20210512015243-d19fbe541bf9
+	github.com/tikv/pd/client v0.0.0-20220218061340-602217e4455a
+	go.etcd.io/etcd/api/v3 v3.5.2
+	go.etcd.io/etcd/client/v3 v3.5.2
+	go.etcd.io/etcd/tests/v3 v3.5.2
 	go.uber.org/atomic v1.9.0
-	go.uber.org/zap v1.19.1
-	golang.org/x/net v0.0.0-20211020060615-d418f374d309
-	google.golang.org/grpc v1.40.0
+	go.uber.org/zap v1.20.0
+	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
+	google.golang.org/grpc v1.43.0
 )
 
 replace github.com/golang/lint => golang.org/x/lint v0.0.0-20190930215403-16217165b5de
 
-// cloud.google.com/go/storage will upgrade grpc to v1.40.0
-// we need keep the replacement until go.etcd.io supports the higher version of grpc.
-replace google.golang.org/grpc => google.golang.org/grpc v1.29.1
+// FIXME: Change to master TiDB after upgrade TiDB.
+replace github.com/pingcap/tidb => github.com/oh-my-tidb/tidb v1.1.0-beta.0.20220218042203-2e273f3f990d
+
+// Suppress 'ambiguous imports' error caused by that old tikv/pd also provides `tikv/pd/client`
+replace github.com/tikv/pd => github.com/tikv/pd v0.0.0-20220218061340-602217e4455a
 
 go 1.16
diff --git a/go.sum1 b/go.sum1
diff --git a/pkg/check/table_structure_test.go b/pkg/check/table_structure_test.go
@@ -157,7 +157,7 @@ func (t *testCheckSuite) TestTablesChecker(c *tc.C) {
 		AddRow("test-table-1", `CREATE TABLE "test-table-1" (
   "c" int(11) NOT NULL,
   PRIMARY KEY ("c")
-) ENGINE=InnoDB DEFAULT CHARSET=gbk`)
+) ENGINE=InnoDB DEFAULT CHARSET=gb2312`)
 	mock.ExpectQuery("SHOW CREATE TABLE `test-db`.`test-table-1`").WillReturnRows(createTableRow)
 	sqlModeRow = sqlmock.NewRows([]string{"Variable_name", "Value"}).
 		AddRow("sql_mode", "ANSI_QUOTES")

diff --git a/pkg/etcd/etcd.go b/pkg/etcd/etcd.go
@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"github.com/pingcap/errors"
-	"go.etcd.io/etcd/clientv3"
+	clientv3 "go.etcd.io/etcd/client/v3"
 )
 
 // Node organizes the ectd query result as a Trie tree

diff --git a/pkg/etcd/etcd_test.go b/pkg/etcd/etcd_test.go
@@ -21,8 +21,8 @@ import (
 	"github.com/pingcap/check"
 	. "github.com/pingcap/check"
 	"github.com/pingcap/errors"
-	"go.etcd.io/etcd/clientv3"
-	"go.etcd.io/etcd/integration"
+	clientv3 "go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/tests/v3/integration"
 )
 
 var (
@@ -32,6 +32,7 @@ var (
 )
 
 func TestClient(t *testing.T) {
+	integration.BeforeTest(t)
 	ctx, etcdCli, etcdMockCluster = testSetup(t)
 	defer etcdMockCluster.Terminate(t)
 	TestingT(t)

diff --git a/pkg/hack/hack.go b/pkg/hack/hack.go
@@ -14,5 +14,5 @@
 package hack
 
 import (
-	_ "go.etcd.io/etcd/integration" // for update vendor
+	_ "go.etcd.io/etcd/tests/v3/integration" // for update vendor
 )
diff --git a/sync_diff_inspector/utils/pd.go b/sync_diff_inspector/utils/pd.go
@@ -28,7 +28,7 @@ import (
 	"github.com/pingcap/log"
 	"github.com/pingcap/tidb-tools/pkg/dbutil"
 	pd "github.com/tikv/pd/client"
-	"go.etcd.io/etcd/clientv3"
+	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.uber.org/zap"
 )
 

diff --git a/tidb-binlog/node/registry.go b/tidb-binlog/node/registry.go
@@ -23,7 +23,7 @@ import (
 	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
 	"github.com/pingcap/tidb-tools/pkg/etcd"
-	"go.etcd.io/etcd/clientv3"
+	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.uber.org/zap"
 )
 

diff --git a/tidb-binlog/node/registry_test.go b/tidb-binlog/node/registry_test.go
@@ -20,7 +20,7 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/tidb-tools/pkg/etcd"
-	"go.etcd.io/etcd/integration"
+	"go.etcd.io/etcd/tests/v3/integration"
 	"golang.org/x/net/context"
 )
 
@@ -36,6 +36,8 @@ type RegisrerTestClient interface {
 var testEtcdCluster *integration.ClusterV3
 
 func TestNode(t *testing.T) {
+	integration.BeforeTest(t)
+
 	testEtcdCluster = integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1})
 	defer testEtcdCluster.Terminate(t)
 

diff --git a/tidb-binlog/pump_client/client.go b/tidb-binlog/pump_client/client.go
@@ -29,7 +29,7 @@ import (
 	"github.com/pingcap/tidb-tools/tidb-binlog/node"
 	pb "github.com/pingcap/tipb/go-binlog"
 	pd "github.com/tikv/pd/client"
-	"go.etcd.io/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/api/v3/mvccpb"
 	"go.uber.org/zap"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"