From bc4bde76eb7081731646e2dbde1bed37ce121f62 Mon Sep 17 00:00:00 2001 From: disksing Date: Mon, 19 Apr 2021 20:29:52 +0800 Subject: [PATCH] *: update br (#24128) --- go.mod | 2 +- go.sum | 5 ++-- store/mockstore/mocktikv/puppet.go | 45 ------------------------------ 3 files changed, 3 insertions(+), 49 deletions(-) delete mode 100644 store/mockstore/mocktikv/puppet.go diff --git a/go.mod b/go.mod index 6e8463bceb..7ea93f7037 100644 --- a/go.mod +++ b/go.mod @@ -39,7 +39,7 @@ require ( github.com/opentracing/opentracing-go v1.1.0 github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 github.com/pingcap/badger v1.5.1-0.20200908111422-2e78ee155d19 - github.com/pingcap/br v5.0.0-nightly.0.20210407061032-be5523713acf+incompatible + github.com/pingcap/br v5.0.0-nightly.0.20210419090151-03762465b589+incompatible github.com/pingcap/check v0.0.0-20200212061837-5e12011dc712 github.com/pingcap/errors v0.11.5-0.20201126102027-b0a155152ca3 github.com/pingcap/failpoint v0.0.0-20210316064728-7acb0f0a3dfd diff --git a/go.sum b/go.sum index d155e69cf4..82ca40cea0 100644 --- a/go.sum +++ b/go.sum @@ -410,8 +410,8 @@ github.com/phf/go-queue v0.0.0-20170504031614-9abe38d0371d h1:U+PMnTlV2tu7RuMK5e github.com/phf/go-queue v0.0.0-20170504031614-9abe38d0371d/go.mod h1:lXfE4PvvTW5xOjO6Mba8zDPyw8M93B6AQ7frTGnMlA8= github.com/pingcap/badger v1.5.1-0.20200908111422-2e78ee155d19 h1:IXpGy7y9HyoShAFmzW2OPF0xCA5EOoSTyZHwsgYk9Ro= github.com/pingcap/badger v1.5.1-0.20200908111422-2e78ee155d19/go.mod h1:LyrqUOHZrUDf9oGi1yoz1+qw9ckSIhQb5eMa1acOLNQ= -github.com/pingcap/br v5.0.0-nightly.0.20210407061032-be5523713acf+incompatible h1:pkfMiswYXWh4W8ehyOTQxaxQzSvP8NCeVfc2LxmQAAg= -github.com/pingcap/br v5.0.0-nightly.0.20210407061032-be5523713acf+incompatible/go.mod h1:ymVmo50lQydxib0tmK5hHk4oteB7hZ0IMCArunwy3UQ= +github.com/pingcap/br v5.0.0-nightly.0.20210419090151-03762465b589+incompatible h1:VF2oZgvBqSIMmplEWXGGmktuQGdGGIGWwptmjJFhQbU= +github.com/pingcap/br v5.0.0-nightly.0.20210419090151-03762465b589+incompatible/go.mod h1:ymVmo50lQydxib0tmK5hHk4oteB7hZ0IMCArunwy3UQ= github.com/pingcap/check v0.0.0-20190102082844-67f458068fc8/go.mod h1:B1+S9LNcuMyLH/4HMTViQOJevkGiik3wW2AN9zb2fNQ= github.com/pingcap/check v0.0.0-20191107115940-caf2b9e6ccf4/go.mod h1:PYMCGwN0JHjoqGr3HrZoD+b8Tgx8bKnArhSq8YVzUMc= github.com/pingcap/check v0.0.0-20191216031241-8a5a85928f12/go.mod h1:PYMCGwN0JHjoqGr3HrZoD+b8Tgx8bKnArhSq8YVzUMc= @@ -500,7 +500,6 @@ github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD github.com/sasha-s/go-deadlock v0.2.0/go.mod h1:StQn567HiB1fF2yJ44N9au7wOhrPS3iZqiDbRupzT10= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/sergi/go-diff v1.0.1-0.20180205163309-da645544ed44/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shirou/gopsutil v2.19.10+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shirou/gopsutil v3.21.2+incompatible h1:U+YvJfjCh6MslYlIAXvPtzhW3YZEtc9uncueUNpD/0A= diff --git a/store/mockstore/mocktikv/puppet.go b/store/mockstore/mocktikv/puppet.go deleted file mode 100644 index 36e3bc6d62..0000000000 --- a/store/mockstore/mocktikv/puppet.go +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright 2021 PingCAP, Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// See the License for the specific language governing permissions and -// limitations under the License. - -package mocktikv - -import "github.com/pingcap/tidb/store/tikv/mockstore/mocktikv" - -// Type alias to keep br working. Remove it after BR updates. -type ( - // MVCCStore is a mvcc key-value storage. - MVCCStore = mocktikv.MVCCStore - // Cluster simulates a TiKV cluster. It focuses on management and the change of - // meta data. A Cluster mainly includes following 3 kinds of meta data: - // 1) Region: A Region is a fragment of TiKV's data whose range is [start, end). - // The data of a Region is duplicated to multiple Peers and distributed in - // multiple Stores. - // 2) Peer: A Peer is a replica of a Region's data. All peers of a Region form - // a group, each group elects a Leader to provide services. - // 3) Store: A Store is a storage/service node. Try to think it as a TiKV server - // process. Only the store with request's Region's leader Peer could respond - // to client's request. - Cluster = mocktikv.Cluster -) - -// Variable alias to keep br working. Remove it after BR updates. -var ( - // MustNewMVCCStore is used for testing, use NewMVCCLevelDB instead. - MustNewMVCCStore = mocktikv.MustNewMVCCStore - // NewCluster creates an empty cluster. It needs to be bootstrapped before - // providing service. - NewCluster = mocktikv.NewCluster - // NewPDClient creates a mock pd.Client that uses local timestamp and meta data - // from a Cluster. - NewPDClient = mocktikv.NewPDClient -)