From a39a0ff20f22d0390be1ff1a86dccccd72b8ab78 Mon Sep 17 00:00:00 2001 From: 3pointer Date: Fri, 2 Jul 2021 15:52:09 +0800 Subject: [PATCH 1/7] update pkg path --- br/pkg/cdclog/buffer.go | 2 +- br/pkg/checksum/executor.go | 2 +- br/pkg/checksum/executor_test.go | 8 +++--- br/pkg/checksum/validate.go | 8 +++--- br/pkg/lightning/backend/backend.go | 14 +++++----- br/pkg/lightning/backend/backend_test.go | 6 ++--- br/pkg/lightning/backend/kv/session.go | 8 +++--- br/pkg/lightning/backend/kv/sql2kv_test.go | 8 +++--- br/pkg/lightning/backend/kv/types.go | 4 +-- br/pkg/lightning/checkpoints/checkpoints.go | 14 +++++----- .../checkpoints/checkpoints_file_test.go | 8 +++--- .../lightning/checkpoints/glue_checkpoint.go | 12 ++++----- br/pkg/lightning/common/security.go | 2 +- br/pkg/lightning/common/security_test.go | 2 +- br/pkg/lightning/common/storage_test.go | 2 +- br/pkg/lightning/common/util.go | 2 +- br/pkg/lightning/common/util_test.go | 4 +-- br/pkg/lightning/lightning.go | 26 +++++++++---------- br/pkg/lightning/lightning_test.go | 24 ++++++++--------- br/pkg/lightning/metric/metric_test.go | 2 +- br/pkg/lightning/restore/checksum.go | 16 ++++++------ br/pkg/lightning/restore/checksum_test.go | 2 +- br/pkg/lightning/restore/meta_manager.go | 12 ++++----- br/pkg/lightning/restore/meta_manager_test.go | 8 +++--- br/pkg/lightning/restore/tidb.go | 16 ++++++------ br/pkg/lightning/sigusr1_unix.go | 2 +- br/pkg/lightning/tikv/tikv.go | 8 +++--- br/pkg/lightning/tikv/tikv_test.go | 4 +-- br/pkg/lightning/web/progress.go | 6 ++--- br/pkg/utils/key.go | 2 +- br/pkg/utils/safe_point_test.go | 2 +- br/pkg/utils/schema_test.go | 6 ++--- br/tests/br_full_ddl/run.sh | 2 +- br/tests/br_split_region_fail/run.sh | 4 +-- br/tests/lightning_checkpoint/run.sh | 6 ++--- .../lightning_checkpoint_dirty_tableid/run.sh | 4 +-- .../lightning_checkpoint_timestamp/run.sh | 2 +- br/tests/lightning_tidb_duplicate_data/run.sh | 2 +- 38 files changed, 131 insertions(+), 131 deletions(-) diff --git a/br/pkg/cdclog/buffer.go b/br/pkg/cdclog/buffer.go index 933d3c7c8fd98..11117a5ed5c3d 100644 --- a/br/pkg/cdclog/buffer.go +++ b/br/pkg/cdclog/buffer.go @@ -23,7 +23,7 @@ import ( "github.com/pingcap/tidb/types" "go.uber.org/zap" - "github.com/pingcap/br/pkg/kv" + "github.com/pingcap/tidb/br/pkg/kv" ) // TableBuffer represents the kv buffer of this table. diff --git a/br/pkg/checksum/executor.go b/br/pkg/checksum/executor.go index 6222617b831b5..1e3eb580a4a30 100644 --- a/br/pkg/checksum/executor.go +++ b/br/pkg/checksum/executor.go @@ -5,7 +5,7 @@ package checksum import ( "context" - "github.com/pingcap/br/pkg/metautil" + "github.com/pingcap/tidb/br/pkg/metautil" "github.com/gogo/protobuf/proto" "github.com/pingcap/errors" diff --git a/br/pkg/checksum/executor_test.go b/br/pkg/checksum/executor_test.go index 3be9d9c68b9dd..add63f6887dbe 100644 --- a/br/pkg/checksum/executor_test.go +++ b/br/pkg/checksum/executor_test.go @@ -7,7 +7,7 @@ import ( "math" "testing" - "github.com/pingcap/br/pkg/metautil" + "github.com/pingcap/tidb/br/pkg/metautil" . "github.com/pingcap/check" "github.com/pingcap/parser/model" @@ -16,9 +16,9 @@ import ( "github.com/pingcap/tidb/util/testkit" "github.com/pingcap/tidb/util/testleak" - "github.com/pingcap/br/pkg/backup" - "github.com/pingcap/br/pkg/checksum" - "github.com/pingcap/br/pkg/mock" + "github.com/pingcap/tidb/br/pkg/backup" + "github.com/pingcap/tidb/br/pkg/checksum" + "github.com/pingcap/tidb/br/pkg/mock" ) func TestT(t *testing.T) { diff --git a/br/pkg/checksum/validate.go b/br/pkg/checksum/validate.go index 89cef47e9118a..b6d613766d2f5 100644 --- a/br/pkg/checksum/validate.go +++ b/br/pkg/checksum/validate.go @@ -11,10 +11,10 @@ import ( "github.com/pingcap/log" "go.uber.org/zap" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/metautil" - "github.com/pingcap/br/pkg/storage" - "github.com/pingcap/br/pkg/summary" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/metautil" + "github.com/pingcap/tidb/br/pkg/storage" + "github.com/pingcap/tidb/br/pkg/summary" ) // FastChecksum checks whether the "local" checksum matches the checksum from TiKV. diff --git a/br/pkg/lightning/backend/backend.go b/br/pkg/lightning/backend/backend.go index b36da089db072..55cf4cec8c924 100644 --- a/br/pkg/lightning/backend/backend.go +++ b/br/pkg/lightning/backend/backend.go @@ -26,13 +26,13 @@ import ( "github.com/pingcap/tidb/table" "go.uber.org/zap" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/lightning/backend/kv" - "github.com/pingcap/br/pkg/lightning/checkpoints" - "github.com/pingcap/br/pkg/lightning/common" - "github.com/pingcap/br/pkg/lightning/log" - "github.com/pingcap/br/pkg/lightning/metric" - "github.com/pingcap/br/pkg/lightning/mydump" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/lightning/backend/kv" + "github.com/pingcap/tidb/br/pkg/lightning/checkpoints" + "github.com/pingcap/tidb/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning/metric" + "github.com/pingcap/tidb/br/pkg/lightning/mydump" ) const ( diff --git a/br/pkg/lightning/backend/backend_test.go b/br/pkg/lightning/backend/backend_test.go index 31489dd42d622..d68e7fbd3f4b1 100644 --- a/br/pkg/lightning/backend/backend_test.go +++ b/br/pkg/lightning/backend/backend_test.go @@ -12,9 +12,9 @@ import ( "github.com/pingcap/parser/mysql" "github.com/tikv/client-go/v2/oracle" - "github.com/pingcap/br/pkg/lightning/backend" - "github.com/pingcap/br/pkg/lightning/backend/kv" - "github.com/pingcap/br/pkg/mock" + "github.com/pingcap/tidb/br/pkg/lightning/backend" + "github.com/pingcap/tidb/br/pkg/lightning/backend/kv" + "github.com/pingcap/tidb/br/pkg/mock" ) type backendSuite struct { diff --git a/br/pkg/lightning/backend/kv/session.go b/br/pkg/lightning/backend/kv/session.go index 8b22b3919de8b..eb71026333955 100644 --- a/br/pkg/lightning/backend/kv/session.go +++ b/br/pkg/lightning/backend/kv/session.go @@ -29,10 +29,10 @@ import ( "github.com/pingcap/tidb/sessionctx" "github.com/pingcap/tidb/sessionctx/variable" - "github.com/pingcap/br/pkg/lightning/common" - "github.com/pingcap/br/pkg/lightning/log" - "github.com/pingcap/br/pkg/manual" - "github.com/pingcap/br/pkg/utils" + "github.com/pingcap/tidb/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/manual" + "github.com/pingcap/tidb/br/pkg/utils" "go.uber.org/zap" ) diff --git a/br/pkg/lightning/backend/kv/sql2kv_test.go b/br/pkg/lightning/backend/kv/sql2kv_test.go index 8a3a94c2eb9e3..1f35f5ed44ead 100644 --- a/br/pkg/lightning/backend/kv/sql2kv_test.go +++ b/br/pkg/lightning/backend/kv/sql2kv_test.go @@ -34,9 +34,9 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/pingcap/br/pkg/lightning/common" - "github.com/pingcap/br/pkg/lightning/log" - "github.com/pingcap/br/pkg/lightning/verification" + "github.com/pingcap/tidb/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning/verification" ) func (s *kvSuite) TestMarshal(c *C) { @@ -510,7 +510,7 @@ func (s *benchSQL2KVSuite) SetUpTest(c *C) { s.colPerm = []int{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, -1} } -// Run `go test github.com/pingcap/br/pkg/lightning/backend -check.b -test.v` to get benchmark result. +// Run `go test github.com/pingcap/tidb/br/pkg/lightning/backend -check.b -test.v` to get benchmark result. func (s *benchSQL2KVSuite) BenchmarkSQL2KV(c *C) { for i := 0; i < c.N; i++ { rows, err := s.encoder.Encode(s.logger, s.row, 1, s.colPerm, 0) diff --git a/br/pkg/lightning/backend/kv/types.go b/br/pkg/lightning/backend/kv/types.go index dc5eaceb14739..b469a78abdcd0 100644 --- a/br/pkg/lightning/backend/kv/types.go +++ b/br/pkg/lightning/backend/kv/types.go @@ -5,8 +5,8 @@ package kv import ( "github.com/pingcap/tidb/types" - "github.com/pingcap/br/pkg/lightning/log" - "github.com/pingcap/br/pkg/lightning/verification" + "github.com/pingcap/tidb/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning/verification" ) // Encoder encodes a row of SQL values into some opaque type which can be diff --git a/br/pkg/lightning/checkpoints/checkpoints.go b/br/pkg/lightning/checkpoints/checkpoints.go index ac39a9c0d960c..377b27be29026 100644 --- a/br/pkg/lightning/checkpoints/checkpoints.go +++ b/br/pkg/lightning/checkpoints/checkpoints.go @@ -29,13 +29,13 @@ import ( "go.uber.org/zap" "modernc.org/mathutil" - "github.com/pingcap/br/pkg/lightning/checkpoints/checkpointspb" - "github.com/pingcap/br/pkg/lightning/common" - "github.com/pingcap/br/pkg/lightning/config" - "github.com/pingcap/br/pkg/lightning/log" - "github.com/pingcap/br/pkg/lightning/mydump" - verify "github.com/pingcap/br/pkg/lightning/verification" - "github.com/pingcap/br/pkg/version/build" + "github.com/pingcap/tidb/br/pkg/lightning/checkpoints/checkpointspb" + "github.com/pingcap/tidb/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/config" + "github.com/pingcap/tidb/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning/mydump" + verify "github.com/pingcap/tidb/br/pkg/lightning/verification" + "github.com/pingcap/tidb/br/pkg/version/build" ) type CheckpointStatus uint8 diff --git a/br/pkg/lightning/checkpoints/checkpoints_file_test.go b/br/pkg/lightning/checkpoints/checkpoints_file_test.go index c202bcad465b9..7b4481bb1350a 100644 --- a/br/pkg/lightning/checkpoints/checkpoints_file_test.go +++ b/br/pkg/lightning/checkpoints/checkpoints_file_test.go @@ -9,10 +9,10 @@ import ( . "github.com/pingcap/check" "github.com/pingcap/errors" - "github.com/pingcap/br/pkg/lightning/checkpoints" - "github.com/pingcap/br/pkg/lightning/config" - "github.com/pingcap/br/pkg/lightning/mydump" - "github.com/pingcap/br/pkg/lightning/verification" + "github.com/pingcap/tidb/br/pkg/lightning/checkpoints" + "github.com/pingcap/tidb/br/pkg/lightning/config" + "github.com/pingcap/tidb/br/pkg/lightning/mydump" + "github.com/pingcap/tidb/br/pkg/lightning/verification" ) func Test(t *testing.T) { diff --git a/br/pkg/lightning/checkpoints/glue_checkpoint.go b/br/pkg/lightning/checkpoints/glue_checkpoint.go index 5eb869c20c03d..b95cf827584e8 100644 --- a/br/pkg/lightning/checkpoints/glue_checkpoint.go +++ b/br/pkg/lightning/checkpoints/glue_checkpoint.go @@ -27,12 +27,12 @@ import ( "github.com/pingcap/tidb/util/sqlexec" "go.uber.org/zap" - "github.com/pingcap/br/pkg/lightning/common" - "github.com/pingcap/br/pkg/lightning/config" - "github.com/pingcap/br/pkg/lightning/log" - "github.com/pingcap/br/pkg/lightning/mydump" - verify "github.com/pingcap/br/pkg/lightning/verification" - "github.com/pingcap/br/pkg/version/build" + "github.com/pingcap/tidb/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/config" + "github.com/pingcap/tidb/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning/mydump" + verify "github.com/pingcap/tidb/br/pkg/lightning/verification" + "github.com/pingcap/tidb/br/pkg/version/build" ) type Session interface { diff --git a/br/pkg/lightning/common/security.go b/br/pkg/lightning/common/security.go index a54948a05e03a..27716666ba7a1 100644 --- a/br/pkg/lightning/common/security.go +++ b/br/pkg/lightning/common/security.go @@ -27,7 +27,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - "github.com/pingcap/br/pkg/httputil" + "github.com/pingcap/tidb/br/pkg/httputil" ) // TLS diff --git a/br/pkg/lightning/common/security_test.go b/br/pkg/lightning/common/security_test.go index 527199f818790..a3cb73b82c6b5 100644 --- a/br/pkg/lightning/common/security_test.go +++ b/br/pkg/lightning/common/security_test.go @@ -24,7 +24,7 @@ import ( . "github.com/pingcap/check" - "github.com/pingcap/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/common" ) type securitySuite struct{} diff --git a/br/pkg/lightning/common/storage_test.go b/br/pkg/lightning/common/storage_test.go index e663384ec1415..0098b84df05f1 100644 --- a/br/pkg/lightning/common/storage_test.go +++ b/br/pkg/lightning/common/storage_test.go @@ -16,7 +16,7 @@ package common_test import ( . "github.com/pingcap/check" - "github.com/pingcap/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/common" ) var _ = Suite(&testStorageSuite{}) diff --git a/br/pkg/lightning/common/util.go b/br/pkg/lightning/common/util.go index d7b800b69d72f..6a79578e5575d 100644 --- a/br/pkg/lightning/common/util.go +++ b/br/pkg/lightning/common/util.go @@ -38,7 +38,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/pingcap/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning/log" ) const ( diff --git a/br/pkg/lightning/common/util_test.go b/br/pkg/lightning/common/util_test.go index 17998de2079d0..216cac78ac543 100644 --- a/br/pkg/lightning/common/util_test.go +++ b/br/pkg/lightning/common/util_test.go @@ -32,8 +32,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/pingcap/br/pkg/lightning/common" - "github.com/pingcap/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/log" ) type utilSuite struct{} diff --git a/br/pkg/lightning/lightning.go b/br/pkg/lightning/lightning.go index 6ef4fa534a119..0b159b9667541 100644 --- a/br/pkg/lightning/lightning.go +++ b/br/pkg/lightning/lightning.go @@ -36,19 +36,19 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/pingcap/br/pkg/lightning/backend/local" - "github.com/pingcap/br/pkg/lightning/checkpoints" - "github.com/pingcap/br/pkg/lightning/common" - "github.com/pingcap/br/pkg/lightning/config" - "github.com/pingcap/br/pkg/lightning/glue" - "github.com/pingcap/br/pkg/lightning/log" - "github.com/pingcap/br/pkg/lightning/mydump" - "github.com/pingcap/br/pkg/lightning/restore" - "github.com/pingcap/br/pkg/lightning/web" - "github.com/pingcap/br/pkg/redact" - "github.com/pingcap/br/pkg/storage" - "github.com/pingcap/br/pkg/utils" - "github.com/pingcap/br/pkg/version/build" + "github.com/pingcap/tidb/br/pkg/lightning/backend/local" + "github.com/pingcap/tidb/br/pkg/lightning/checkpoints" + "github.com/pingcap/tidb/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/config" + "github.com/pingcap/tidb/br/pkg/lightning/glue" + "github.com/pingcap/tidb/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning/mydump" + "github.com/pingcap/tidb/br/pkg/lightning/restore" + "github.com/pingcap/tidb/br/pkg/lightning/web" + "github.com/pingcap/tidb/br/pkg/redact" + "github.com/pingcap/tidb/br/pkg/storage" + "github.com/pingcap/tidb/br/pkg/utils" + "github.com/pingcap/tidb/br/pkg/version/build" ) type Lightning struct { diff --git a/br/pkg/lightning/lightning_test.go b/br/pkg/lightning/lightning_test.go index 058693bd99331..75ae2eeb683f3 100644 --- a/br/pkg/lightning/lightning_test.go +++ b/br/pkg/lightning/lightning_test.go @@ -31,10 +31,10 @@ import ( . "github.com/pingcap/check" "github.com/pingcap/failpoint" - "github.com/pingcap/br/pkg/lightning/checkpoints" - "github.com/pingcap/br/pkg/lightning/config" - "github.com/pingcap/br/pkg/lightning/glue" - "github.com/pingcap/br/pkg/lightning/mydump" + "github.com/pingcap/tidb/br/pkg/lightning/checkpoints" + "github.com/pingcap/tidb/br/pkg/lightning/config" + "github.com/pingcap/tidb/br/pkg/lightning/glue" + "github.com/pingcap/tidb/br/pkg/lightning/mydump" ) type lightningSuite struct{} @@ -125,11 +125,11 @@ func (s *lightningServerSuite) SetUpTest(c *C) { s.lightning.ctx = context.WithValue(s.lightning.ctx, &taskCfgRecorderKey, s.taskCfgCh) _ = s.lightning.GoServe() - _ = failpoint.Enable("github.com/pingcap/br/pkg/lightning/SkipRunTask", "return") + _ = failpoint.Enable("github.com/pingcap/tidb/br/pkg/lightning/SkipRunTask", "return") } func (s *lightningServerSuite) TearDownTest(c *C) { - _ = failpoint.Disable("github.com/pingcap/br/pkg/lightning/SkipRunTask") + _ = failpoint.Disable("github.com/pingcap/tidb/br/pkg/lightning/SkipRunTask") s.lightning.Stop() } @@ -480,24 +480,24 @@ func (s *lightningServerSuite) TestCheckSystemRequirement(c *C) { } // with max open files 1024, the max table size will be: 65536MB - err := failpoint.Enable("github.com/pingcap/br/pkg/lightning/backend/local/GetRlimitValue", "return(2049)") + err := failpoint.Enable("github.com/pingcap/tidb/br/pkg/lightning/backend/local/GetRlimitValue", "return(2049)") c.Assert(err, IsNil) - err = failpoint.Enable("github.com/pingcap/br/pkg/lightning/backend/local/SetRlimitError", "return(true)") + err = failpoint.Enable("github.com/pingcap/tidb/br/pkg/lightning/backend/local/SetRlimitError", "return(true)") c.Assert(err, IsNil) defer func() { - _ = failpoint.Disable("github.com/pingcap/br/pkg/lightning/backend/local/SetRlimitError") + _ = failpoint.Disable("github.com/pingcap/tidb/br/pkg/lightning/backend/local/SetRlimitError") }() // with this dbMetas, the estimated fds will be 2050, so should return error err = checkSystemRequirement(cfg, dbMetas) c.Assert(err, NotNil) - err = failpoint.Disable("github.com/pingcap/br/pkg/lightning/backend/local/GetRlimitValue") + err = failpoint.Disable("github.com/pingcap/tidb/br/pkg/lightning/backend/local/GetRlimitValue") c.Assert(err, IsNil) // the min rlimit should be bigger than the default min value (16384) - err = failpoint.Enable("github.com/pingcap/br/pkg/lightning/backend/local/GetRlimitValue", "return(8200)") + err = failpoint.Enable("github.com/pingcap/tidb/br/pkg/lightning/backend/local/GetRlimitValue", "return(8200)") defer func() { - _ = failpoint.Disable("github.com/pingcap/br/pkg/lightning/backend/local/GetRlimitValue") + _ = failpoint.Disable("github.com/pingcap/tidb/br/pkg/lightning/backend/local/GetRlimitValue") }() c.Assert(err, IsNil) err = checkSystemRequirement(cfg, dbMetas) diff --git a/br/pkg/lightning/metric/metric_test.go b/br/pkg/lightning/metric/metric_test.go index 25efda2675582..b5321cc3132a3 100644 --- a/br/pkg/lightning/metric/metric_test.go +++ b/br/pkg/lightning/metric/metric_test.go @@ -21,7 +21,7 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/pingcap/br/pkg/lightning/metric" + "github.com/pingcap/tidb/br/pkg/lightning/metric" ) type testMetricSuite struct{} diff --git a/br/pkg/lightning/restore/checksum.go b/br/pkg/lightning/restore/checksum.go index 37ff96e66737a..8f9c7158abeaf 100644 --- a/br/pkg/lightning/restore/checksum.go +++ b/br/pkg/lightning/restore/checksum.go @@ -20,14 +20,14 @@ import ( pd "github.com/tikv/pd/client" "go.uber.org/zap" - "github.com/pingcap/br/pkg/checksum" - "github.com/pingcap/br/pkg/lightning/checkpoints" - "github.com/pingcap/br/pkg/lightning/common" - "github.com/pingcap/br/pkg/lightning/config" - "github.com/pingcap/br/pkg/lightning/log" - "github.com/pingcap/br/pkg/lightning/metric" - "github.com/pingcap/br/pkg/pdutil" - "github.com/pingcap/br/pkg/utils" + "github.com/pingcap/tidb/br/pkg/checksum" + "github.com/pingcap/tidb/br/pkg/lightning/checkpoints" + "github.com/pingcap/tidb/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/config" + "github.com/pingcap/tidb/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning/metric" + "github.com/pingcap/tidb/br/pkg/pdutil" + "github.com/pingcap/tidb/br/pkg/utils" ) const ( diff --git a/br/pkg/lightning/restore/checksum_test.go b/br/pkg/lightning/restore/checksum_test.go index d38872f93851f..5053bac5fbc6a 100644 --- a/br/pkg/lightning/restore/checksum_test.go +++ b/br/pkg/lightning/restore/checksum_test.go @@ -27,7 +27,7 @@ import ( . "github.com/pingcap/check" "github.com/pingcap/errors" - . "github.com/pingcap/br/pkg/lightning/checkpoints" + . "github.com/pingcap/tidb/br/pkg/lightning/checkpoints" ) var _ = Suite(&checksumSuite{}) diff --git a/br/pkg/lightning/restore/meta_manager.go b/br/pkg/lightning/restore/meta_manager.go index c051c1eccf4f9..c1d5c92f20434 100644 --- a/br/pkg/lightning/restore/meta_manager.go +++ b/br/pkg/lightning/restore/meta_manager.go @@ -14,12 +14,12 @@ import ( "github.com/pingcap/parser/mysql" "go.uber.org/zap" - "github.com/pingcap/br/pkg/lightning/backend/tidb" - "github.com/pingcap/br/pkg/lightning/common" - "github.com/pingcap/br/pkg/lightning/log" - verify "github.com/pingcap/br/pkg/lightning/verification" - "github.com/pingcap/br/pkg/pdutil" - "github.com/pingcap/br/pkg/redact" + "github.com/pingcap/tidb/br/pkg/lightning/backend/tidb" + "github.com/pingcap/tidb/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/log" + verify "github.com/pingcap/tidb/br/pkg/lightning/verification" + "github.com/pingcap/tidb/br/pkg/pdutil" + "github.com/pingcap/tidb/br/pkg/redact" ) type metaMgrBuilder interface { diff --git a/br/pkg/lightning/restore/meta_manager_test.go b/br/pkg/lightning/restore/meta_manager_test.go index fd274754a438c..7ae56aade7806 100644 --- a/br/pkg/lightning/restore/meta_manager_test.go +++ b/br/pkg/lightning/restore/meta_manager_test.go @@ -16,10 +16,10 @@ import ( tmock "github.com/pingcap/tidb/util/mock" "go.uber.org/zap" - "github.com/pingcap/br/pkg/lightning/checkpoints" - "github.com/pingcap/br/pkg/lightning/common" - "github.com/pingcap/br/pkg/lightning/log" - "github.com/pingcap/br/pkg/lightning/verification" + "github.com/pingcap/tidb/br/pkg/lightning/checkpoints" + "github.com/pingcap/tidb/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning/verification" ) var _ = Suite(&metaMgrSuite{}) diff --git a/br/pkg/lightning/restore/tidb.go b/br/pkg/lightning/restore/tidb.go index 86db9cad0cfae..979fcf8537822 100644 --- a/br/pkg/lightning/restore/tidb.go +++ b/br/pkg/lightning/restore/tidb.go @@ -29,14 +29,14 @@ import ( "github.com/pingcap/parser/mysql" "github.com/pingcap/parser/terror" - "github.com/pingcap/br/pkg/lightning/glue" - - "github.com/pingcap/br/pkg/lightning/checkpoints" - "github.com/pingcap/br/pkg/lightning/common" - "github.com/pingcap/br/pkg/lightning/config" - "github.com/pingcap/br/pkg/lightning/log" - "github.com/pingcap/br/pkg/lightning/metric" - "github.com/pingcap/br/pkg/lightning/mydump" + "github.com/pingcap/tidb/br/pkg/lightning/glue" + + "github.com/pingcap/tidb/br/pkg/lightning/checkpoints" + "github.com/pingcap/tidb/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/config" + "github.com/pingcap/tidb/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning/metric" + "github.com/pingcap/tidb/br/pkg/lightning/mydump" "go.uber.org/zap" ) diff --git a/br/pkg/lightning/sigusr1_unix.go b/br/pkg/lightning/sigusr1_unix.go index 087f07d231148..b99cb22131cce 100644 --- a/br/pkg/lightning/sigusr1_unix.go +++ b/br/pkg/lightning/sigusr1_unix.go @@ -22,7 +22,7 @@ import ( "go.uber.org/zap" - "github.com/pingcap/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning/log" ) // handleSigUsr1 listens for the SIGUSR1 signal and executes `handler()` every time it is received. diff --git a/br/pkg/lightning/tikv/tikv.go b/br/pkg/lightning/tikv/tikv.go index a3c37b93d669b..a60b75b7771fb 100644 --- a/br/pkg/lightning/tikv/tikv.go +++ b/br/pkg/lightning/tikv/tikv.go @@ -30,10 +30,10 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/pingcap/br/pkg/lightning/common" - "github.com/pingcap/br/pkg/lightning/log" - "github.com/pingcap/br/pkg/pdutil" - "github.com/pingcap/br/pkg/version" + "github.com/pingcap/tidb/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/pdutil" + "github.com/pingcap/tidb/br/pkg/version" ) // StoreState is the state of a TiKV store. The numerical value is sorted by diff --git a/br/pkg/lightning/tikv/tikv_test.go b/br/pkg/lightning/tikv/tikv_test.go index aa5467722188e..0f4e2e45e0458 100644 --- a/br/pkg/lightning/tikv/tikv_test.go +++ b/br/pkg/lightning/tikv/tikv_test.go @@ -14,8 +14,8 @@ import ( . "github.com/pingcap/check" "github.com/pingcap/kvproto/pkg/import_sstpb" - "github.com/pingcap/br/pkg/lightning/common" - kv "github.com/pingcap/br/pkg/lightning/tikv" + "github.com/pingcap/tidb/br/pkg/lightning/common" + kv "github.com/pingcap/tidb/br/pkg/lightning/tikv" ) type tikvSuite struct{} diff --git a/br/pkg/lightning/web/progress.go b/br/pkg/lightning/web/progress.go index d109f7ed314ad..0d9c3c2d1450f 100644 --- a/br/pkg/lightning/web/progress.go +++ b/br/pkg/lightning/web/progress.go @@ -6,9 +6,9 @@ import ( "github.com/pingcap/errors" - "github.com/pingcap/br/pkg/lightning/checkpoints" - "github.com/pingcap/br/pkg/lightning/common" - "github.com/pingcap/br/pkg/lightning/mydump" + "github.com/pingcap/tidb/br/pkg/lightning/checkpoints" + "github.com/pingcap/tidb/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/mydump" ) // checkpointsMap is a concurrent map (table name → checkpoints). diff --git a/br/pkg/utils/key.go b/br/pkg/utils/key.go index de76447172bd4..9b4318acc33a5 100644 --- a/br/pkg/utils/key.go +++ b/br/pkg/utils/key.go @@ -11,7 +11,7 @@ import ( "github.com/pingcap/errors" - berrors "github.com/pingcap/br/pkg/errors" + berrors "github.com/pingcap/tidb/br/pkg/errors" ) // ParseKey parse key by given format. diff --git a/br/pkg/utils/safe_point_test.go b/br/pkg/utils/safe_point_test.go index 272afa327fac4..2c2a54a379562 100644 --- a/br/pkg/utils/safe_point_test.go +++ b/br/pkg/utils/safe_point_test.go @@ -10,7 +10,7 @@ import ( "github.com/pingcap/tidb/util/testleak" pd "github.com/tikv/pd/client" - "github.com/pingcap/br/pkg/utils" + "github.com/pingcap/tidb/br/pkg/utils" ) var _ = Suite(&testSafePointSuite{}) diff --git a/br/pkg/utils/schema_test.go b/br/pkg/utils/schema_test.go index a7c97d343d5a6..d96fe8811ab99 100644 --- a/br/pkg/utils/schema_test.go +++ b/br/pkg/utils/schema_test.go @@ -9,9 +9,9 @@ import ( "github.com/golang/protobuf/proto" - "github.com/pingcap/br/pkg/storage" + "github.com/pingcap/tidb/br/pkg/storage" - "github.com/pingcap/br/pkg/metautil" + "github.com/pingcap/tidb/br/pkg/metautil" . "github.com/pingcap/check" backuppb "github.com/pingcap/kvproto/pkg/backup" @@ -242,7 +242,7 @@ func buildBenchmarkBackupmeta(c *C, dbName string, tableCount, fileCountPerTable return mockBackupMeta(mockSchemas, mockFiles) } -// Run `go test github.com/pingcap/br/pkg/utils -check.b -test.v` to get benchmark result. +// Run `go test github.com/pingcap/tidb/br/pkg/utils -check.b -test.v` to get benchmark result. func (r *testSchemaSuite) BenchmarkLoadBackupMeta64(c *C) { meta := buildBenchmarkBackupmeta(c, "bench", 64, 64) c.ResetTimer() diff --git a/br/tests/br_full_ddl/run.sh b/br/tests/br_full_ddl/run.sh index bd40ecbafd0a1..a2c886d115ae2 100755 --- a/br/tests/br_full_ddl/run.sh +++ b/br/tests/br_full_ddl/run.sh @@ -111,7 +111,7 @@ run_sql "DROP DATABASE $DB;" # restore full echo "restore start..." -export GO_FAILPOINTS="github.com/pingcap/br/pkg/pdutil/PDEnabledPauseConfig=return(true)" +export GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/pdutil/PDEnabledPauseConfig=return(true)" run_br restore full -s "local://$TEST_DIR/$DB" --pd $PD_ADDR --log-file $LOG || { cat $LOG; exit 1; } export GO_FAILPOINTS="" diff --git a/br/tests/br_split_region_fail/run.sh b/br/tests/br_split_region_fail/run.sh index 77fac52a7dfdb..91cd4a9fb7b5c 100644 --- a/br/tests/br_split_region_fail/run.sh +++ b/br/tests/br_split_region_fail/run.sh @@ -44,8 +44,8 @@ done echo "restore start..." unset BR_LOG_TO_TERM -GO_FAILPOINTS="github.com/pingcap/br/pkg/restore/not-leader-error=1*return(true)->1*return(false);\ -github.com/pingcap/br/pkg/restore/somewhat-retryable-error=3*return(true)" \ +GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/restore/not-leader-error=1*return(true)->1*return(false);\ +github.com/pingcap/tidb/br/pkg/restore/somewhat-retryable-error=3*return(true)" \ run_br restore full -s "local://$TEST_DIR/$DB" --pd $PD_ADDR --ratelimit 1024 --log-file $LOG || true BR_LOG_TO_TERM=1 diff --git a/br/tests/lightning_checkpoint/run.sh b/br/tests/lightning_checkpoint/run.sh index f4bbede3771e6..bc608aba8853c 100755 --- a/br/tests/lightning_checkpoint/run.sh +++ b/br/tests/lightning_checkpoint/run.sh @@ -64,8 +64,8 @@ for BACKEND in importer local; do # Set the failpoint to kill the lightning instance as soon as one table is imported # If checkpoint does work, this should only kill 9 instances of lightnings. - SLOWDOWN_FAILPOINTS='github.com/pingcap/br/pkg/lightning/restore/SlowDownImport=sleep(250)' - export GO_FAILPOINTS="$SLOWDOWN_FAILPOINTS;github.com/pingcap/br/pkg/lightning/restore/FailBeforeIndexEngineImported=return" + SLOWDOWN_FAILPOINTS='github.com/pingcap/tidb/br/pkg/lightning/restore/SlowDownImport=sleep(250)' + export GO_FAILPOINTS="$SLOWDOWN_FAILPOINTS;github.com/pingcap/tidb/br/pkg/lightning/restore/FailBeforeIndexEngineImported=return" # Start importing the tables. run_sql 'DROP DATABASE IF EXISTS cppk_tsr' @@ -94,7 +94,7 @@ for BACKEND in importer local; do run_sql 'DROP DATABASE IF EXISTS tidb_lightning_checkpoint_test_cppk' run_sql 'DROP DATABASE IF EXISTS `tidb_lightning_checkpoint_test_cppk.1357924680.bak`' - export GO_FAILPOINTS="$SLOWDOWN_FAILPOINTS;github.com/pingcap/br/pkg/lightning/SetTaskID=return(1357924680);github.com/pingcap/br/pkg/lightning/restore/FailIfIndexEngineImported=return(1)" + export GO_FAILPOINTS="$SLOWDOWN_FAILPOINTS;github.com/pingcap/tidb/br/pkg/lightning/SetTaskID=return(1357924680);github.com/pingcap/tidb/br/pkg/lightning/restore/FailIfIndexEngineImported=return(1)" set +e for i in $(seq "$TABLE_COUNT"); do diff --git a/br/tests/lightning_checkpoint_dirty_tableid/run.sh b/br/tests/lightning_checkpoint_dirty_tableid/run.sh index 0b954085b8858..32a71f73767f2 100755 --- a/br/tests/lightning_checkpoint_dirty_tableid/run.sh +++ b/br/tests/lightning_checkpoint_dirty_tableid/run.sh @@ -19,7 +19,7 @@ set -eux rm -f "$TEST_DIR/lightning-checkpoint-dirty-tableid.log" run_sql 'DROP DATABASE IF EXISTS tidb_lightning_checkpoint' -export GO_FAILPOINTS="github.com/pingcap/br/pkg/lightning/restore/InitializeCheckpointExit=return(true)" +export GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/lightning/restore/InitializeCheckpointExit=return(true)" run_lightning --enable-checkpoint=1 --log-file "$TEST_DIR/lightning-checkpoint-dirty-tableid.log" --config "tests/$TEST_NAME/mysql.toml" -d "tests/$TEST_NAME/data" run_sql 'DROP DATABASE IF EXISTS cpdt' @@ -42,7 +42,7 @@ run_sql 'DROP DATABASE IF EXISTS cpdt' rm -f "$TEST_DIR/lightning-checkpoint-dirty-tableid.log" rm -f "/tmp/tidb_lightning_checkpoint.pb" -export GO_FAILPOINTS="github.com/pingcap/br/pkg/lightning/restore/InitializeCheckpointExit=return(true)" +export GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/lightning/restore/InitializeCheckpointExit=return(true)" run_lightning --enable-checkpoint=1 --log-file "$TEST_DIR/lightning-checkpoint-dirty-tableid.log" --config "tests/$TEST_NAME/file.toml" -d "tests/$TEST_NAME/data" run_sql 'DROP DATABASE IF EXISTS cpdt' diff --git a/br/tests/lightning_checkpoint_timestamp/run.sh b/br/tests/lightning_checkpoint_timestamp/run.sh index f7e8103c7cdd8..507cbdedce1d9 100755 --- a/br/tests/lightning_checkpoint_timestamp/run.sh +++ b/br/tests/lightning_checkpoint_timestamp/run.sh @@ -18,7 +18,7 @@ set -eu run_sql 'DROP DATABASE IF EXISTS cpts' rm -f "$TEST_DIR"/cpts.pb* -export GO_FAILPOINTS="github.com/pingcap/br/pkg/lightning/SetTaskID=return(1234567890);github.com/pingcap/br/pkg/lightning/restore/FailIfImportedChunk=return(28)" +export GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/lightning/SetTaskID=return(1234567890);github.com/pingcap/tidb/br/pkg/lightning/restore/FailIfImportedChunk=return(28)" for i in $(seq 5); do echo "******** Importing Chunk Now (file step $i) ********" diff --git a/br/tests/lightning_tidb_duplicate_data/run.sh b/br/tests/lightning_tidb_duplicate_data/run.sh index c9852980aea63..4fe6961d58e2f 100644 --- a/br/tests/lightning_tidb_duplicate_data/run.sh +++ b/br/tests/lightning_tidb_duplicate_data/run.sh @@ -22,7 +22,7 @@ sed -i.bak 's/new/old/g' "tests/lightning_tidb_duplicate_data/data/dup.dup.sql" for type in replace ignore error; do run_sql 'DROP DATABASE IF EXISTS dup;' - export GO_FAILPOINTS="github.com/pingcap/br/pkg/lightning/backend/tidb/FailIfImportedSomeRows=return" + export GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/lightning/backend/tidb/FailIfImportedSomeRows=return" set +e run_lightning --config "tests/$TEST_NAME/$type.toml" 2> /dev/null ERRORCODE=$? From 42f98551c26ffe59d1f4bb6bb24c4114db631cac Mon Sep 17 00:00:00 2001 From: 3pointer Date: Fri, 2 Jul 2021 16:07:29 +0800 Subject: [PATCH 2/7] update pkg path(2) --- br/cmd/br/backup.go | 12 ++--- br/cmd/br/cmd.go | 12 ++--- br/cmd/br/debug.go | 18 ++++---- br/cmd/br/restore.go | 12 ++--- br/cmd/tidb-lightning-ctl/main.go | 16 +++---- br/cmd/tidb-lightning/main.go | 6 +-- br/pkg/backup/check.go | 2 +- br/pkg/backup/client.go | 18 ++++---- br/pkg/backup/client_test.go | 8 ++-- br/pkg/backup/push.go | 10 ++-- br/pkg/backup/schema.go | 12 ++--- br/pkg/backup/schema_test.go | 8 ++-- br/pkg/cdclog/decoder.go | 2 +- br/pkg/cdclog/puller.go | 2 +- br/pkg/conn/conn.go | 10 ++-- br/pkg/conn/conn_test.go | 2 +- br/pkg/gluetidb/glue.go | 4 +- br/pkg/gluetikv/glue.go | 8 ++-- br/pkg/kv/checksum_test.go | 2 +- br/pkg/kv/kv.go | 4 +- br/pkg/lightning/backend/importer/importer.go | 12 ++--- .../backend/importer/importer_test.go | 8 ++-- br/pkg/lightning/backend/kv/sql2kv.go | 12 ++--- br/pkg/lightning/backend/local/iterator.go | 6 +-- .../lightning/backend/local/iterator_test.go | 2 +- br/pkg/lightning/backend/local/local.go | 34 +++++++------- br/pkg/lightning/backend/local/local_test.go | 12 ++--- br/pkg/lightning/backend/local/local_unix.go | 2 +- br/pkg/lightning/backend/local/localhelper.go | 12 ++--- .../backend/local/localhelper_test.go | 4 +- br/pkg/lightning/backend/noop/noop.go | 8 ++-- br/pkg/lightning/backend/tidb/tidb.go | 16 +++---- br/pkg/lightning/backend/tidb/tidb_test.go | 12 ++--- .../checkpoints/checkpoints_sql_test.go | 8 ++-- .../lightning/checkpoints/checkpoints_test.go | 6 +-- br/pkg/lightning/common/once_error_test.go | 2 +- br/pkg/lightning/common/pause_test.go | 4 +- br/pkg/lightning/config/bytesize_test.go | 2 +- br/pkg/lightning/config/config.go | 4 +- br/pkg/lightning/config/config_test.go | 2 +- br/pkg/lightning/config/configlist_test.go | 2 +- br/pkg/lightning/config/global.go | 4 +- br/pkg/lightning/glue/glue.go | 8 ++-- br/pkg/lightning/log/filter_test.go | 12 ++--- br/pkg/lightning/log/log_test.go | 2 +- br/pkg/lightning/mydump/csv_parser.go | 6 +-- br/pkg/lightning/mydump/csv_parser_test.go | 8 ++-- br/pkg/lightning/mydump/loader.go | 6 +-- br/pkg/lightning/mydump/loader_test.go | 6 +-- br/pkg/lightning/mydump/parquet_parser.go | 4 +- .../lightning/mydump/parquet_parser_test.go | 2 +- br/pkg/lightning/mydump/parser.go | 8 ++-- br/pkg/lightning/mydump/parser_test.go | 6 +-- br/pkg/lightning/mydump/reader.go | 6 +-- br/pkg/lightning/mydump/reader_test.go | 6 +-- br/pkg/lightning/mydump/region.go | 10 ++-- br/pkg/lightning/mydump/region_test.go | 8 ++-- br/pkg/lightning/mydump/router.go | 2 +- br/pkg/lightning/mydump/router_test.go | 2 +- br/pkg/lightning/restore/check_info.go | 10 ++-- br/pkg/lightning/restore/restore.go | 44 +++++++++--------- br/pkg/lightning/restore/restore_test.go | 46 +++++++++---------- br/pkg/lightning/restore/tidb_test.go | 8 ++-- br/pkg/lightning/verification/checksum.go | 2 +- .../lightning/verification/checksum_test.go | 4 +- br/pkg/lightning/worker/worker.go | 2 +- br/pkg/lightning/worker/worker_test.go | 2 +- br/pkg/logutil/logging.go | 2 +- br/pkg/logutil/logging_test.go | 4 +- br/pkg/metautil/metafile.go | 8 ++-- br/pkg/metautil/metafile_test.go | 2 +- br/pkg/mock/backend.go | 8 ++-- br/pkg/mock/glue.go | 8 ++-- br/pkg/mock/kv.go | 6 +-- br/pkg/mock/mock_cluster_test.go | 2 +- br/pkg/mock/storage/storage.go | 2 +- br/pkg/pdutil/pd.go | 6 +-- br/pkg/pdutil/utils.go | 4 +- br/pkg/redact/redact_test.go | 2 +- br/pkg/restore/backoff.go | 4 +- br/pkg/restore/backoff_test.go | 8 ++-- br/pkg/restore/batcher.go | 2 +- br/pkg/restore/batcher_test.go | 6 +-- br/pkg/restore/client.go | 22 ++++----- br/pkg/restore/client_test.go | 8 ++-- br/pkg/restore/db.go | 6 +-- br/pkg/restore/db_test.go | 12 ++--- br/pkg/restore/import.go | 10 ++-- br/pkg/restore/ingester.go | 10 ++-- br/pkg/restore/log_client.go | 10 ++-- br/pkg/restore/log_client_test.go | 6 +-- br/pkg/restore/merge.go | 4 +- br/pkg/restore/merge_test.go | 4 +- br/pkg/restore/pipeline_items.go | 6 +-- br/pkg/restore/range.go | 6 +-- br/pkg/restore/range_test.go | 4 +- br/pkg/restore/split.go | 6 +-- br/pkg/restore/split_client.go | 6 +-- br/pkg/restore/split_test.go | 4 +- br/pkg/restore/systable_restore.go | 6 +-- br/pkg/restore/util.go | 12 ++--- br/pkg/restore/util_test.go | 2 +- br/pkg/rtree/logging.go | 4 +- br/pkg/rtree/logging_test.go | 2 +- br/pkg/rtree/rtree.go | 2 +- br/pkg/rtree/rtree_test.go | 2 +- br/pkg/storage/compress.go | 2 +- br/pkg/storage/gcs.go | 2 +- br/pkg/storage/parse.go | 2 +- br/pkg/storage/s3.go | 2 +- br/pkg/storage/s3_test.go | 4 +- br/pkg/storage/storage.go | 2 +- br/pkg/task/backup.go | 18 ++++---- br/pkg/task/backup_raw.go | 16 +++---- br/pkg/task/common.go | 10 ++-- br/pkg/task/restore.go | 20 ++++---- br/pkg/task/restore_log.go | 6 +-- br/pkg/task/restore_raw.go | 11 +++-- br/pkg/task/restore_test.go | 2 +- br/pkg/utils/bytes.go | 2 +- br/pkg/utils/pprof.go | 2 +- br/pkg/utils/safe_point.go | 2 +- br/pkg/utils/schema.go | 2 +- br/pkg/version/version.go | 4 +- br/pkg/version/version_test.go | 2 +- br/tests/br_300_small_tables/run.sh | 2 +- br/tests/br_db/run.sh | 2 +- br/tests/br_full/run.sh | 8 ++-- br/tests/br_key_locked/locker.go | 4 +- br/tests/br_log_restore/run.sh | 4 +- br/tests/br_log_test/run.sh | 4 +- br/tests/br_other/run.sh | 2 +- br/tests/br_s3/run.sh | 2 +- br/tests/br_small_batch_size/run.sh | 2 +- br/tests/br_tikv_outage/run.sh | 2 +- br/tests/lightning_checkpoint_chunks/run.sh | 8 ++-- br/tests/lightning_checkpoint_columns/run.sh | 2 +- br/tests/lightning_checkpoint_engines/run.sh | 2 +- .../lightning_checkpoint_engines_order/run.sh | 4 +- br/tests/lightning_checkpoint_parquet/run.sh | 2 +- br/tests/lightning_concurrent-restore/run.sh | 2 +- br/tests/lightning_disk_quota/run.sh | 2 +- br/tests/lightning_error_summary/run.sh | 2 +- br/tests/lightning_fail_fast/run.sh | 2 +- br/tests/lightning_local_backend/run.sh | 12 ++--- br/tests/lightning_restore/run.sh | 2 +- executor/brie.go | 6 +-- 147 files changed, 490 insertions(+), 489 deletions(-) diff --git a/br/cmd/br/backup.go b/br/cmd/br/backup.go index 84bc32be1c9dc..2dd21c06b5fcc 100644 --- a/br/cmd/br/backup.go +++ b/br/cmd/br/backup.go @@ -11,12 +11,12 @@ import ( "go.uber.org/zap" "sourcegraph.com/sourcegraph/appdash" - "github.com/pingcap/br/pkg/gluetikv" - "github.com/pingcap/br/pkg/summary" - "github.com/pingcap/br/pkg/task" - "github.com/pingcap/br/pkg/trace" - "github.com/pingcap/br/pkg/utils" - "github.com/pingcap/br/pkg/version/build" + "github.com/pingcap/tidb/br/pkg/gluetikv" + "github.com/pingcap/tidb/br/pkg/summary" + "github.com/pingcap/tidb/br/pkg/task" + "github.com/pingcap/tidb/br/pkg/trace" + "github.com/pingcap/tidb/br/pkg/utils" + "github.com/pingcap/tidb/br/pkg/version/build" ) func runBackupCommand(command *cobra.Command, cmdName string) error { diff --git a/br/cmd/br/cmd.go b/br/cmd/br/cmd.go index 96014dae7261d..ff86440786fec 100644 --- a/br/cmd/br/cmd.go +++ b/br/cmd/br/cmd.go @@ -17,12 +17,12 @@ import ( "github.com/pingcap/tidb/util/logutil" "github.com/spf13/cobra" - "github.com/pingcap/br/pkg/gluetidb" - "github.com/pingcap/br/pkg/redact" - "github.com/pingcap/br/pkg/summary" - "github.com/pingcap/br/pkg/task" - "github.com/pingcap/br/pkg/utils" - "github.com/pingcap/br/pkg/version/build" + "github.com/pingcap/tidb/br/pkg/gluetidb" + "github.com/pingcap/tidb/br/pkg/redact" + "github.com/pingcap/tidb/br/pkg/summary" + "github.com/pingcap/tidb/br/pkg/task" + "github.com/pingcap/tidb/br/pkg/utils" + "github.com/pingcap/tidb/br/pkg/version/build" ) var ( diff --git a/br/cmd/br/debug.go b/br/cmd/br/debug.go index a397ee3223e41..cec2590c159f3 100644 --- a/br/cmd/br/debug.go +++ b/br/cmd/br/debug.go @@ -11,7 +11,7 @@ import ( "path" "reflect" - "github.com/pingcap/br/pkg/metautil" + "github.com/pingcap/tidb/br/pkg/metautil" "github.com/gogo/protobuf/proto" "github.com/pingcap/errors" @@ -22,14 +22,14 @@ import ( "github.com/spf13/cobra" "go.uber.org/zap" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/logutil" - "github.com/pingcap/br/pkg/mock/mockid" - "github.com/pingcap/br/pkg/restore" - "github.com/pingcap/br/pkg/rtree" - "github.com/pingcap/br/pkg/task" - "github.com/pingcap/br/pkg/utils" - "github.com/pingcap/br/pkg/version/build" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/logutil" + "github.com/pingcap/tidb/br/pkg/mock/mockid" + "github.com/pingcap/tidb/br/pkg/restore" + "github.com/pingcap/tidb/br/pkg/rtree" + "github.com/pingcap/tidb/br/pkg/task" + "github.com/pingcap/tidb/br/pkg/utils" + "github.com/pingcap/tidb/br/pkg/version/build" ) // NewDebugCommand return a debug subcommand. diff --git a/br/cmd/br/restore.go b/br/cmd/br/restore.go index 43a9eb5638da2..0722e4b019ec7 100644 --- a/br/cmd/br/restore.go +++ b/br/cmd/br/restore.go @@ -10,12 +10,12 @@ import ( "go.uber.org/zap" "sourcegraph.com/sourcegraph/appdash" - "github.com/pingcap/br/pkg/gluetikv" - "github.com/pingcap/br/pkg/summary" - "github.com/pingcap/br/pkg/task" - "github.com/pingcap/br/pkg/trace" - "github.com/pingcap/br/pkg/utils" - "github.com/pingcap/br/pkg/version/build" + "github.com/pingcap/tidb/br/pkg/gluetikv" + "github.com/pingcap/tidb/br/pkg/summary" + "github.com/pingcap/tidb/br/pkg/task" + "github.com/pingcap/tidb/br/pkg/trace" + "github.com/pingcap/tidb/br/pkg/utils" + "github.com/pingcap/tidb/br/pkg/version/build" ) func runRestoreCommand(command *cobra.Command, cmdName string) error { diff --git a/br/cmd/tidb-lightning-ctl/main.go b/br/cmd/tidb-lightning-ctl/main.go index 9ab37bb4a33e4..b7f472457e799 100644 --- a/br/cmd/tidb-lightning-ctl/main.go +++ b/br/cmd/tidb-lightning-ctl/main.go @@ -26,14 +26,14 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/kvproto/pkg/import_sstpb" - "github.com/pingcap/br/pkg/lightning/backend" - "github.com/pingcap/br/pkg/lightning/backend/importer" - "github.com/pingcap/br/pkg/lightning/backend/local" - "github.com/pingcap/br/pkg/lightning/checkpoints" - "github.com/pingcap/br/pkg/lightning/common" - "github.com/pingcap/br/pkg/lightning/config" - "github.com/pingcap/br/pkg/lightning/restore" - "github.com/pingcap/br/pkg/lightning/tikv" + "github.com/pingcap/tidb/br/pkg/lightning/backend" + "github.com/pingcap/tidb/br/pkg/lightning/backend/importer" + "github.com/pingcap/tidb/br/pkg/lightning/backend/local" + "github.com/pingcap/tidb/br/pkg/lightning/checkpoints" + "github.com/pingcap/tidb/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/config" + "github.com/pingcap/tidb/br/pkg/lightning/restore" + "github.com/pingcap/tidb/br/pkg/lightning/tikv" ) func main() { diff --git a/br/cmd/tidb-lightning/main.go b/br/cmd/tidb-lightning/main.go index c5f967ba08eaa..c0e62ae8c0d0a 100644 --- a/br/cmd/tidb-lightning/main.go +++ b/br/cmd/tidb-lightning/main.go @@ -23,9 +23,9 @@ import ( "go.uber.org/zap" - "github.com/pingcap/br/pkg/lightning" - "github.com/pingcap/br/pkg/lightning/config" - "github.com/pingcap/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning" + "github.com/pingcap/tidb/br/pkg/lightning/config" + "github.com/pingcap/tidb/br/pkg/lightning/log" ) func main() { diff --git a/br/pkg/backup/check.go b/br/pkg/backup/check.go index 38b2d927d72d9..6815a8298e7dc 100644 --- a/br/pkg/backup/check.go +++ b/br/pkg/backup/check.go @@ -9,7 +9,7 @@ import ( "github.com/pingcap/log" "go.uber.org/zap" - "github.com/pingcap/br/pkg/rtree" + "github.com/pingcap/tidb/br/pkg/rtree" ) // checkDupFiles checks if there are any files are duplicated. diff --git a/br/pkg/backup/client.go b/br/pkg/backup/client.go index a6ebe8a3d6966..ff13f2e76a7c4 100644 --- a/br/pkg/backup/client.go +++ b/br/pkg/backup/client.go @@ -12,7 +12,7 @@ import ( "sync" "time" - "github.com/pingcap/br/pkg/metautil" + "github.com/pingcap/tidb/br/pkg/metautil" "github.com/google/btree" "github.com/opentracing/opentracing-go" @@ -38,14 +38,14 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/pingcap/br/pkg/conn" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/logutil" - "github.com/pingcap/br/pkg/redact" - "github.com/pingcap/br/pkg/rtree" - "github.com/pingcap/br/pkg/storage" - "github.com/pingcap/br/pkg/summary" - "github.com/pingcap/br/pkg/utils" + "github.com/pingcap/tidb/br/pkg/conn" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/logutil" + "github.com/pingcap/tidb/br/pkg/redact" + "github.com/pingcap/tidb/br/pkg/rtree" + "github.com/pingcap/tidb/br/pkg/storage" + "github.com/pingcap/tidb/br/pkg/summary" + "github.com/pingcap/tidb/br/pkg/utils" ) // ClientMgr manages connections needed by backup. diff --git a/br/pkg/backup/client_test.go b/br/pkg/backup/client_test.go index e7902a6f40bd7..0431e558062c2 100644 --- a/br/pkg/backup/client_test.go +++ b/br/pkg/backup/client_test.go @@ -21,10 +21,10 @@ import ( "github.com/tikv/client-go/v2/tikv" pd "github.com/tikv/pd/client" - "github.com/pingcap/br/pkg/backup" - "github.com/pingcap/br/pkg/conn" - "github.com/pingcap/br/pkg/pdutil" - "github.com/pingcap/br/pkg/storage" + "github.com/pingcap/tidb/br/pkg/backup" + "github.com/pingcap/tidb/br/pkg/conn" + "github.com/pingcap/tidb/br/pkg/pdutil" + "github.com/pingcap/tidb/br/pkg/storage" ) type testBackup struct { diff --git a/br/pkg/backup/push.go b/br/pkg/backup/push.go index 8d933d6293032..6af7519afb952 100644 --- a/br/pkg/backup/push.go +++ b/br/pkg/backup/push.go @@ -15,11 +15,11 @@ import ( "github.com/pingcap/log" "go.uber.org/zap" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/logutil" - "github.com/pingcap/br/pkg/redact" - "github.com/pingcap/br/pkg/rtree" - "github.com/pingcap/br/pkg/utils" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/logutil" + "github.com/pingcap/tidb/br/pkg/redact" + "github.com/pingcap/tidb/br/pkg/rtree" + "github.com/pingcap/tidb/br/pkg/utils" ) // pushDown wraps a backup task. diff --git a/br/pkg/backup/schema.go b/br/pkg/backup/schema.go index b2358db0b9ccb..47ba9ff60789e 100644 --- a/br/pkg/backup/schema.go +++ b/br/pkg/backup/schema.go @@ -19,12 +19,12 @@ import ( "go.uber.org/zap" "golang.org/x/sync/errgroup" - "github.com/pingcap/br/pkg/checksum" - "github.com/pingcap/br/pkg/glue" - "github.com/pingcap/br/pkg/logutil" - "github.com/pingcap/br/pkg/metautil" - "github.com/pingcap/br/pkg/summary" - "github.com/pingcap/br/pkg/utils" + "github.com/pingcap/tidb/br/pkg/checksum" + "github.com/pingcap/tidb/br/pkg/glue" + "github.com/pingcap/tidb/br/pkg/logutil" + "github.com/pingcap/tidb/br/pkg/metautil" + "github.com/pingcap/tidb/br/pkg/summary" + "github.com/pingcap/tidb/br/pkg/utils" ) const ( diff --git a/br/pkg/backup/schema_test.go b/br/pkg/backup/schema_test.go index 07d5c403d9e49..b620e6411f849 100644 --- a/br/pkg/backup/schema_test.go +++ b/br/pkg/backup/schema_test.go @@ -16,10 +16,10 @@ import ( "github.com/pingcap/tidb/util/testkit" "github.com/pingcap/tidb/util/testleak" - "github.com/pingcap/br/pkg/backup" - "github.com/pingcap/br/pkg/metautil" - "github.com/pingcap/br/pkg/mock" - "github.com/pingcap/br/pkg/storage" + "github.com/pingcap/tidb/br/pkg/backup" + "github.com/pingcap/tidb/br/pkg/metautil" + "github.com/pingcap/tidb/br/pkg/mock" + "github.com/pingcap/tidb/br/pkg/storage" ) var _ = Suite(&testBackupSchemaSuite{}) diff --git a/br/pkg/cdclog/decoder.go b/br/pkg/cdclog/decoder.go index 947743078730f..2cffa8233fd31 100644 --- a/br/pkg/cdclog/decoder.go +++ b/br/pkg/cdclog/decoder.go @@ -27,7 +27,7 @@ import ( "github.com/pingcap/tidb/types" "go.uber.org/zap" - berrors "github.com/pingcap/br/pkg/errors" + berrors "github.com/pingcap/tidb/br/pkg/errors" ) // ColumnFlagType represents the type of Column. diff --git a/br/pkg/cdclog/puller.go b/br/pkg/cdclog/puller.go index a4af06f3c2435..aea1470e60db8 100644 --- a/br/pkg/cdclog/puller.go +++ b/br/pkg/cdclog/puller.go @@ -19,7 +19,7 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" - "github.com/pingcap/br/pkg/storage" + "github.com/pingcap/tidb/br/pkg/storage" ) // EventPuller pulls next event in ts order. diff --git a/br/pkg/conn/conn.go b/br/pkg/conn/conn.go index 420f44d364eae..7bac08cb17921 100644 --- a/br/pkg/conn/conn.go +++ b/br/pkg/conn/conn.go @@ -26,11 +26,11 @@ import ( backuppb "github.com/pingcap/kvproto/pkg/backup" "github.com/pingcap/kvproto/pkg/metapb" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/glue" - "github.com/pingcap/br/pkg/logutil" - "github.com/pingcap/br/pkg/pdutil" - "github.com/pingcap/br/pkg/version" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/glue" + "github.com/pingcap/tidb/br/pkg/logutil" + "github.com/pingcap/tidb/br/pkg/pdutil" + "github.com/pingcap/tidb/br/pkg/version" ) const ( diff --git a/br/pkg/conn/conn_test.go b/br/pkg/conn/conn_test.go index 1ef35cf8b3788..d9ceb0abca5c7 100644 --- a/br/pkg/conn/conn_test.go +++ b/br/pkg/conn/conn_test.go @@ -6,7 +6,7 @@ import ( "context" "testing" - "github.com/pingcap/br/pkg/pdutil" + "github.com/pingcap/tidb/br/pkg/pdutil" . "github.com/pingcap/check" "github.com/pingcap/kvproto/pkg/metapb" diff --git a/br/pkg/gluetidb/glue.go b/br/pkg/gluetidb/glue.go index 2cb1cdc8e391c..654ce0dfe1391 100644 --- a/br/pkg/gluetidb/glue.go +++ b/br/pkg/gluetidb/glue.go @@ -20,8 +20,8 @@ import ( "github.com/pingcap/tidb/sessionctx" pd "github.com/tikv/pd/client" - "github.com/pingcap/br/pkg/glue" - "github.com/pingcap/br/pkg/gluetikv" + "github.com/pingcap/tidb/br/pkg/glue" + "github.com/pingcap/tidb/br/pkg/gluetikv" ) const ( diff --git a/br/pkg/gluetikv/glue.go b/br/pkg/gluetikv/glue.go index 1e6f5108dcb3a..89306ec7970a8 100644 --- a/br/pkg/gluetikv/glue.go +++ b/br/pkg/gluetikv/glue.go @@ -11,10 +11,10 @@ import ( "github.com/pingcap/tidb/store/driver" pd "github.com/tikv/pd/client" - "github.com/pingcap/br/pkg/glue" - "github.com/pingcap/br/pkg/summary" - "github.com/pingcap/br/pkg/utils" - "github.com/pingcap/br/pkg/version/build" + "github.com/pingcap/tidb/br/pkg/glue" + "github.com/pingcap/tidb/br/pkg/summary" + "github.com/pingcap/tidb/br/pkg/utils" + "github.com/pingcap/tidb/br/pkg/version/build" ) // Glue is an implementation of glue.Glue that accesses only TiKV without TiDB. diff --git a/br/pkg/kv/checksum_test.go b/br/pkg/kv/checksum_test.go index d9b91b15a51c6..b8269b9626aea 100644 --- a/br/pkg/kv/checksum_test.go +++ b/br/pkg/kv/checksum_test.go @@ -19,7 +19,7 @@ import ( . "github.com/pingcap/check" - "github.com/pingcap/br/pkg/kv" + "github.com/pingcap/tidb/br/pkg/kv" ) type testKVChecksumSuite struct{} diff --git a/br/pkg/kv/kv.go b/br/pkg/kv/kv.go index df2081685d201..a87772b042921 100644 --- a/br/pkg/kv/kv.go +++ b/br/pkg/kv/kv.go @@ -32,8 +32,8 @@ import ( "github.com/pingcap/tidb/types" "go.uber.org/zap" - "github.com/pingcap/br/pkg/logutil" - "github.com/pingcap/br/pkg/redact" + "github.com/pingcap/tidb/br/pkg/logutil" + "github.com/pingcap/tidb/br/pkg/redact" ) var extraHandleColumnInfo = model.NewExtraHandleColInfo() diff --git a/br/pkg/lightning/backend/importer/importer.go b/br/pkg/lightning/backend/importer/importer.go index f613b6f76f808..414062b3f0320 100644 --- a/br/pkg/lightning/backend/importer/importer.go +++ b/br/pkg/lightning/backend/importer/importer.go @@ -30,12 +30,12 @@ import ( "go.uber.org/zap" "google.golang.org/grpc" - "github.com/pingcap/br/pkg/lightning/backend" - "github.com/pingcap/br/pkg/lightning/backend/kv" - "github.com/pingcap/br/pkg/lightning/common" - "github.com/pingcap/br/pkg/lightning/log" - "github.com/pingcap/br/pkg/lightning/tikv" - "github.com/pingcap/br/pkg/version" + "github.com/pingcap/tidb/br/pkg/lightning/backend" + "github.com/pingcap/tidb/br/pkg/lightning/backend/kv" + "github.com/pingcap/tidb/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning/tikv" + "github.com/pingcap/tidb/br/pkg/version" ) const ( diff --git a/br/pkg/lightning/backend/importer/importer_test.go b/br/pkg/lightning/backend/importer/importer_test.go index f0fd15a0a8c4a..225842b24509d 100644 --- a/br/pkg/lightning/backend/importer/importer_test.go +++ b/br/pkg/lightning/backend/importer/importer_test.go @@ -27,10 +27,10 @@ import ( "github.com/pingcap/errors" kvpb "github.com/pingcap/kvproto/pkg/import_kvpb" - "github.com/pingcap/br/pkg/lightning/backend" - "github.com/pingcap/br/pkg/lightning/backend/kv" - "github.com/pingcap/br/pkg/lightning/common" - "github.com/pingcap/br/pkg/mock" + "github.com/pingcap/tidb/br/pkg/lightning/backend" + "github.com/pingcap/tidb/br/pkg/lightning/backend/kv" + "github.com/pingcap/tidb/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/mock" ) type importerSuite struct { diff --git a/br/pkg/lightning/backend/kv/sql2kv.go b/br/pkg/lightning/backend/kv/sql2kv.go index bfc275a96e6af..8d63a29ac1601 100644 --- a/br/pkg/lightning/backend/kv/sql2kv.go +++ b/br/pkg/lightning/backend/kv/sql2kv.go @@ -38,12 +38,12 @@ import ( // Import tidb/planner/core to initialize expression.RewriteAstExpr _ "github.com/pingcap/tidb/planner/core" - "github.com/pingcap/br/pkg/lightning/common" - "github.com/pingcap/br/pkg/lightning/log" - "github.com/pingcap/br/pkg/lightning/metric" - "github.com/pingcap/br/pkg/lightning/verification" - "github.com/pingcap/br/pkg/logutil" - "github.com/pingcap/br/pkg/redact" + "github.com/pingcap/tidb/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning/metric" + "github.com/pingcap/tidb/br/pkg/lightning/verification" + "github.com/pingcap/tidb/br/pkg/logutil" + "github.com/pingcap/tidb/br/pkg/redact" ) var ExtraHandleColumnInfo = model.NewExtraHandleColInfo() diff --git a/br/pkg/lightning/backend/local/iterator.go b/br/pkg/lightning/backend/local/iterator.go index 333b113246e2c..1307892e9ca85 100644 --- a/br/pkg/lightning/backend/local/iterator.go +++ b/br/pkg/lightning/backend/local/iterator.go @@ -22,9 +22,9 @@ import ( "github.com/pingcap/tidb/util/codec" "go.uber.org/multierr" - "github.com/pingcap/br/pkg/kv" - "github.com/pingcap/br/pkg/lightning/log" - "github.com/pingcap/br/pkg/logutil" + "github.com/pingcap/tidb/br/pkg/kv" + "github.com/pingcap/tidb/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/logutil" ) type pebbleIter struct { diff --git a/br/pkg/lightning/backend/local/iterator_test.go b/br/pkg/lightning/backend/local/iterator_test.go index 680869998985d..d9f757f5f04cd 100644 --- a/br/pkg/lightning/backend/local/iterator_test.go +++ b/br/pkg/lightning/backend/local/iterator_test.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/pebble" . "github.com/pingcap/check" - "github.com/pingcap/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/common" ) type iteratorSuite struct{} diff --git a/br/pkg/lightning/backend/local/local.go b/br/pkg/lightning/backend/local/local.go index 8244aa36275f6..3cb695db13e9d 100644 --- a/br/pkg/lightning/backend/local/local.go +++ b/br/pkg/lightning/backend/local/local.go @@ -59,23 +59,23 @@ import ( "google.golang.org/grpc/keepalive" "google.golang.org/grpc/status" - "github.com/pingcap/br/pkg/conn" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/lightning/backend" - "github.com/pingcap/br/pkg/lightning/backend/kv" - "github.com/pingcap/br/pkg/lightning/checkpoints" - "github.com/pingcap/br/pkg/lightning/common" - "github.com/pingcap/br/pkg/lightning/config" - "github.com/pingcap/br/pkg/lightning/glue" - "github.com/pingcap/br/pkg/lightning/log" - "github.com/pingcap/br/pkg/lightning/manual" - "github.com/pingcap/br/pkg/lightning/metric" - "github.com/pingcap/br/pkg/lightning/tikv" - "github.com/pingcap/br/pkg/lightning/worker" - "github.com/pingcap/br/pkg/logutil" - split "github.com/pingcap/br/pkg/restore" - "github.com/pingcap/br/pkg/utils" - "github.com/pingcap/br/pkg/version" + "github.com/pingcap/tidb/br/pkg/conn" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/lightning/backend" + "github.com/pingcap/tidb/br/pkg/lightning/backend/kv" + "github.com/pingcap/tidb/br/pkg/lightning/checkpoints" + "github.com/pingcap/tidb/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/config" + "github.com/pingcap/tidb/br/pkg/lightning/glue" + "github.com/pingcap/tidb/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning/manual" + "github.com/pingcap/tidb/br/pkg/lightning/metric" + "github.com/pingcap/tidb/br/pkg/lightning/tikv" + "github.com/pingcap/tidb/br/pkg/lightning/worker" + "github.com/pingcap/tidb/br/pkg/logutil" + split "github.com/pingcap/tidb/br/pkg/restore" + "github.com/pingcap/tidb/br/pkg/utils" + "github.com/pingcap/tidb/br/pkg/version" ) const ( diff --git a/br/pkg/lightning/backend/local/local_test.go b/br/pkg/lightning/backend/local/local_test.go index a64b994f87a2b..7bb8bb309ea3d 100644 --- a/br/pkg/lightning/backend/local/local_test.go +++ b/br/pkg/lightning/backend/local/local_test.go @@ -42,12 +42,12 @@ import ( "github.com/pingcap/tidb/util/codec" "github.com/pingcap/tidb/util/hack" - "github.com/pingcap/br/pkg/lightning/backend" - "github.com/pingcap/br/pkg/lightning/backend/kv" - "github.com/pingcap/br/pkg/lightning/common" - "github.com/pingcap/br/pkg/lightning/mydump" - "github.com/pingcap/br/pkg/mock" - "github.com/pingcap/br/pkg/restore" + "github.com/pingcap/tidb/br/pkg/lightning/backend" + "github.com/pingcap/tidb/br/pkg/lightning/backend/kv" + "github.com/pingcap/tidb/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/mydump" + "github.com/pingcap/tidb/br/pkg/mock" + "github.com/pingcap/tidb/br/pkg/restore" ) type localSuite struct{} diff --git a/br/pkg/lightning/backend/local/local_unix.go b/br/pkg/lightning/backend/local/local_unix.go index c0c4882cf8494..4f9a5cf01acf0 100644 --- a/br/pkg/lightning/backend/local/local_unix.go +++ b/br/pkg/lightning/backend/local/local_unix.go @@ -21,7 +21,7 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" - "github.com/pingcap/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning/log" ) const ( diff --git a/br/pkg/lightning/backend/local/localhelper.go b/br/pkg/lightning/backend/local/localhelper.go index e2df6a222d9c5..1583ef2f373b9 100644 --- a/br/pkg/lightning/backend/local/localhelper.go +++ b/br/pkg/lightning/backend/local/localhelper.go @@ -34,12 +34,12 @@ import ( "go.uber.org/zap" "golang.org/x/sync/errgroup" - "github.com/pingcap/br/pkg/lightning/checkpoints" - "github.com/pingcap/br/pkg/lightning/common" - "github.com/pingcap/br/pkg/lightning/log" - "github.com/pingcap/br/pkg/logutil" - split "github.com/pingcap/br/pkg/restore" - "github.com/pingcap/br/pkg/utils" + "github.com/pingcap/tidb/br/pkg/lightning/checkpoints" + "github.com/pingcap/tidb/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/logutil" + split "github.com/pingcap/tidb/br/pkg/restore" + "github.com/pingcap/tidb/br/pkg/utils" ) const ( diff --git a/br/pkg/lightning/backend/local/localhelper_test.go b/br/pkg/lightning/backend/local/localhelper_test.go index 160849d62f0f0..1f9eb8d4e3000 100644 --- a/br/pkg/lightning/backend/local/localhelper_test.go +++ b/br/pkg/lightning/backend/local/localhelper_test.go @@ -36,8 +36,8 @@ import ( "github.com/tikv/pd/server/schedule/placement" "go.uber.org/atomic" - "github.com/pingcap/br/pkg/lightning/glue" - "github.com/pingcap/br/pkg/restore" + "github.com/pingcap/tidb/br/pkg/lightning/glue" + "github.com/pingcap/tidb/br/pkg/restore" ) type testClient struct { diff --git a/br/pkg/lightning/backend/noop/noop.go b/br/pkg/lightning/backend/noop/noop.go index 1b95b2df0c076..f36e9fdb9cccb 100644 --- a/br/pkg/lightning/backend/noop/noop.go +++ b/br/pkg/lightning/backend/noop/noop.go @@ -22,10 +22,10 @@ import ( "github.com/pingcap/tidb/table" "github.com/pingcap/tidb/types" - "github.com/pingcap/br/pkg/lightning/backend" - "github.com/pingcap/br/pkg/lightning/backend/kv" - "github.com/pingcap/br/pkg/lightning/log" - "github.com/pingcap/br/pkg/lightning/verification" + "github.com/pingcap/tidb/br/pkg/lightning/backend" + "github.com/pingcap/tidb/br/pkg/lightning/backend/kv" + "github.com/pingcap/tidb/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning/verification" ) func NewNoopBackend() backend.Backend { diff --git a/br/pkg/lightning/backend/tidb/tidb.go b/br/pkg/lightning/backend/tidb/tidb.go index 5f86895e31108..3551ef591759a 100644 --- a/br/pkg/lightning/backend/tidb/tidb.go +++ b/br/pkg/lightning/backend/tidb/tidb.go @@ -33,14 +33,14 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/pingcap/br/pkg/lightning/backend" - "github.com/pingcap/br/pkg/lightning/backend/kv" - "github.com/pingcap/br/pkg/lightning/common" - "github.com/pingcap/br/pkg/lightning/config" - "github.com/pingcap/br/pkg/lightning/log" - "github.com/pingcap/br/pkg/lightning/verification" - "github.com/pingcap/br/pkg/redact" - "github.com/pingcap/br/pkg/version" + "github.com/pingcap/tidb/br/pkg/lightning/backend" + "github.com/pingcap/tidb/br/pkg/lightning/backend/kv" + "github.com/pingcap/tidb/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/config" + "github.com/pingcap/tidb/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning/verification" + "github.com/pingcap/tidb/br/pkg/redact" + "github.com/pingcap/tidb/br/pkg/version" ) var extraHandleTableColumn = &table.Column{ diff --git a/br/pkg/lightning/backend/tidb/tidb_test.go b/br/pkg/lightning/backend/tidb/tidb_test.go index a315135bf2872..9fe81b31f7080 100644 --- a/br/pkg/lightning/backend/tidb/tidb_test.go +++ b/br/pkg/lightning/backend/tidb/tidb_test.go @@ -29,12 +29,12 @@ import ( "github.com/pingcap/tidb/table/tables" "github.com/pingcap/tidb/types" - "github.com/pingcap/br/pkg/lightning/backend" - "github.com/pingcap/br/pkg/lightning/backend/kv" - "github.com/pingcap/br/pkg/lightning/backend/tidb" - "github.com/pingcap/br/pkg/lightning/config" - "github.com/pingcap/br/pkg/lightning/log" - "github.com/pingcap/br/pkg/lightning/verification" + "github.com/pingcap/tidb/br/pkg/lightning/backend" + "github.com/pingcap/tidb/br/pkg/lightning/backend/kv" + "github.com/pingcap/tidb/br/pkg/lightning/backend/tidb" + "github.com/pingcap/tidb/br/pkg/lightning/config" + "github.com/pingcap/tidb/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning/verification" ) func Test(t *testing.T) { diff --git a/br/pkg/lightning/checkpoints/checkpoints_sql_test.go b/br/pkg/lightning/checkpoints/checkpoints_sql_test.go index 0f69d0d4e08f0..c17077d0aeb1e 100644 --- a/br/pkg/lightning/checkpoints/checkpoints_sql_test.go +++ b/br/pkg/lightning/checkpoints/checkpoints_sql_test.go @@ -10,10 +10,10 @@ import ( . "github.com/pingcap/check" "github.com/pingcap/errors" - "github.com/pingcap/br/pkg/lightning/checkpoints" - "github.com/pingcap/br/pkg/lightning/mydump" - "github.com/pingcap/br/pkg/lightning/verification" - "github.com/pingcap/br/pkg/version/build" + "github.com/pingcap/tidb/br/pkg/lightning/checkpoints" + "github.com/pingcap/tidb/br/pkg/lightning/mydump" + "github.com/pingcap/tidb/br/pkg/lightning/verification" + "github.com/pingcap/tidb/br/pkg/version/build" ) var _ = Suite(&cpSQLSuite{}) diff --git a/br/pkg/lightning/checkpoints/checkpoints_test.go b/br/pkg/lightning/checkpoints/checkpoints_test.go index 349130a7075e1..6b039fc756694 100644 --- a/br/pkg/lightning/checkpoints/checkpoints_test.go +++ b/br/pkg/lightning/checkpoints/checkpoints_test.go @@ -6,9 +6,9 @@ import ( . "github.com/pingcap/check" - "github.com/pingcap/br/pkg/lightning/checkpoints/checkpointspb" - "github.com/pingcap/br/pkg/lightning/mydump" - "github.com/pingcap/br/pkg/lightning/verification" + "github.com/pingcap/tidb/br/pkg/lightning/checkpoints/checkpointspb" + "github.com/pingcap/tidb/br/pkg/lightning/mydump" + "github.com/pingcap/tidb/br/pkg/lightning/verification" ) func Test(t *testing.T) { diff --git a/br/pkg/lightning/common/once_error_test.go b/br/pkg/lightning/common/once_error_test.go index f8196c3e4efba..6901d2ef0ea05 100644 --- a/br/pkg/lightning/common/once_error_test.go +++ b/br/pkg/lightning/common/once_error_test.go @@ -19,7 +19,7 @@ import ( . "github.com/pingcap/check" - "github.com/pingcap/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/common" ) func TestCommon(t *testing.T) { diff --git a/br/pkg/lightning/common/pause_test.go b/br/pkg/lightning/common/pause_test.go index 298e023cddbdd..7c9047f664697 100644 --- a/br/pkg/lightning/common/pause_test.go +++ b/br/pkg/lightning/common/pause_test.go @@ -20,7 +20,7 @@ import ( . "github.com/pingcap/check" - "github.com/pingcap/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/common" ) // unblocksAfter is a checker which ensures the WaitGroup's Wait() method @@ -142,7 +142,7 @@ func (s *pauseSuite) TestPause(c *C) { c.Assert(&wg, unblocksBetween, 500*time.Millisecond, 800*time.Millisecond) } -// Run `go test github.com/pingcap/br/pkg/lightning/common -check.b -test.v` to get benchmark result. +// Run `go test github.com/pingcap/tidb/br/pkg/lightning/common -check.b -test.v` to get benchmark result. func (s *pauseSuite) BenchmarkWaitNoOp(c *C) { p := common.NewPauser() ctx := context.Background() diff --git a/br/pkg/lightning/config/bytesize_test.go b/br/pkg/lightning/config/bytesize_test.go index 33b709016c555..31f13f038a2f1 100644 --- a/br/pkg/lightning/config/bytesize_test.go +++ b/br/pkg/lightning/config/bytesize_test.go @@ -20,7 +20,7 @@ import ( "github.com/BurntSushi/toml" . "github.com/pingcap/check" - "github.com/pingcap/br/pkg/lightning/config" + "github.com/pingcap/tidb/br/pkg/lightning/config" ) type byteSizeTestSuite struct{} diff --git a/br/pkg/lightning/config/config.go b/br/pkg/lightning/config/config.go index 08ab629f5815f..92c92e9b2852a 100644 --- a/br/pkg/lightning/config/config.go +++ b/br/pkg/lightning/config/config.go @@ -36,8 +36,8 @@ import ( tidbcfg "github.com/pingcap/tidb/config" "go.uber.org/zap" - "github.com/pingcap/br/pkg/lightning/common" - "github.com/pingcap/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/log" ) const ( diff --git a/br/pkg/lightning/config/config_test.go b/br/pkg/lightning/config/config_test.go index b35fd002f43d9..c8a476e218d0b 100644 --- a/br/pkg/lightning/config/config_test.go +++ b/br/pkg/lightning/config/config_test.go @@ -32,7 +32,7 @@ import ( . "github.com/pingcap/check" "github.com/pingcap/parser/mysql" - "github.com/pingcap/br/pkg/lightning/config" + "github.com/pingcap/tidb/br/pkg/lightning/config" ) func Test(t *testing.T) { diff --git a/br/pkg/lightning/config/configlist_test.go b/br/pkg/lightning/config/configlist_test.go index bc268c61a9316..295ae50ef8d6c 100644 --- a/br/pkg/lightning/config/configlist_test.go +++ b/br/pkg/lightning/config/configlist_test.go @@ -19,7 +19,7 @@ import ( . "github.com/pingcap/check" - "github.com/pingcap/br/pkg/lightning/config" + "github.com/pingcap/tidb/br/pkg/lightning/config" ) var _ = Suite(&configListTestSuite{}) diff --git a/br/pkg/lightning/config/global.go b/br/pkg/lightning/config/global.go index 5b4aa700a5d32..69e34f8b59f9d 100644 --- a/br/pkg/lightning/config/global.go +++ b/br/pkg/lightning/config/global.go @@ -24,8 +24,8 @@ import ( "github.com/carlmjohnson/flagext" "github.com/pingcap/errors" - "github.com/pingcap/br/pkg/lightning/log" - "github.com/pingcap/br/pkg/version/build" + "github.com/pingcap/tidb/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/version/build" ) type GlobalLightning struct { diff --git a/br/pkg/lightning/glue/glue.go b/br/pkg/lightning/glue/glue.go index 1bb1b1c9130a8..e2ae17d372e05 100644 --- a/br/pkg/lightning/glue/glue.go +++ b/br/pkg/lightning/glue/glue.go @@ -25,10 +25,10 @@ import ( "github.com/pingcap/tidb/types" "github.com/pingcap/tidb/util/sqlexec" - "github.com/pingcap/br/pkg/lightning/checkpoints" - "github.com/pingcap/br/pkg/lightning/common" - "github.com/pingcap/br/pkg/lightning/config" - "github.com/pingcap/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning/checkpoints" + "github.com/pingcap/tidb/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/config" + "github.com/pingcap/tidb/br/pkg/lightning/log" ) type Glue interface { diff --git a/br/pkg/lightning/log/filter_test.go b/br/pkg/lightning/log/filter_test.go index d20b5ee69d39e..740b16172652d 100644 --- a/br/pkg/lightning/log/filter_test.go +++ b/br/pkg/lightning/log/filter_test.go @@ -10,7 +10,7 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/pingcap/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning/log" ) var _ = Suite(&testFilterSuite{}) @@ -26,7 +26,7 @@ func (s *testFilterSuite) TestFilter(c *C) { ) logger, buffer = log.MakeTestLogger(zap.WrapCore(func(c zapcore.Core) zapcore.Core { - return log.NewFilterCore(c, "github.com/pingcap/br/") + return log.NewFilterCore(c, "github.com/pingcap/tidb/br/") }), zap.AddCaller()) logger.Warn("the message", zap.Int("number", 123456), zap.Ints("array", []int{7, 8, 9})) c.Assert(buffer.Stripped(), HasLen, 0) @@ -41,7 +41,7 @@ func (s *testFilterSuite) TestFilter(c *C) { ) logger, buffer = log.MakeTestLogger(zap.WrapCore(func(c zapcore.Core) zapcore.Core { - return log.NewFilterCore(c, "github.com/pingcap/br/").With([]zap.Field{zap.String("a", "b")}) + return log.NewFilterCore(c, "github.com/pingcap/tidb/br/").With([]zap.Field{zap.String("a", "b")}) }), zap.AddCaller()) logger.Warn("the message", zap.Int("number", 123456), zap.Ints("array", []int{7, 8, 9})) c.Assert(buffer.Stripped(), HasLen, 0) @@ -60,14 +60,14 @@ func (s *testFilterSuite) TestFilter(c *C) { // PASS: filter_test.go:82: testFilterSuite.BenchmarkFilterRegexMatchString 1000000 1163 ns/op // PASS: filter_test.go:64: testFilterSuite.BenchmarkFilterStringsContains 10000000 159 ns/op // -// Run `go test github.com/pingcap/br/pkg/lightning/log -check.b -test.v` to get benchmark result. +// Run `go test github.com/pingcap/tidb/br/pkg/lightning/log -check.b -test.v` to get benchmark result. func (s *testFilterSuite) BenchmarkFilterStringsContains(c *C) { c.ResetTimer() inputs := []string{ "github.com/pingcap/tidb/some/package/path", "github.com/tikv/pd/some/package/path", - "github.com/pingcap/br/some/package/path", + "github.com/pingcap/tidb/br/some/package/path", } filters := []string{"github.com/pingcap/tidb/", "github.com/tikv/pd/"} for i := 0; i < c.N; i++ { @@ -85,7 +85,7 @@ func (s *testFilterSuite) BenchmarkFilterRegexMatchString(c *C) { inputs := []string{ "github.com/pingcap/tidb/some/package/path", "github.com/tikv/pd/some/package/path", - "github.com/pingcap/br/some/package/path", + "github.com/pingcap/tidb/br/some/package/path", } filters := regexp.MustCompile(`github.com/(pingcap/tidb|tikv/pd)/`) for i := 0; i < c.N; i++ { diff --git a/br/pkg/lightning/log/log_test.go b/br/pkg/lightning/log/log_test.go index 179ce883e9d2a..a790a6ec48e99 100644 --- a/br/pkg/lightning/log/log_test.go +++ b/br/pkg/lightning/log/log_test.go @@ -19,7 +19,7 @@ import ( . "github.com/pingcap/check" "go.uber.org/zap" - "github.com/pingcap/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning/log" ) func TestLog(t *testing.T) { diff --git a/br/pkg/lightning/mydump/csv_parser.go b/br/pkg/lightning/mydump/csv_parser.go index 64905669ecbfa..9151cc790df28 100644 --- a/br/pkg/lightning/mydump/csv_parser.go +++ b/br/pkg/lightning/mydump/csv_parser.go @@ -21,9 +21,9 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/tidb/types" - "github.com/pingcap/br/pkg/lightning/config" - "github.com/pingcap/br/pkg/lightning/worker" - "github.com/pingcap/br/pkg/utils" + "github.com/pingcap/tidb/br/pkg/utils" + "github.com/pingcap/tidb/br/pkg/lightning/config" + "github.com/pingcap/tidb/br/pkg/lightning/worker" ) var ( diff --git a/br/pkg/lightning/mydump/csv_parser_test.go b/br/pkg/lightning/mydump/csv_parser_test.go index c911674d7185c..e11a6fcac2145 100644 --- a/br/pkg/lightning/mydump/csv_parser_test.go +++ b/br/pkg/lightning/mydump/csv_parser_test.go @@ -13,10 +13,10 @@ import ( "github.com/pingcap/tidb/types" "go.uber.org/zap" - "github.com/pingcap/br/pkg/lightning/config" - "github.com/pingcap/br/pkg/lightning/log" - "github.com/pingcap/br/pkg/lightning/mydump" - "github.com/pingcap/br/pkg/lightning/worker" + "github.com/pingcap/tidb/br/pkg/lightning/config" + "github.com/pingcap/tidb/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning/mydump" + "github.com/pingcap/tidb/br/pkg/lightning/worker" ) var _ = Suite(&testMydumpCSVParserSuite{}) diff --git a/br/pkg/lightning/mydump/loader.go b/br/pkg/lightning/mydump/loader.go index fc14bc0af8e8a..f6e9cf3de77e6 100644 --- a/br/pkg/lightning/mydump/loader.go +++ b/br/pkg/lightning/mydump/loader.go @@ -23,9 +23,9 @@ import ( router "github.com/pingcap/tidb-tools/pkg/table-router" "go.uber.org/zap" - "github.com/pingcap/br/pkg/lightning/config" - "github.com/pingcap/br/pkg/lightning/log" - "github.com/pingcap/br/pkg/storage" + "github.com/pingcap/tidb/br/pkg/lightning/config" + "github.com/pingcap/tidb/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/storage" ) type MDDatabaseMeta struct { diff --git a/br/pkg/lightning/mydump/loader_test.go b/br/pkg/lightning/mydump/loader_test.go index bea6333a04b16..5585a44848896 100644 --- a/br/pkg/lightning/mydump/loader_test.go +++ b/br/pkg/lightning/mydump/loader_test.go @@ -23,9 +23,9 @@ import ( filter "github.com/pingcap/tidb-tools/pkg/table-filter" router "github.com/pingcap/tidb-tools/pkg/table-router" - "github.com/pingcap/br/pkg/lightning/config" - md "github.com/pingcap/br/pkg/lightning/mydump" - "github.com/pingcap/br/pkg/storage" + "github.com/pingcap/tidb/br/pkg/lightning/config" + md "github.com/pingcap/tidb/br/pkg/lightning/mydump" + "github.com/pingcap/tidb/br/pkg/storage" ) var _ = Suite(&testMydumpLoaderSuite{}) diff --git a/br/pkg/lightning/mydump/parquet_parser.go b/br/pkg/lightning/mydump/parquet_parser.go index 303ea42ca81bd..5787755dd1f9d 100644 --- a/br/pkg/lightning/mydump/parquet_parser.go +++ b/br/pkg/lightning/mydump/parquet_parser.go @@ -17,8 +17,8 @@ import ( "github.com/xitongsys/parquet-go/source" "go.uber.org/zap" - "github.com/pingcap/br/pkg/lightning/log" - "github.com/pingcap/br/pkg/storage" + "github.com/pingcap/tidb/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/storage" ) const ( diff --git a/br/pkg/lightning/mydump/parquet_parser_test.go b/br/pkg/lightning/mydump/parquet_parser_test.go index b6f280b9c83c4..4d4b08eb84d1b 100644 --- a/br/pkg/lightning/mydump/parquet_parser_test.go +++ b/br/pkg/lightning/mydump/parquet_parser_test.go @@ -12,7 +12,7 @@ import ( "github.com/xitongsys/parquet-go-source/local" writer2 "github.com/xitongsys/parquet-go/writer" - "github.com/pingcap/br/pkg/storage" + "github.com/pingcap/tidb/br/pkg/storage" ) type testParquetParserSuite struct{} diff --git a/br/pkg/lightning/mydump/parser.go b/br/pkg/lightning/mydump/parser.go index 18079199e7361..2d4bab14698d2 100644 --- a/br/pkg/lightning/mydump/parser.go +++ b/br/pkg/lightning/mydump/parser.go @@ -29,10 +29,10 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/pingcap/br/pkg/lightning/config" - "github.com/pingcap/br/pkg/lightning/log" - "github.com/pingcap/br/pkg/lightning/metric" - "github.com/pingcap/br/pkg/lightning/worker" + "github.com/pingcap/tidb/br/pkg/lightning/config" + "github.com/pingcap/tidb/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning/metric" + "github.com/pingcap/tidb/br/pkg/lightning/worker" ) type blockParser struct { diff --git a/br/pkg/lightning/mydump/parser_test.go b/br/pkg/lightning/mydump/parser_test.go index 53ee5e1192872..4ae89f7ae7678 100644 --- a/br/pkg/lightning/mydump/parser_test.go +++ b/br/pkg/lightning/mydump/parser_test.go @@ -22,9 +22,9 @@ import ( "github.com/pingcap/parser/mysql" "github.com/pingcap/tidb/types" - "github.com/pingcap/br/pkg/lightning/config" - "github.com/pingcap/br/pkg/lightning/mydump" - "github.com/pingcap/br/pkg/lightning/worker" + "github.com/pingcap/tidb/br/pkg/lightning/config" + "github.com/pingcap/tidb/br/pkg/lightning/mydump" + "github.com/pingcap/tidb/br/pkg/lightning/worker" ) var _ = Suite(&testMydumpParserSuite{}) diff --git a/br/pkg/lightning/mydump/reader.go b/br/pkg/lightning/mydump/reader.go index 30464eb7b8552..b621c578f802c 100644 --- a/br/pkg/lightning/mydump/reader.go +++ b/br/pkg/lightning/mydump/reader.go @@ -25,9 +25,9 @@ import ( "go.uber.org/zap" "golang.org/x/text/encoding/simplifiedchinese" - "github.com/pingcap/br/pkg/lightning/log" - "github.com/pingcap/br/pkg/lightning/worker" - "github.com/pingcap/br/pkg/storage" + "github.com/pingcap/tidb/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning/worker" + "github.com/pingcap/tidb/br/pkg/storage" ) var ( diff --git a/br/pkg/lightning/mydump/reader_test.go b/br/pkg/lightning/mydump/reader_test.go index 05d4f9acf3a66..fadd7fd7da835 100644 --- a/br/pkg/lightning/mydump/reader_test.go +++ b/br/pkg/lightning/mydump/reader_test.go @@ -19,13 +19,13 @@ import ( "os" "path/filepath" - mockstorage "github.com/pingcap/br/pkg/mock/storage" + mockstorage "github.com/pingcap/tidb/br/pkg/mock/storage" "github.com/golang/mock/gomock" . "github.com/pingcap/check" - . "github.com/pingcap/br/pkg/lightning/mydump" - "github.com/pingcap/br/pkg/storage" + . "github.com/pingcap/tidb/br/pkg/lightning/mydump" + "github.com/pingcap/tidb/br/pkg/storage" ) var _ = Suite(&testMydumpReaderSuite{}) diff --git a/br/pkg/lightning/mydump/region.go b/br/pkg/lightning/mydump/region.go index 1905ad41ffac8..d2b6c138c7c3b 100644 --- a/br/pkg/lightning/mydump/region.go +++ b/br/pkg/lightning/mydump/region.go @@ -20,15 +20,15 @@ import ( "sync" "time" - "github.com/pingcap/br/pkg/utils" + "github.com/pingcap/tidb/br/pkg/utils" "github.com/pingcap/errors" "go.uber.org/zap" - "github.com/pingcap/br/pkg/lightning/config" - "github.com/pingcap/br/pkg/lightning/log" - "github.com/pingcap/br/pkg/lightning/worker" - "github.com/pingcap/br/pkg/storage" + "github.com/pingcap/tidb/br/pkg/lightning/config" + "github.com/pingcap/tidb/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning/worker" + "github.com/pingcap/tidb/br/pkg/storage" ) const tableRegionSizeWarningThreshold int64 = 1024 * 1024 * 1024 diff --git a/br/pkg/lightning/mydump/region_test.go b/br/pkg/lightning/mydump/region_test.go index 44b222c625f91..4754fad8a010a 100644 --- a/br/pkg/lightning/mydump/region_test.go +++ b/br/pkg/lightning/mydump/region_test.go @@ -18,13 +18,13 @@ import ( "os" "path/filepath" - "github.com/pingcap/br/pkg/storage" + "github.com/pingcap/tidb/br/pkg/storage" . "github.com/pingcap/check" - "github.com/pingcap/br/pkg/lightning/config" - . "github.com/pingcap/br/pkg/lightning/mydump" - "github.com/pingcap/br/pkg/lightning/worker" + "github.com/pingcap/tidb/br/pkg/lightning/config" + . "github.com/pingcap/tidb/br/pkg/lightning/mydump" + "github.com/pingcap/tidb/br/pkg/lightning/worker" ) var _ = Suite(&testMydumpRegionSuite{}) diff --git a/br/pkg/lightning/mydump/router.go b/br/pkg/lightning/mydump/router.go index 27ad378343274..0533bddde426f 100644 --- a/br/pkg/lightning/mydump/router.go +++ b/br/pkg/lightning/mydump/router.go @@ -10,7 +10,7 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/tidb-tools/pkg/filter" - "github.com/pingcap/br/pkg/lightning/config" + "github.com/pingcap/tidb/br/pkg/lightning/config" ) type SourceType int diff --git a/br/pkg/lightning/mydump/router_test.go b/br/pkg/lightning/mydump/router_test.go index 8c5e2f178fdb8..00043fc70c78b 100644 --- a/br/pkg/lightning/mydump/router_test.go +++ b/br/pkg/lightning/mydump/router_test.go @@ -6,7 +6,7 @@ import ( . "github.com/pingcap/check" "github.com/pingcap/tidb-tools/pkg/filter" - "github.com/pingcap/br/pkg/lightning/config" + "github.com/pingcap/tidb/br/pkg/lightning/config" ) var _ = Suite(&testFileRouterSuite{}) diff --git a/br/pkg/lightning/restore/check_info.go b/br/pkg/lightning/restore/check_info.go index c32f1406f4f1b..968e64ba20108 100644 --- a/br/pkg/lightning/restore/check_info.go +++ b/br/pkg/lightning/restore/check_info.go @@ -30,11 +30,11 @@ import ( "github.com/tikv/pd/server/config" "go.uber.org/zap" - "github.com/pingcap/br/pkg/lightning/backend" - "github.com/pingcap/br/pkg/lightning/checkpoints" - "github.com/pingcap/br/pkg/lightning/common" - md "github.com/pingcap/br/pkg/lightning/mydump" - "github.com/pingcap/br/pkg/storage" + "github.com/pingcap/tidb/br/pkg/lightning/backend" + "github.com/pingcap/tidb/br/pkg/lightning/checkpoints" + "github.com/pingcap/tidb/br/pkg/lightning/common" + md "github.com/pingcap/tidb/br/pkg/lightning/mydump" + "github.com/pingcap/tidb/br/pkg/storage" ) const ( diff --git a/br/pkg/lightning/restore/restore.go b/br/pkg/lightning/restore/restore.go index f965c77f68f12..673779f89699e 100644 --- a/br/pkg/lightning/restore/restore.go +++ b/br/pkg/lightning/restore/restore.go @@ -39,28 +39,28 @@ import ( "go.uber.org/zap" "modernc.org/mathutil" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/lightning/backend" - "github.com/pingcap/br/pkg/lightning/backend/importer" - "github.com/pingcap/br/pkg/lightning/backend/kv" - "github.com/pingcap/br/pkg/lightning/backend/local" - "github.com/pingcap/br/pkg/lightning/backend/tidb" - "github.com/pingcap/br/pkg/lightning/checkpoints" - "github.com/pingcap/br/pkg/lightning/common" - "github.com/pingcap/br/pkg/lightning/config" - "github.com/pingcap/br/pkg/lightning/glue" - "github.com/pingcap/br/pkg/lightning/log" - "github.com/pingcap/br/pkg/lightning/metric" - "github.com/pingcap/br/pkg/lightning/mydump" - "github.com/pingcap/br/pkg/lightning/tikv" - verify "github.com/pingcap/br/pkg/lightning/verification" - "github.com/pingcap/br/pkg/lightning/web" - "github.com/pingcap/br/pkg/lightning/worker" - "github.com/pingcap/br/pkg/pdutil" - "github.com/pingcap/br/pkg/storage" - "github.com/pingcap/br/pkg/utils" - "github.com/pingcap/br/pkg/version" - "github.com/pingcap/br/pkg/version/build" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/lightning/backend" + "github.com/pingcap/tidb/br/pkg/lightning/backend/importer" + "github.com/pingcap/tidb/br/pkg/lightning/backend/kv" + "github.com/pingcap/tidb/br/pkg/lightning/backend/local" + "github.com/pingcap/tidb/br/pkg/lightning/backend/tidb" + "github.com/pingcap/tidb/br/pkg/lightning/checkpoints" + "github.com/pingcap/tidb/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/config" + "github.com/pingcap/tidb/br/pkg/lightning/glue" + "github.com/pingcap/tidb/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning/metric" + "github.com/pingcap/tidb/br/pkg/lightning/mydump" + "github.com/pingcap/tidb/br/pkg/lightning/tikv" + verify "github.com/pingcap/tidb/br/pkg/lightning/verification" + "github.com/pingcap/tidb/br/pkg/lightning/web" + "github.com/pingcap/tidb/br/pkg/lightning/worker" + "github.com/pingcap/tidb/br/pkg/pdutil" + "github.com/pingcap/tidb/br/pkg/storage" + "github.com/pingcap/tidb/br/pkg/utils" + "github.com/pingcap/tidb/br/pkg/version" + "github.com/pingcap/tidb/br/pkg/version/build" ) const ( diff --git a/br/pkg/lightning/restore/restore_test.go b/br/pkg/lightning/restore/restore_test.go index 7f0d62f1ac4b7..b5583c12de052 100644 --- a/br/pkg/lightning/restore/restore_test.go +++ b/br/pkg/lightning/restore/restore_test.go @@ -42,24 +42,24 @@ import ( "github.com/pingcap/tidb/ddl" tmock "github.com/pingcap/tidb/util/mock" - "github.com/pingcap/br/pkg/lightning/backend" - "github.com/pingcap/br/pkg/lightning/backend/importer" - "github.com/pingcap/br/pkg/lightning/backend/kv" - "github.com/pingcap/br/pkg/lightning/backend/noop" - "github.com/pingcap/br/pkg/lightning/backend/tidb" - "github.com/pingcap/br/pkg/lightning/checkpoints" - "github.com/pingcap/br/pkg/lightning/common" - "github.com/pingcap/br/pkg/lightning/config" - "github.com/pingcap/br/pkg/lightning/glue" - "github.com/pingcap/br/pkg/lightning/log" - "github.com/pingcap/br/pkg/lightning/metric" - "github.com/pingcap/br/pkg/lightning/mydump" - "github.com/pingcap/br/pkg/lightning/verification" - "github.com/pingcap/br/pkg/lightning/web" - "github.com/pingcap/br/pkg/lightning/worker" - "github.com/pingcap/br/pkg/mock" - "github.com/pingcap/br/pkg/storage" - "github.com/pingcap/br/pkg/version/build" + "github.com/pingcap/tidb/br/pkg/lightning/backend" + "github.com/pingcap/tidb/br/pkg/lightning/backend/importer" + "github.com/pingcap/tidb/br/pkg/lightning/backend/kv" + "github.com/pingcap/tidb/br/pkg/lightning/backend/noop" + "github.com/pingcap/tidb/br/pkg/lightning/backend/tidb" + "github.com/pingcap/tidb/br/pkg/lightning/checkpoints" + "github.com/pingcap/tidb/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/config" + "github.com/pingcap/tidb/br/pkg/lightning/glue" + "github.com/pingcap/tidb/br/pkg/lightning/log" + "github.com/pingcap/tidb/br/pkg/lightning/metric" + "github.com/pingcap/tidb/br/pkg/lightning/mydump" + "github.com/pingcap/tidb/br/pkg/lightning/verification" + "github.com/pingcap/tidb/br/pkg/lightning/web" + "github.com/pingcap/tidb/br/pkg/lightning/worker" + "github.com/pingcap/tidb/br/pkg/mock" + "github.com/pingcap/tidb/br/pkg/storage" + "github.com/pingcap/tidb/br/pkg/version/build" ) var _ = Suite(&restoreSuite{}) @@ -405,9 +405,9 @@ func (s *tableRestoreSuiteBase) SetUpTest(c *C) { } func (s *tableRestoreSuite) TestPopulateChunks(c *C) { - _ = failpoint.Enable("github.com/pingcap/br/pkg/lightning/restore/PopulateChunkTimestamp", "return(1234567897)") + _ = failpoint.Enable("github.com/pingcap/tidb/br/pkg/lightning/restore/PopulateChunkTimestamp", "return(1234567897)") defer func() { - _ = failpoint.Disable("github.com/pingcap/br/pkg/lightning/restore/PopulateChunkTimestamp") + _ = failpoint.Disable("github.com/pingcap/tidb/br/pkg/lightning/restore/PopulateChunkTimestamp") }() cp := &checkpoints.TableCheckpoint{ @@ -566,9 +566,9 @@ func (s *tableRestoreSuite) TestPopulateChunksCSVHeader(c *C) { DataFiles: fakeDataFiles, } - _ = failpoint.Enable("github.com/pingcap/br/pkg/lightning/restore/PopulateChunkTimestamp", "return(1234567897)") + _ = failpoint.Enable("github.com/pingcap/tidb/br/pkg/lightning/restore/PopulateChunkTimestamp", "return(1234567897)") defer func() { - _ = failpoint.Disable("github.com/pingcap/br/pkg/lightning/restore/PopulateChunkTimestamp") + _ = failpoint.Disable("github.com/pingcap/tidb/br/pkg/lightning/restore/PopulateChunkTimestamp") }() cp := &checkpoints.TableCheckpoint{ @@ -1254,7 +1254,7 @@ func (s *chunkRestoreSuite) TestEncodeLoopDeliverLimit(c *C) { rc := &Controller{pauser: DeliverPauser, cfg: cfg} c.Assert(failpoint.Enable( - "github.com/pingcap/br/pkg/lightning/restore/mock-kv-size", "return(110000000)"), IsNil) + "github.com/pingcap/tidb/br/pkg/lightning/restore/mock-kv-size", "return(110000000)"), IsNil) _, _, err = s.cr.encodeLoop(ctx, kvsCh, s.tr, s.tr.logger, kvEncoder, deliverCompleteCh, rc) // we have 3 kvs total. after the failpoint injected. diff --git a/br/pkg/lightning/restore/tidb_test.go b/br/pkg/lightning/restore/tidb_test.go index 6f891e2adc37d..54e2fc3904743 100644 --- a/br/pkg/lightning/restore/tidb_test.go +++ b/br/pkg/lightning/restore/tidb_test.go @@ -27,10 +27,10 @@ import ( "github.com/pingcap/tidb/ddl" "github.com/pingcap/tidb/util/mock" - "github.com/pingcap/br/pkg/lightning/checkpoints" - "github.com/pingcap/br/pkg/lightning/glue" - "github.com/pingcap/br/pkg/lightning/metric" - "github.com/pingcap/br/pkg/lightning/mydump" + "github.com/pingcap/tidb/br/pkg/lightning/checkpoints" + "github.com/pingcap/tidb/br/pkg/lightning/glue" + "github.com/pingcap/tidb/br/pkg/lightning/metric" + "github.com/pingcap/tidb/br/pkg/lightning/mydump" ) var _ = Suite(&tidbSuite{}) diff --git a/br/pkg/lightning/verification/checksum.go b/br/pkg/lightning/verification/checksum.go index db008af2fe896..7c79beab8079f 100644 --- a/br/pkg/lightning/verification/checksum.go +++ b/br/pkg/lightning/verification/checksum.go @@ -19,7 +19,7 @@ import ( "go.uber.org/zap/zapcore" - "github.com/pingcap/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/common" ) var ecmaTable = crc64.MakeTable(crc64.ECMA) diff --git a/br/pkg/lightning/verification/checksum_test.go b/br/pkg/lightning/verification/checksum_test.go index c7b17039a9ad9..10750645b8a1d 100644 --- a/br/pkg/lightning/verification/checksum_test.go +++ b/br/pkg/lightning/verification/checksum_test.go @@ -19,8 +19,8 @@ import ( . "github.com/pingcap/check" - "github.com/pingcap/br/pkg/lightning/common" - "github.com/pingcap/br/pkg/lightning/verification" + "github.com/pingcap/tidb/br/pkg/lightning/common" + "github.com/pingcap/tidb/br/pkg/lightning/verification" ) type testKVChcksumSuite struct{} diff --git a/br/pkg/lightning/worker/worker.go b/br/pkg/lightning/worker/worker.go index 185261dd7d705..977c73f18fd9f 100644 --- a/br/pkg/lightning/worker/worker.go +++ b/br/pkg/lightning/worker/worker.go @@ -17,7 +17,7 @@ import ( "context" "time" - "github.com/pingcap/br/pkg/lightning/metric" + "github.com/pingcap/tidb/br/pkg/lightning/metric" ) type Pool struct { diff --git a/br/pkg/lightning/worker/worker_test.go b/br/pkg/lightning/worker/worker_test.go index 01d64d6b46d45..f0f4412d9537a 100644 --- a/br/pkg/lightning/worker/worker_test.go +++ b/br/pkg/lightning/worker/worker_test.go @@ -19,7 +19,7 @@ import ( . "github.com/pingcap/check" - "github.com/pingcap/br/pkg/lightning/worker" + "github.com/pingcap/tidb/br/pkg/lightning/worker" ) type testWorkerPool struct{} diff --git a/br/pkg/logutil/logging.go b/br/pkg/logutil/logging.go index f1d51f5c08a51..8534b1364f657 100644 --- a/br/pkg/logutil/logging.go +++ b/br/pkg/logutil/logging.go @@ -16,7 +16,7 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/pingcap/br/pkg/redact" + "github.com/pingcap/tidb/br/pkg/redact" ) // AbbreviatedArrayMarshaler abbreviates an array of elements. diff --git a/br/pkg/logutil/logging_test.go b/br/pkg/logutil/logging_test.go index 3ab41ef56f68a..7a3cf5bc095aa 100644 --- a/br/pkg/logutil/logging_test.go +++ b/br/pkg/logutil/logging_test.go @@ -15,8 +15,8 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/logutil" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/logutil" ) func Test(t *testing.T) { diff --git a/br/pkg/metautil/metafile.go b/br/pkg/metautil/metafile.go index addd52bdbc661..a76075721f977 100644 --- a/br/pkg/metautil/metafile.go +++ b/br/pkg/metautil/metafile.go @@ -22,10 +22,10 @@ import ( "github.com/pingcap/tidb/tablecodec" "go.uber.org/zap" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/logutil" - "github.com/pingcap/br/pkg/storage" - "github.com/pingcap/br/pkg/summary" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/logutil" + "github.com/pingcap/tidb/br/pkg/storage" + "github.com/pingcap/tidb/br/pkg/summary" ) const ( diff --git a/br/pkg/metautil/metafile_test.go b/br/pkg/metautil/metafile_test.go index c58663336ba5c..b36b53242e17e 100644 --- a/br/pkg/metautil/metafile_test.go +++ b/br/pkg/metautil/metafile_test.go @@ -11,7 +11,7 @@ import ( . "github.com/pingcap/check" backuppb "github.com/pingcap/kvproto/pkg/backup" - mockstorage "github.com/pingcap/br/pkg/mock/storage" + mockstorage "github.com/pingcap/tidb/br/pkg/mock/storage" ) type metaSuit struct{} diff --git a/br/pkg/mock/backend.go b/br/pkg/mock/backend.go index 18b1fd181fb85..b250a9c131a3a 100644 --- a/br/pkg/mock/backend.go +++ b/br/pkg/mock/backend.go @@ -1,7 +1,7 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/pingcap/br/pkg/lightning/backend (interfaces: AbstractBackend,EngineWriter) +// Source: github.com/pingcap/tidb/br/pkg/lightning/backend (interfaces: AbstractBackend,EngineWriter) -// $ mockgen -package mock -mock_names 'AbstractBackend=MockBackend' github.com/pingcap/br/pkg/lightning/backend AbstractBackend,EngineWriter +// $ mockgen -package mock -mock_names 'AbstractBackend=MockBackend' github.com/pingcap/tidb/br/pkg/lightning/backend AbstractBackend,EngineWriter // Package mock is a generated GoMock package. package mock @@ -13,8 +13,8 @@ import ( gomock "github.com/golang/mock/gomock" uuid "github.com/google/uuid" - backend "github.com/pingcap/br/pkg/lightning/backend" - kv "github.com/pingcap/br/pkg/lightning/backend/kv" + backend "github.com/pingcap/tidb/br/pkg/lightning/backend" + kv "github.com/pingcap/tidb/br/pkg/lightning/backend/kv" model "github.com/pingcap/parser/model" table "github.com/pingcap/tidb/table" ) diff --git a/br/pkg/mock/glue.go b/br/pkg/mock/glue.go index 0505353d3efcd..b2aa4a8e9a535 100644 --- a/br/pkg/mock/glue.go +++ b/br/pkg/mock/glue.go @@ -8,10 +8,10 @@ import ( context "context" sql "database/sql" gomock "github.com/golang/mock/gomock" - checkpoints "github.com/pingcap/br/pkg/lightning/checkpoints" - config "github.com/pingcap/br/pkg/lightning/config" - glue "github.com/pingcap/br/pkg/lightning/glue" - log "github.com/pingcap/br/pkg/lightning/log" + checkpoints "github.com/pingcap/tidb/br/pkg/lightning/checkpoints" + config "github.com/pingcap/tidb/br/pkg/lightning/config" + glue "github.com/pingcap/tidb/br/pkg/lightning/glue" + log "github.com/pingcap/tidb/br/pkg/lightning/log" parser "github.com/pingcap/parser" model "github.com/pingcap/parser/model" reflect "reflect" diff --git a/br/pkg/mock/kv.go b/br/pkg/mock/kv.go index 1771c22c468f1..ca6dc27196918 100644 --- a/br/pkg/mock/kv.go +++ b/br/pkg/mock/kv.go @@ -10,9 +10,9 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - kv "github.com/pingcap/br/pkg/lightning/backend/kv" - log "github.com/pingcap/br/pkg/lightning/log" - verification "github.com/pingcap/br/pkg/lightning/verification" + kv "github.com/pingcap/tidb/br/pkg/lightning/backend/kv" + log "github.com/pingcap/tidb/br/pkg/lightning/log" + verification "github.com/pingcap/tidb/br/pkg/lightning/verification" types "github.com/pingcap/tidb/types" ) diff --git a/br/pkg/mock/mock_cluster_test.go b/br/pkg/mock/mock_cluster_test.go index 2ca00923cb891..bd939fdfcf749 100644 --- a/br/pkg/mock/mock_cluster_test.go +++ b/br/pkg/mock/mock_cluster_test.go @@ -8,7 +8,7 @@ import ( . "github.com/pingcap/check" "github.com/pingcap/tidb/util/testleak" - "github.com/pingcap/br/pkg/mock" + "github.com/pingcap/tidb/br/pkg/mock" ) func Test(t *testing.T) { diff --git a/br/pkg/mock/storage/storage.go b/br/pkg/mock/storage/storage.go index 8c7c64879b407..35ceedd904497 100644 --- a/br/pkg/mock/storage/storage.go +++ b/br/pkg/mock/storage/storage.go @@ -9,7 +9,7 @@ package mockstorage import ( context "context" gomock "github.com/golang/mock/gomock" - storage "github.com/pingcap/br/pkg/storage" + storage "github.com/pingcap/tidb/br/pkg/storage" reflect "reflect" ) diff --git a/br/pkg/pdutil/pd.go b/br/pkg/pdutil/pd.go index 81a223605cd89..46025082e54e0 100644 --- a/br/pkg/pdutil/pd.go +++ b/br/pkg/pdutil/pd.go @@ -26,9 +26,9 @@ import ( "go.uber.org/zap" "google.golang.org/grpc" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/httputil" - "github.com/pingcap/br/pkg/lightning/common" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/httputil" + "github.com/pingcap/tidb/br/pkg/lightning/common" ) const ( diff --git a/br/pkg/pdutil/utils.go b/br/pkg/pdutil/utils.go index 3e0d669e30dd8..1e6d826c44a9d 100644 --- a/br/pkg/pdutil/utils.go +++ b/br/pkg/pdutil/utils.go @@ -17,8 +17,8 @@ import ( "github.com/tikv/pd/pkg/codec" "github.com/tikv/pd/server/schedule/placement" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/httputil" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/httputil" ) // UndoFunc is a 'undo' operation of some undoable command. diff --git a/br/pkg/redact/redact_test.go b/br/pkg/redact/redact_test.go index d9891a510bbf8..9619dc008e263 100644 --- a/br/pkg/redact/redact_test.go +++ b/br/pkg/redact/redact_test.go @@ -7,7 +7,7 @@ import ( . "github.com/pingcap/check" - "github.com/pingcap/br/pkg/redact" + "github.com/pingcap/tidb/br/pkg/redact" ) type testRedactSuite struct{} diff --git a/br/pkg/restore/backoff.go b/br/pkg/restore/backoff.go index 638a5b435c390..89f84bd61e02c 100644 --- a/br/pkg/restore/backoff.go +++ b/br/pkg/restore/backoff.go @@ -11,8 +11,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/utils" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/utils" ) const ( diff --git a/br/pkg/restore/backoff_test.go b/br/pkg/restore/backoff_test.go index 6dee3a03b4f6f..7e88a40b58ad3 100644 --- a/br/pkg/restore/backoff_test.go +++ b/br/pkg/restore/backoff_test.go @@ -12,10 +12,10 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/mock" - "github.com/pingcap/br/pkg/restore" - "github.com/pingcap/br/pkg/utils" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/mock" + "github.com/pingcap/tidb/br/pkg/restore" + "github.com/pingcap/tidb/br/pkg/utils" ) var _ = Suite(&testBackofferSuite{}) diff --git a/br/pkg/restore/batcher.go b/br/pkg/restore/batcher.go index 7866b989fc45f..e8e223fce1958 100644 --- a/br/pkg/restore/batcher.go +++ b/br/pkg/restore/batcher.go @@ -13,7 +13,7 @@ import ( "github.com/pingcap/log" "go.uber.org/zap" - "github.com/pingcap/br/pkg/rtree" + "github.com/pingcap/tidb/br/pkg/rtree" ) // SendType is the 'type' of a send. diff --git a/br/pkg/restore/batcher_test.go b/br/pkg/restore/batcher_test.go index 4c55f5638d877..3ddbaf7b05821 100644 --- a/br/pkg/restore/batcher_test.go +++ b/br/pkg/restore/batcher_test.go @@ -8,19 +8,19 @@ import ( "sync" "time" - "github.com/pingcap/br/pkg/metautil" + "github.com/pingcap/tidb/br/pkg/metautil" "github.com/pingcap/kvproto/pkg/import_sstpb" "github.com/pingcap/log" "go.uber.org/zap" - "github.com/pingcap/br/pkg/restore" + "github.com/pingcap/tidb/br/pkg/restore" . "github.com/pingcap/check" "github.com/pingcap/errors" "github.com/pingcap/parser/model" - "github.com/pingcap/br/pkg/rtree" + "github.com/pingcap/tidb/br/pkg/rtree" ) type testBatcherSuite struct{} diff --git a/br/pkg/restore/client.go b/br/pkg/restore/client.go index 81ed9ca72ccc6..79e86befb58e8 100644 --- a/br/pkg/restore/client.go +++ b/br/pkg/restore/client.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "github.com/pingcap/br/pkg/metautil" + "github.com/pingcap/tidb/br/pkg/metautil" "github.com/opentracing/opentracing-go" "github.com/pingcap/errors" @@ -38,16 +38,16 @@ import ( "google.golang.org/grpc/credentials" "google.golang.org/grpc/keepalive" - "github.com/pingcap/br/pkg/checksum" - "github.com/pingcap/br/pkg/conn" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/glue" - "github.com/pingcap/br/pkg/logutil" - "github.com/pingcap/br/pkg/pdutil" - "github.com/pingcap/br/pkg/redact" - "github.com/pingcap/br/pkg/storage" - "github.com/pingcap/br/pkg/summary" - "github.com/pingcap/br/pkg/utils" + "github.com/pingcap/tidb/br/pkg/checksum" + "github.com/pingcap/tidb/br/pkg/conn" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/glue" + "github.com/pingcap/tidb/br/pkg/logutil" + "github.com/pingcap/tidb/br/pkg/pdutil" + "github.com/pingcap/tidb/br/pkg/redact" + "github.com/pingcap/tidb/br/pkg/storage" + "github.com/pingcap/tidb/br/pkg/summary" + "github.com/pingcap/tidb/br/pkg/utils" ) // defaultChecksumConcurrency is the default number of the concurrent diff --git a/br/pkg/restore/client_test.go b/br/pkg/restore/client_test.go index 67b09377848f9..3e19f3b47b968 100644 --- a/br/pkg/restore/client_test.go +++ b/br/pkg/restore/client_test.go @@ -8,7 +8,7 @@ import ( "strconv" "time" - "github.com/pingcap/br/pkg/metautil" + "github.com/pingcap/tidb/br/pkg/metautil" . "github.com/pingcap/check" "github.com/pingcap/kvproto/pkg/metapb" @@ -20,9 +20,9 @@ import ( pd "github.com/tikv/pd/client" "google.golang.org/grpc/keepalive" - "github.com/pingcap/br/pkg/gluetidb" - "github.com/pingcap/br/pkg/mock" - "github.com/pingcap/br/pkg/restore" + "github.com/pingcap/tidb/br/pkg/gluetidb" + "github.com/pingcap/tidb/br/pkg/mock" + "github.com/pingcap/tidb/br/pkg/restore" ) var _ = Suite(&testRestoreClientSuite{}) diff --git a/br/pkg/restore/db.go b/br/pkg/restore/db.go index fc8d637e66932..c7199b9deccf9 100644 --- a/br/pkg/restore/db.go +++ b/br/pkg/restore/db.go @@ -7,7 +7,7 @@ import ( "fmt" "sort" - "github.com/pingcap/br/pkg/metautil" + "github.com/pingcap/tidb/br/pkg/metautil" "github.com/pingcap/errors" "github.com/pingcap/log" @@ -15,8 +15,8 @@ import ( "github.com/pingcap/tidb/kv" "go.uber.org/zap" - "github.com/pingcap/br/pkg/glue" - "github.com/pingcap/br/pkg/utils" + "github.com/pingcap/tidb/br/pkg/glue" + "github.com/pingcap/tidb/br/pkg/utils" ) // DB is a TiDB instance, not thread-safe. diff --git a/br/pkg/restore/db_test.go b/br/pkg/restore/db_test.go index caec04157001c..23b1756edad1d 100644 --- a/br/pkg/restore/db_test.go +++ b/br/pkg/restore/db_test.go @@ -12,8 +12,8 @@ import ( "github.com/golang/protobuf/proto" backuppb "github.com/pingcap/kvproto/pkg/backup" - "github.com/pingcap/br/pkg/metautil" - "github.com/pingcap/br/pkg/storage" + "github.com/pingcap/tidb/br/pkg/metautil" + "github.com/pingcap/tidb/br/pkg/storage" . "github.com/pingcap/check" "github.com/pingcap/parser/model" @@ -22,10 +22,10 @@ import ( "github.com/pingcap/tidb/util/testleak" "github.com/tikv/client-go/v2/oracle" - "github.com/pingcap/br/pkg/backup" - "github.com/pingcap/br/pkg/gluetidb" - "github.com/pingcap/br/pkg/mock" - "github.com/pingcap/br/pkg/restore" + "github.com/pingcap/tidb/br/pkg/backup" + "github.com/pingcap/tidb/br/pkg/gluetidb" + "github.com/pingcap/tidb/br/pkg/mock" + "github.com/pingcap/tidb/br/pkg/restore" ) func TestT(t *testing.T) { diff --git a/br/pkg/restore/import.go b/br/pkg/restore/import.go index 8e992f6bd7003..14ea136a48ef3 100644 --- a/br/pkg/restore/import.go +++ b/br/pkg/restore/import.go @@ -27,11 +27,11 @@ import ( "google.golang.org/grpc/keepalive" "google.golang.org/grpc/status" - "github.com/pingcap/br/pkg/conn" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/logutil" - "github.com/pingcap/br/pkg/summary" - "github.com/pingcap/br/pkg/utils" + "github.com/pingcap/tidb/br/pkg/conn" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/logutil" + "github.com/pingcap/tidb/br/pkg/summary" + "github.com/pingcap/tidb/br/pkg/utils" ) const ( diff --git a/br/pkg/restore/ingester.go b/br/pkg/restore/ingester.go index 2d36617917a55..4f271c9ca30d1 100644 --- a/br/pkg/restore/ingester.go +++ b/br/pkg/restore/ingester.go @@ -36,11 +36,11 @@ import ( "google.golang.org/grpc/credentials" "google.golang.org/grpc/keepalive" - "github.com/pingcap/br/pkg/conn" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/kv" - "github.com/pingcap/br/pkg/logutil" - "github.com/pingcap/br/pkg/utils" + "github.com/pingcap/tidb/br/pkg/conn" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/kv" + "github.com/pingcap/tidb/br/pkg/logutil" + "github.com/pingcap/tidb/br/pkg/utils" ) const ( diff --git a/br/pkg/restore/log_client.go b/br/pkg/restore/log_client.go index cfd6585305d8d..c5b403fdd27f3 100644 --- a/br/pkg/restore/log_client.go +++ b/br/pkg/restore/log_client.go @@ -25,11 +25,11 @@ import ( "go.uber.org/zap" "golang.org/x/sync/errgroup" - "github.com/pingcap/br/pkg/cdclog" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/kv" - "github.com/pingcap/br/pkg/storage" - "github.com/pingcap/br/pkg/utils" + "github.com/pingcap/tidb/br/pkg/cdclog" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/kv" + "github.com/pingcap/tidb/br/pkg/storage" + "github.com/pingcap/tidb/br/pkg/utils" ) const ( diff --git a/br/pkg/restore/log_client_test.go b/br/pkg/restore/log_client_test.go index 1ae1d53e8284a..3c58ef82f7b27 100644 --- a/br/pkg/restore/log_client_test.go +++ b/br/pkg/restore/log_client_test.go @@ -10,9 +10,9 @@ import ( filter "github.com/pingcap/tidb-tools/pkg/table-filter" "github.com/pingcap/tidb/util/testleak" - "github.com/pingcap/br/pkg/gluetidb" - "github.com/pingcap/br/pkg/mock" - "github.com/pingcap/br/pkg/restore" + "github.com/pingcap/tidb/br/pkg/gluetidb" + "github.com/pingcap/tidb/br/pkg/mock" + "github.com/pingcap/tidb/br/pkg/restore" ) type testLogRestoreSuite struct { diff --git a/br/pkg/restore/merge.go b/br/pkg/restore/merge.go index 1b418694dea30..852a62a9027ea 100644 --- a/br/pkg/restore/merge.go +++ b/br/pkg/restore/merge.go @@ -11,8 +11,8 @@ import ( "github.com/pingcap/tidb/kv" "github.com/pingcap/tidb/tablecodec" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/rtree" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/rtree" ) const ( diff --git a/br/pkg/restore/merge_test.go b/br/pkg/restore/merge_test.go index 4f3413ec378b1..8e298d8eac041 100644 --- a/br/pkg/restore/merge_test.go +++ b/br/pkg/restore/merge_test.go @@ -18,8 +18,8 @@ import ( "github.com/pingcap/tidb/types" "github.com/pingcap/tidb/util/codec" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/restore" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/restore" ) var _ = Suite(&testMergeRangesSuite{}) diff --git a/br/pkg/restore/pipeline_items.go b/br/pkg/restore/pipeline_items.go index d603a7edc09d5..77bce2ba543be 100644 --- a/br/pkg/restore/pipeline_items.go +++ b/br/pkg/restore/pipeline_items.go @@ -6,15 +6,15 @@ import ( "context" "sync" - "github.com/pingcap/br/pkg/metautil" + "github.com/pingcap/tidb/br/pkg/metautil" "github.com/pingcap/errors" "github.com/pingcap/log" "github.com/pingcap/parser/model" "go.uber.org/zap" - "github.com/pingcap/br/pkg/glue" - "github.com/pingcap/br/pkg/rtree" + "github.com/pingcap/tidb/br/pkg/glue" + "github.com/pingcap/tidb/br/pkg/rtree" ) const ( diff --git a/br/pkg/restore/range.go b/br/pkg/restore/range.go index 5089486a33711..fca6c86bce7b9 100644 --- a/br/pkg/restore/range.go +++ b/br/pkg/restore/range.go @@ -14,9 +14,9 @@ import ( "github.com/pingcap/tidb/tablecodec" "go.uber.org/zap" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/logutil" - "github.com/pingcap/br/pkg/rtree" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/logutil" + "github.com/pingcap/tidb/br/pkg/rtree" ) // Range record start and end key for localStoreDir.DB diff --git a/br/pkg/restore/range_test.go b/br/pkg/restore/range_test.go index 063d207930657..03d3d7220d15e 100644 --- a/br/pkg/restore/range_test.go +++ b/br/pkg/restore/range_test.go @@ -9,8 +9,8 @@ import ( "github.com/pingcap/kvproto/pkg/import_sstpb" "github.com/pingcap/tidb/tablecodec" - "github.com/pingcap/br/pkg/restore" - "github.com/pingcap/br/pkg/rtree" + "github.com/pingcap/tidb/br/pkg/restore" + "github.com/pingcap/tidb/br/pkg/rtree" ) type testRangeSuite struct{} diff --git a/br/pkg/restore/split.go b/br/pkg/restore/split.go index 803701f6d20ba..8213acd0a1b55 100644 --- a/br/pkg/restore/split.go +++ b/br/pkg/restore/split.go @@ -18,9 +18,9 @@ import ( "github.com/tikv/pd/pkg/codec" "go.uber.org/zap" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/logutil" - "github.com/pingcap/br/pkg/rtree" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/logutil" + "github.com/pingcap/tidb/br/pkg/rtree" ) // Constants for split retry machinery. diff --git a/br/pkg/restore/split_client.go b/br/pkg/restore/split_client.go index 71cb2886e583f..4cf13f3c4ee88 100755 --- a/br/pkg/restore/split_client.go +++ b/br/pkg/restore/split_client.go @@ -30,9 +30,9 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/httputil" - "github.com/pingcap/br/pkg/logutil" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/httputil" + "github.com/pingcap/tidb/br/pkg/logutil" ) const ( diff --git a/br/pkg/restore/split_test.go b/br/pkg/restore/split_test.go index 9164f7b17bdb6..40f76df3c82f2 100644 --- a/br/pkg/restore/split_test.go +++ b/br/pkg/restore/split_test.go @@ -16,8 +16,8 @@ import ( "github.com/tikv/pd/server/core" "github.com/tikv/pd/server/schedule/placement" - "github.com/pingcap/br/pkg/restore" - "github.com/pingcap/br/pkg/rtree" + "github.com/pingcap/tidb/br/pkg/restore" + "github.com/pingcap/tidb/br/pkg/rtree" ) type TestClient struct { diff --git a/br/pkg/restore/systable_restore.go b/br/pkg/restore/systable_restore.go index 8f700ca51f9a8..06100298a9395 100644 --- a/br/pkg/restore/systable_restore.go +++ b/br/pkg/restore/systable_restore.go @@ -14,9 +14,9 @@ import ( "go.uber.org/multierr" "go.uber.org/zap" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/logutil" - "github.com/pingcap/br/pkg/utils" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/logutil" + "github.com/pingcap/tidb/br/pkg/utils" ) var statsTables = map[string]struct{}{ diff --git a/br/pkg/restore/util.go b/br/pkg/restore/util.go index c39313388c553..956a413d2bf8b 100644 --- a/br/pkg/restore/util.go +++ b/br/pkg/restore/util.go @@ -22,12 +22,12 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/glue" - "github.com/pingcap/br/pkg/logutil" - "github.com/pingcap/br/pkg/rtree" - "github.com/pingcap/br/pkg/summary" - "github.com/pingcap/br/pkg/utils" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/glue" + "github.com/pingcap/tidb/br/pkg/logutil" + "github.com/pingcap/tidb/br/pkg/rtree" + "github.com/pingcap/tidb/br/pkg/summary" + "github.com/pingcap/tidb/br/pkg/utils" ) var ( diff --git a/br/pkg/restore/util_test.go b/br/pkg/restore/util_test.go index 81f1196edb3e0..88a69d738e230 100644 --- a/br/pkg/restore/util_test.go +++ b/br/pkg/restore/util_test.go @@ -13,7 +13,7 @@ import ( "github.com/pingcap/tidb/tablecodec" "github.com/pingcap/tidb/util/codec" - "github.com/pingcap/br/pkg/restore" + "github.com/pingcap/tidb/br/pkg/restore" ) var _ = Suite(&testRestoreUtilSuite{}) diff --git a/br/pkg/rtree/logging.go b/br/pkg/rtree/logging.go index 7c9e85d279d50..363e9af761abd 100644 --- a/br/pkg/rtree/logging.go +++ b/br/pkg/rtree/logging.go @@ -8,8 +8,8 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/pingcap/br/pkg/logutil" - "github.com/pingcap/br/pkg/redact" + "github.com/pingcap/tidb/br/pkg/logutil" + "github.com/pingcap/tidb/br/pkg/redact" ) // String formats a range to a string. diff --git a/br/pkg/rtree/logging_test.go b/br/pkg/rtree/logging_test.go index 51b5d03490de7..c5460e0f16a64 100644 --- a/br/pkg/rtree/logging_test.go +++ b/br/pkg/rtree/logging_test.go @@ -11,7 +11,7 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/pingcap/br/pkg/rtree" + "github.com/pingcap/tidb/br/pkg/rtree" ) var _ = Suite(&testLoggingSuite{}) diff --git a/br/pkg/rtree/rtree.go b/br/pkg/rtree/rtree.go index c33d04245100a..dc12c37ec4772 100644 --- a/br/pkg/rtree/rtree.go +++ b/br/pkg/rtree/rtree.go @@ -9,7 +9,7 @@ import ( backuppb "github.com/pingcap/kvproto/pkg/backup" "github.com/pingcap/log" - "github.com/pingcap/br/pkg/logutil" + "github.com/pingcap/tidb/br/pkg/logutil" ) // Range represents a backup response. diff --git a/br/pkg/rtree/rtree_test.go b/br/pkg/rtree/rtree_test.go index 9c515519bd786..ac7387c45348e 100644 --- a/br/pkg/rtree/rtree_test.go +++ b/br/pkg/rtree/rtree_test.go @@ -8,7 +8,7 @@ import ( . "github.com/pingcap/check" - "github.com/pingcap/br/pkg/rtree" + "github.com/pingcap/tidb/br/pkg/rtree" ) func Test(t *testing.T) { diff --git a/br/pkg/storage/compress.go b/br/pkg/storage/compress.go index 88d5550e8d93d..3b2136454e643 100644 --- a/br/pkg/storage/compress.go +++ b/br/pkg/storage/compress.go @@ -7,7 +7,7 @@ import ( "context" "io" - berrors "github.com/pingcap/br/pkg/errors" + berrors "github.com/pingcap/tidb/br/pkg/errors" "github.com/pingcap/errors" ) diff --git a/br/pkg/storage/gcs.go b/br/pkg/storage/gcs.go index c06d88af3f16d..ecb201593b6e9 100644 --- a/br/pkg/storage/gcs.go +++ b/br/pkg/storage/gcs.go @@ -19,7 +19,7 @@ import ( "google.golang.org/api/iterator" "google.golang.org/api/option" - berrors "github.com/pingcap/br/pkg/errors" + berrors "github.com/pingcap/tidb/br/pkg/errors" ) const ( diff --git a/br/pkg/storage/parse.go b/br/pkg/storage/parse.go index 6447d72723105..79840ca13257e 100644 --- a/br/pkg/storage/parse.go +++ b/br/pkg/storage/parse.go @@ -12,7 +12,7 @@ import ( "github.com/pingcap/errors" backuppb "github.com/pingcap/kvproto/pkg/backup" - berrors "github.com/pingcap/br/pkg/errors" + berrors "github.com/pingcap/tidb/br/pkg/errors" ) // BackendOptions further configures the storage backend not expressed by the diff --git a/br/pkg/storage/s3.go b/br/pkg/storage/s3.go index 88d30f6ca5773..794aa6d9b615f 100644 --- a/br/pkg/storage/s3.go +++ b/br/pkg/storage/s3.go @@ -28,7 +28,7 @@ import ( "github.com/spf13/pflag" "go.uber.org/zap" - berrors "github.com/pingcap/br/pkg/errors" + berrors "github.com/pingcap/tidb/br/pkg/errors" ) const ( diff --git a/br/pkg/storage/s3_test.go b/br/pkg/storage/s3_test.go index a8abb4ff47380..9a033c1fa261e 100644 --- a/br/pkg/storage/s3_test.go +++ b/br/pkg/storage/s3_test.go @@ -19,8 +19,8 @@ import ( "github.com/pingcap/errors" backuppb "github.com/pingcap/kvproto/pkg/backup" - "github.com/pingcap/br/pkg/mock" - . "github.com/pingcap/br/pkg/storage" + "github.com/pingcap/tidb/br/pkg/mock" + . "github.com/pingcap/tidb/br/pkg/storage" ) type s3Suite struct { diff --git a/br/pkg/storage/storage.go b/br/pkg/storage/storage.go index ee4c4224c702a..fcab6cefd9043 100644 --- a/br/pkg/storage/storage.go +++ b/br/pkg/storage/storage.go @@ -10,7 +10,7 @@ import ( "github.com/pingcap/errors" backuppb "github.com/pingcap/kvproto/pkg/backup" - berrors "github.com/pingcap/br/pkg/errors" + berrors "github.com/pingcap/tidb/br/pkg/errors" ) // Permission represents the permission we need to check in create storage. diff --git a/br/pkg/task/backup.go b/br/pkg/task/backup.go index 4f01dc88c67ab..8eaac804055a7 100644 --- a/br/pkg/task/backup.go +++ b/br/pkg/task/backup.go @@ -24,15 +24,15 @@ import ( "github.com/tikv/client-go/v2/oracle" "go.uber.org/zap" - "github.com/pingcap/br/pkg/backup" - "github.com/pingcap/br/pkg/checksum" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/glue" - "github.com/pingcap/br/pkg/logutil" - "github.com/pingcap/br/pkg/metautil" - "github.com/pingcap/br/pkg/storage" - "github.com/pingcap/br/pkg/summary" - "github.com/pingcap/br/pkg/utils" + "github.com/pingcap/tidb/br/pkg/backup" + "github.com/pingcap/tidb/br/pkg/checksum" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/glue" + "github.com/pingcap/tidb/br/pkg/logutil" + "github.com/pingcap/tidb/br/pkg/metautil" + "github.com/pingcap/tidb/br/pkg/storage" + "github.com/pingcap/tidb/br/pkg/summary" + "github.com/pingcap/tidb/br/pkg/utils" ) const ( diff --git a/br/pkg/task/backup_raw.go b/br/pkg/task/backup_raw.go index 6570142defd7a..c9a0e3bbd93f4 100644 --- a/br/pkg/task/backup_raw.go +++ b/br/pkg/task/backup_raw.go @@ -6,7 +6,7 @@ import ( "bytes" "context" - "github.com/pingcap/br/pkg/metautil" + "github.com/pingcap/tidb/br/pkg/metautil" "github.com/opentracing/opentracing-go" "github.com/pingcap/errors" @@ -16,13 +16,13 @@ import ( "github.com/spf13/pflag" "go.uber.org/zap" - "github.com/pingcap/br/pkg/backup" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/glue" - "github.com/pingcap/br/pkg/rtree" - "github.com/pingcap/br/pkg/storage" - "github.com/pingcap/br/pkg/summary" - "github.com/pingcap/br/pkg/utils" + "github.com/pingcap/tidb/br/pkg/backup" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/glue" + "github.com/pingcap/tidb/br/pkg/rtree" + "github.com/pingcap/tidb/br/pkg/storage" + "github.com/pingcap/tidb/br/pkg/summary" + "github.com/pingcap/tidb/br/pkg/utils" ) const ( diff --git a/br/pkg/task/common.go b/br/pkg/task/common.go index 6d58ea8984687..be5fbb6b6d63a 100644 --- a/br/pkg/task/common.go +++ b/br/pkg/task/common.go @@ -26,11 +26,11 @@ import ( "go.uber.org/zap" "google.golang.org/grpc/keepalive" - "github.com/pingcap/br/pkg/conn" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/glue" - "github.com/pingcap/br/pkg/storage" - "github.com/pingcap/br/pkg/utils" + "github.com/pingcap/tidb/br/pkg/conn" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/glue" + "github.com/pingcap/tidb/br/pkg/storage" + "github.com/pingcap/tidb/br/pkg/utils" ) const ( diff --git a/br/pkg/task/restore.go b/br/pkg/task/restore.go index 58332dc393598..baca0737b4404 100644 --- a/br/pkg/task/restore.go +++ b/br/pkg/task/restore.go @@ -6,9 +6,9 @@ import ( "context" "time" - "github.com/pingcap/br/pkg/metautil" + "github.com/pingcap/tidb/br/pkg/metautil" - "github.com/pingcap/br/pkg/version" + "github.com/pingcap/tidb/br/pkg/version" "github.com/opentracing/opentracing-go" "github.com/pingcap/errors" @@ -20,14 +20,14 @@ import ( "go.uber.org/multierr" "go.uber.org/zap" - "github.com/pingcap/br/pkg/conn" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/glue" - "github.com/pingcap/br/pkg/pdutil" - "github.com/pingcap/br/pkg/restore" - "github.com/pingcap/br/pkg/storage" - "github.com/pingcap/br/pkg/summary" - "github.com/pingcap/br/pkg/utils" + "github.com/pingcap/tidb/br/pkg/conn" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/glue" + "github.com/pingcap/tidb/br/pkg/pdutil" + "github.com/pingcap/tidb/br/pkg/restore" + "github.com/pingcap/tidb/br/pkg/storage" + "github.com/pingcap/tidb/br/pkg/summary" + "github.com/pingcap/tidb/br/pkg/utils" ) const ( diff --git a/br/pkg/task/restore_log.go b/br/pkg/task/restore_log.go index b6f2da54ab2cc..c8aed9238eccf 100644 --- a/br/pkg/task/restore_log.go +++ b/br/pkg/task/restore_log.go @@ -9,9 +9,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/pingcap/br/pkg/glue" - "github.com/pingcap/br/pkg/restore" - "github.com/pingcap/br/pkg/storage" + "github.com/pingcap/tidb/br/pkg/glue" + "github.com/pingcap/tidb/br/pkg/restore" + "github.com/pingcap/tidb/br/pkg/storage" ) const ( diff --git a/br/pkg/task/restore_raw.go b/br/pkg/task/restore_raw.go index 6757193e9328f..9c53a6b0153a0 100644 --- a/br/pkg/task/restore_raw.go +++ b/br/pkg/task/restore_raw.go @@ -5,17 +5,18 @@ package task import ( "context" - "github.com/pingcap/br/pkg/metautil" + "github.com/pingcap/tidb/br/pkg/metautil" "github.com/pingcap/errors" "github.com/pingcap/log" "github.com/spf13/cobra" "github.com/spf13/pflag" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/glue" - "github.com/pingcap/br/pkg/restore" - "github.com/pingcap/br/pkg/summary" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/glue" + "github.com/pingcap/tidb/br/pkg/restore" + "github.com/pingcap/tidb/br/pkg/summary" + "github.com/pingcap/tidb/br/pkg/utils" ) // RestoreRawConfig is the configuration specific for raw kv restore tasks. diff --git a/br/pkg/task/restore_test.go b/br/pkg/task/restore_test.go index 48f49720b60e5..435053d12a5a1 100644 --- a/br/pkg/task/restore_test.go +++ b/br/pkg/task/restore_test.go @@ -5,7 +5,7 @@ package task import ( . "github.com/pingcap/check" - "github.com/pingcap/br/pkg/restore" + "github.com/pingcap/tidb/br/pkg/restore" ) type testRestoreSuite struct{} diff --git a/br/pkg/utils/bytes.go b/br/pkg/utils/bytes.go index 3ea244d197595..c22f9eff21461 100644 --- a/br/pkg/utils/bytes.go +++ b/br/pkg/utils/bytes.go @@ -13,7 +13,7 @@ package utils -import "github.com/pingcap/br/pkg/manual" +import "github.com/pingcap/tidb/br/pkg/manual" const ( bigValueSize = 1 << 16 // 64K diff --git a/br/pkg/utils/pprof.go b/br/pkg/utils/pprof.go index 70f1f35008d78..07bdde826da59 100644 --- a/br/pkg/utils/pprof.go +++ b/br/pkg/utils/pprof.go @@ -11,7 +11,7 @@ import ( tidbutils "github.com/pingcap/tidb-tools/pkg/utils" - berrors "github.com/pingcap/br/pkg/errors" + berrors "github.com/pingcap/tidb/br/pkg/errors" "github.com/pingcap/errors" diff --git a/br/pkg/utils/safe_point.go b/br/pkg/utils/safe_point.go index bda9df4dd3b41..680ca9836cca2 100644 --- a/br/pkg/utils/safe_point.go +++ b/br/pkg/utils/safe_point.go @@ -15,7 +15,7 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - berrors "github.com/pingcap/br/pkg/errors" + berrors "github.com/pingcap/tidb/br/pkg/errors" ) const ( diff --git a/br/pkg/utils/schema.go b/br/pkg/utils/schema.go index 7c590d63a35d3..71de62fe6ffcb 100644 --- a/br/pkg/utils/schema.go +++ b/br/pkg/utils/schema.go @@ -12,7 +12,7 @@ import ( "github.com/pingcap/parser/model" "github.com/pingcap/parser/mysql" - "github.com/pingcap/br/pkg/metautil" + "github.com/pingcap/tidb/br/pkg/metautil" ) // temporaryDBNamePrefix is the prefix name of system db, e.g. mysql system db will be rename to __TiDB_BR_Temporary_mysql diff --git a/br/pkg/version/version.go b/br/pkg/version/version.go index 24fcab15fa1f9..e5feec0710f8f 100644 --- a/br/pkg/version/version.go +++ b/br/pkg/version/version.go @@ -16,8 +16,8 @@ import ( pd "github.com/tikv/pd/client" "go.uber.org/zap" - berrors "github.com/pingcap/br/pkg/errors" - "github.com/pingcap/br/pkg/version/build" + berrors "github.com/pingcap/tidb/br/pkg/errors" + "github.com/pingcap/tidb/br/pkg/version/build" ) var ( diff --git a/br/pkg/version/version_test.go b/br/pkg/version/version_test.go index 25f5a916de21f..db02e600123c7 100644 --- a/br/pkg/version/version_test.go +++ b/br/pkg/version/version_test.go @@ -12,7 +12,7 @@ import ( "github.com/pingcap/kvproto/pkg/metapb" pd "github.com/tikv/pd/client" - "github.com/pingcap/br/pkg/version/build" + "github.com/pingcap/tidb/br/pkg/version/build" ) type checkSuite struct{} diff --git a/br/tests/br_300_small_tables/run.sh b/br/tests/br_300_small_tables/run.sh index da42baa154766..bdda6c3514a9c 100644 --- a/br/tests/br_300_small_tables/run.sh +++ b/br/tests/br_300_small_tables/run.sh @@ -40,7 +40,7 @@ done echo "backup meta v2 start..." unset BR_LOG_TO_TERM rm -f $BACKUPMETAV2_LOG -export GO_FAILPOINTS="github.com/pingcap/br/pkg/task/progress-call-back=return(\"$PROGRESS_FILE\")" +export GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/task/progress-call-back=return(\"$PROGRESS_FILE\")" run_br backup db --db "$DB" --log-file $BACKUPMETAV2_LOG -s "local://$TEST_DIR/${DB}v2" --pd $PD_ADDR --use-backupmeta-v2 backupv2_size=`grep "backup data size" "${BACKUPMETAV2_LOG}" | grep -oP '\[\K[^\]]+' | grep "backup data size" | awk -F '=' '{print $2}' | grep -oP '\d*\.\d+'` echo "backup meta v2 backup size is ${backupv2_size}" diff --git a/br/tests/br_db/run.sh b/br/tests/br_db/run.sh index baf5eb5a54639..f9ca98fd67304 100755 --- a/br/tests/br_db/run.sh +++ b/br/tests/br_db/run.sh @@ -39,7 +39,7 @@ run_sql "CREATE TABLE $DB.usertable2 ( \ run_sql "INSERT INTO $DB.usertable2 VALUES (\"c\", \"d\");" # backup db echo "backup start..." -export GO_FAILPOINTS="github.com/pingcap/br/pkg/task/progress-call-back=return(\"$PROGRESS_FILE\")" +export GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/task/progress-call-back=return(\"$PROGRESS_FILE\")" run_br --pd $PD_ADDR backup db --db "$DB" -s "local://$TEST_DIR/$DB" export GO_FAILPOINTS="" diff --git a/br/tests/br_full/run.sh b/br/tests/br_full/run.sh index 99f22b2aa2df4..0415e6f0874ec 100755 --- a/br/tests/br_full/run.sh +++ b/br/tests/br_full/run.sh @@ -29,13 +29,13 @@ done # backup full and kill tikv to test reset connection echo "backup with limit start..." -export GO_FAILPOINTS="github.com/pingcap/br/pkg/backup/reset-retryable-error=1*return(true)" +export GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/backup/reset-retryable-error=1*return(true)" run_br --pd $PD_ADDR backup full -s "local://$TEST_DIR/$DB-limit" --concurrency 4 export GO_FAILPOINTS="" # backup full and let TiKV returns an unknown error, to test whether we can gracefully stop. echo "backup with unretryable error start..." -export GO_FAILPOINTS="github.com/pingcap/br/pkg/backup/reset-not-retryable-error=1*return(true)" +export GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/backup/reset-not-retryable-error=1*return(true)" run_br --pd $PD_ADDR backup full -s "local://$TEST_DIR/$DB-no-retryable" --concurrency 4 & pid=$! export GO_FAILPOINTS="" @@ -48,7 +48,7 @@ fi # backup full echo "backup with lz4 start..." -export GO_FAILPOINTS="github.com/pingcap/br/pkg/backup/backup-storage-error=1*return(\"connection refused\")" +export GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/backup/backup-storage-error=1*return(\"connection refused\")" run_br --pd $PD_ADDR backup full -s "local://$TEST_DIR/$DB-lz4" --concurrency 4 --compression lz4 export GO_FAILPOINTS="" size_lz4=$(du -d 0 $TEST_DIR/$DB-lz4 | awk '{print $1}') @@ -69,7 +69,7 @@ for ct in limit lz4 zstd; do # restore full echo "restore with $ct backup start..." - export GO_FAILPOINTS="github.com/pingcap/br/pkg/restore/restore-storage-error=1*return(\"connection refused\")" + export GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/restore/restore-storage-error=1*return(\"connection refused\")" run_br restore full -s "local://$TEST_DIR/$DB-$ct" --pd $PD_ADDR --ratelimit 1024 export GO_FAILPOINTS="" diff --git a/br/tests/br_key_locked/locker.go b/br/tests/br_key_locked/locker.go index abd6a76130eb2..8028b0ceca9bf 100644 --- a/br/tests/br_key_locked/locker.go +++ b/br/tests/br_key_locked/locker.go @@ -43,8 +43,8 @@ import ( pd "github.com/tikv/pd/client" "go.uber.org/zap" - "github.com/pingcap/br/pkg/httputil" - "github.com/pingcap/br/pkg/task" + "github.com/pingcap/tidb/br/pkg/httputil" + "github.com/pingcap/tidb/br/pkg/task" ) var ( diff --git a/br/tests/br_log_restore/run.sh b/br/tests/br_log_restore/run.sh index e6734ef646d67..1f7cc839d056f 100755 --- a/br/tests/br_log_restore/run.sh +++ b/br/tests/br_log_restore/run.sh @@ -115,7 +115,7 @@ run_sql "DROP DATABASE ${DB}_DDL1" run_sql "DROP DATABASE ${DB}_DDL2" # restore full -export GO_FAILPOINTS='github.com/pingcap/br/pkg/lightning/backend/local/FailIngestMeta=return("notleader")' +export GO_FAILPOINTS='github.com/pingcap/tidb/br/pkg/lightning/backend/local/FailIngestMeta=return("notleader")' echo "restore start..." run_br restore cdclog -s "s3://$BUCKET/$DB" --pd $PD_ADDR --s3.endpoint="http://$S3_ENDPOINT" \ --log-file "restore.log" --log-level "info" --start-ts $start_ts --end-ts $end_ts @@ -139,7 +139,7 @@ if [ "$row_count" -ne "0" ]; then echo "TEST: [$TEST_NAME] fail on ts range test." fi -export GO_FAILPOINTS='github.com/pingcap/br/pkg/lightning/backend/local/FailIngestMeta=return("epochnotmatch")' +export GO_FAILPOINTS='github.com/pingcap/tidb/br/pkg/lightning/backend/local/FailIngestMeta=return("epochnotmatch")' echo "restore again to restore a=5 record..." run_br restore cdclog -s "s3://$BUCKET/$DB" --pd $PD_ADDR --s3.endpoint="http://$S3_ENDPOINT" \ --log-file "restore.log" --log-level "info" --start-ts $end_ts diff --git a/br/tests/br_log_test/run.sh b/br/tests/br_log_test/run.sh index 3a2643a1536de..ba68253df0e9a 100644 --- a/br/tests/br_log_test/run.sh +++ b/br/tests/br_log_test/run.sh @@ -28,12 +28,12 @@ for i in $(seq $DB_COUNT); do done echo "backup with tikv permission error start..." -export GO_FAILPOINTS="github.com/pingcap/br/pkg/backup/tikv-rw-error=return(\"Io(Os { code: 13, kind: PermissionDenied...})\")" +export GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/backup/tikv-rw-error=return(\"Io(Os { code: 13, kind: PermissionDenied...})\")" run_br --pd $PD_ADDR backup full -s "local://$TEST_DIR/$DB-tikverr" || echo "br log test done!" export GO_FAILPOINTS="" echo "backup with tikv file or directory not found error start..." -export GO_FAILPOINTS="github.com/pingcap/br/pkg/backup/tikv-rw-error=return(\"Io(Os { code: 2, kind:NotFound...})\")" +export GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/backup/tikv-rw-error=return(\"Io(Os { code: 2, kind:NotFound...})\")" run_br --pd $PD_ADDR backup full -s "local://$TEST_DIR/$DB-tikverr2" || echo "br log test done!" export GO_FAILPOINTS="" diff --git a/br/tests/br_other/run.sh b/br/tests/br_other/run.sh index c4d75eaa55d82..63756fa3d1ec3 100644 --- a/br/tests/br_other/run.sh +++ b/br/tests/br_other/run.sh @@ -67,7 +67,7 @@ fi # backup full with ratelimit = 1 to make sure this backup task won't finish quickly echo "backup start to test lock file" PPROF_PORT=6080 -GO_FAILPOINTS="github.com/pingcap/br/pkg/utils/determined-pprof-port=return($PPROF_PORT)" \ +GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/utils/determined-pprof-port=return($PPROF_PORT)" \ run_br --pd $PD_ADDR backup full -s "local://$TEST_DIR/$DB/lock" \ --remove-schedulers \ --ratelimit 1 \ diff --git a/br/tests/br_s3/run.sh b/br/tests/br_s3/run.sh index a433b0d10b1bf..b01280690d699 100755 --- a/br/tests/br_s3/run.sh +++ b/br/tests/br_s3/run.sh @@ -76,7 +76,7 @@ for p in $(seq 2); do BACKUP_LOG="backup.log" rm -f $BACKUP_LOG unset BR_LOG_TO_TERM - ( GO_FAILPOINTS="github.com/pingcap/br/pkg/task/s3-outage-during-writing-file=1*return(\"$sig_file\")" \ + ( GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/task/s3-outage-during-writing-file=1*return(\"$sig_file\")" \ run_br --pd $PD_ADDR backup full -s "s3://mybucket/$DB?endpoint=http://$S3_ENDPOINT$S3_KEY" \ --log-file $BACKUP_LOG || \ ( cat $BACKUP_LOG && BR_LOG_TO_TERM=1 && exit 1 ) ) & diff --git a/br/tests/br_small_batch_size/run.sh b/br/tests/br_small_batch_size/run.sh index 04e4cd892cffb..82bb174055dfc 100755 --- a/br/tests/br_small_batch_size/run.sh +++ b/br/tests/br_small_batch_size/run.sh @@ -67,7 +67,7 @@ run_sql "drop database $DB" echo "restore start..." -GO_FAILPOINTS="github.com/pingcap/br/pkg/task/small-batch-size=return(2)" \ +GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/task/small-batch-size=return(2)" \ run_br restore full -s "local://$backup_dir" --pd $PD_ADDR --ratelimit 1024 for i in $record_counts; do diff --git a/br/tests/br_tikv_outage/run.sh b/br/tests/br_tikv_outage/run.sh index 7dd68950ef379..7a606b178f1cf 100644 --- a/br/tests/br_tikv_outage/run.sh +++ b/br/tests/br_tikv_outage/run.sh @@ -16,7 +16,7 @@ cases=${cases:-'shutdown scale-out'} for failure in $cases; do rm -f "$hint_finegrained" "$hint_backup_start" "$hint_get_backup_client" - export GO_FAILPOINTS="github.com/pingcap/br/pkg/backup/hint-backup-start=1*return(\"$hint_backup_start\");\ + export GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/backup/hint-backup-start=1*return(\"$hint_backup_start\");\ github.com/pingcap/br/pkg/backup/hint-fine-grained-backup=1*return(\"$hint_finegrained\");\ github.com/pingcap/br/pkg/conn/hint-get-backup-client=1*return(\"$hint_get_backup_client\")" diff --git a/br/tests/lightning_checkpoint_chunks/run.sh b/br/tests/lightning_checkpoint_chunks/run.sh index d06adfd9b42b9..86b23d6249891 100755 --- a/br/tests/lightning_checkpoint_chunks/run.sh +++ b/br/tests/lightning_checkpoint_chunks/run.sh @@ -50,8 +50,8 @@ done # Set the failpoint to kill the lightning instance as soon as # one file (after writing totally $ROW_COUNT rows) is imported. # If checkpoint does work, this should kill exactly $CHUNK_COUNT instances of lightnings. -TASKID_FAILPOINTS="github.com/pingcap/br/pkg/lightning/SetTaskID=return(1234567890)" -export GO_FAILPOINTS="$TASKID_FAILPOINTS;github.com/pingcap/br/pkg/lightning/restore/FailIfImportedChunk=return($ROW_COUNT)" +TASKID_FAILPOINTS="github.com/pingcap/tidb/br/pkg/lightning/SetTaskID=return(1234567890)" +export GO_FAILPOINTS="$TASKID_FAILPOINTS;github.com/pingcap/tidb/br/pkg/lightning/restore/FailIfImportedChunk=return($ROW_COUNT)" # Start importing the tables. run_sql 'DROP DATABASE IF EXISTS cpch_tsr' @@ -75,7 +75,7 @@ run_sql 'DROP DATABASE IF EXISTS `tidb_lightning_checkpoint_test_cpch.1234567890 # Set the failpoint to kill the lightning instance as soon as one chunk is imported, via signal mechanism # If checkpoint does work, this should only kill $CHUNK_COUNT instances of lightnings. -export GO_FAILPOINTS="$TASKID_FAILPOINTS;github.com/pingcap/br/pkg/lightning/restore/KillIfImportedChunk=return($ROW_COUNT)" +export GO_FAILPOINTS="$TASKID_FAILPOINTS;github.com/pingcap/tidb/br/pkg/lightning/restore/KillIfImportedChunk=return($ROW_COUNT)" for i in $(seq "$CHUNK_COUNT"); do echo "******** Importing Chunk Now (step $i/$CHUNK_COUNT) ********" @@ -110,7 +110,7 @@ rm -f "$TEST_DIR"/cpch.pb* # Set the failpoint to kill the lightning instance as soon as one chunk is imported # If checkpoint does work, this should only kill $CHUNK_COUNT instances of lightnings. -export GO_FAILPOINTS="$TASKID_FAILPOINTS;github.com/pingcap/br/pkg/lightning/restore/FailIfImportedChunk=return($ROW_COUNT)" +export GO_FAILPOINTS="$TASKID_FAILPOINTS;github.com/pingcap/tidb/br/pkg/lightning/restore/FailIfImportedChunk=return($ROW_COUNT)" set +e for i in $(seq "$CHUNK_COUNT"); do echo "******** Importing Chunk using File checkpoint Now (step $i/$CHUNK_COUNT) ********" diff --git a/br/tests/lightning_checkpoint_columns/run.sh b/br/tests/lightning_checkpoint_columns/run.sh index 1d4125aad3241..11a4a1560d788 100755 --- a/br/tests/lightning_checkpoint_columns/run.sh +++ b/br/tests/lightning_checkpoint_columns/run.sh @@ -26,7 +26,7 @@ echo "INSERT INTO tbl (j, i) VALUES (3, 1),(4, 2);" > "$DBPATH/cp_tsr.tbl.sql" # Set minDeliverBytes to a small enough number to only write only 1 row each time # Set the failpoint to kill the lightning instance as soon as one row is written -PKG="github.com/pingcap/br/pkg/lightning/restore" +PKG="github.com/pingcap/tidb/br/pkg/lightning/restore" export GO_FAILPOINTS="$PKG/SlowDownWriteRows=sleep(1000);$PKG/FailAfterWriteRows=panic;$PKG/SetMinDeliverBytes=return(1)" # Start importing the tables. diff --git a/br/tests/lightning_checkpoint_engines/run.sh b/br/tests/lightning_checkpoint_engines/run.sh index e23b807ab316f..680fb9ef634de 100755 --- a/br/tests/lightning_checkpoint_engines/run.sh +++ b/br/tests/lightning_checkpoint_engines/run.sh @@ -57,7 +57,7 @@ for BACKEND in importer local; do rm -f "/tmp/tidb_lightning_checkpoint.pb" # Data engine part - export GO_FAILPOINTS='github.com/pingcap/br/pkg/lightning/restore/SlowDownImport=sleep(500);github.com/pingcap/br/pkg/lightning/restore/FailIfStatusBecomes=return(120);github.com/pingcap/br/pkg/lightning/restore/FailIfIndexEngineImported=return(140)' + export GO_FAILPOINTS='github.com/pingcap/tidb/br/pkg/lightning/restore/SlowDownImport=sleep(500);github.com/pingcap/tidb/br/pkg/lightning/restore/FailIfStatusBecomes=return(120);github.com/pingcap/tidb/br/pkg/lightning/restore/FailIfIndexEngineImported=return(140)' for i in $(seq "$ENGINE_COUNT"); do echo "******** Importing Table Now (step $i/$ENGINE_COUNT) ********" ! do_run_lightning $BACKEND config 2> /dev/null diff --git a/br/tests/lightning_checkpoint_engines_order/run.sh b/br/tests/lightning_checkpoint_engines_order/run.sh index 6b9d1f54b7151..175f4a01e5894 100644 --- a/br/tests/lightning_checkpoint_engines_order/run.sh +++ b/br/tests/lightning_checkpoint_engines_order/run.sh @@ -11,7 +11,7 @@ run_sql 'DROP DATABASE IF EXISTS tidb_lightning_checkpoint;' rm -rf "$TEST_DIR/$TEST_NAME.sorted" # force crash when anything is written... -export GO_FAILPOINTS='github.com/pingcap/br/pkg/lightning/restore/FailAfterWriteRows=panic' +export GO_FAILPOINTS='github.com/pingcap/tidb/br/pkg/lightning/restore/FailAfterWriteRows=panic' # ensure only 2 engines (index + one data) are open all the time no matter # how many times we restart from beginning, since nothing was written. @@ -27,7 +27,7 @@ for i in $(seq 5); do done # allow one file to be written at a time, -export GO_FAILPOINTS='github.com/pingcap/br/pkg/lightning/restore/FailAfterWriteRows=1*return->panic' +export GO_FAILPOINTS='github.com/pingcap/tidb/br/pkg/lightning/restore/FailAfterWriteRows=1*return->panic' # and now we should have 3 engines since one engine will be successfully imported. set +e diff --git a/br/tests/lightning_checkpoint_parquet/run.sh b/br/tests/lightning_checkpoint_parquet/run.sh index e634b44391290..d5ab1b8a40f6d 100755 --- a/br/tests/lightning_checkpoint_parquet/run.sh +++ b/br/tests/lightning_checkpoint_parquet/run.sh @@ -30,7 +30,7 @@ echo 'CREATE TABLE tbl(iVal INT PRIMARY KEY, s VARCHAR(16));' > "$DBPATH/cppq_ts bin/parquet_gen --dir $DBPATH --schema cppq_tsr --table tbl --chunk 1 --rows $ROW_COUNT # Set the failpoint to kill the lightning instance as soon as one batch data is written -PKG="github.com/pingcap/br/pkg/lightning/restore" +PKG="github.com/pingcap/tidb/br/pkg/lightning/restore" export GO_FAILPOINTS="$PKG/SlowDownWriteRows=sleep(1000);$PKG/FailAfterWriteRows=panic;$PKG/SetMinDeliverBytes=return(1)" # Start importing the tables. diff --git a/br/tests/lightning_concurrent-restore/run.sh b/br/tests/lightning_concurrent-restore/run.sh index b68ed14a5b0fb..1614d588d0803 100644 --- a/br/tests/lightning_concurrent-restore/run.sh +++ b/br/tests/lightning_concurrent-restore/run.sh @@ -30,7 +30,7 @@ run_sql 'select VARIABLE_VALUE from mysql.tidb where VARIABLE_NAME = "tikv_gc_li ORIGINAL_TIKV_GC_LIFE_TIME=$(tail -n 1 "$TEST_DIR/sql_res.$TEST_NAME.txt" | awk '{print $(NF)}') # add a delay after increasing tikv_gc_life_time, in order to increase confilct possibility -export GO_FAILPOINTS='github.com/pingcap/br/pkg/lightning/restore/IncreaseGCUpdateDuration=sleep(200)' +export GO_FAILPOINTS='github.com/pingcap/tidb/br/pkg/lightning/restore/IncreaseGCUpdateDuration=sleep(200)' # Start importing run_sql 'DROP DATABASE IF EXISTS restore_conc' diff --git a/br/tests/lightning_disk_quota/run.sh b/br/tests/lightning_disk_quota/run.sh index 31553d371bbca..7916292978ad2 100644 --- a/br/tests/lightning_disk_quota/run.sh +++ b/br/tests/lightning_disk_quota/run.sh @@ -59,7 +59,7 @@ while [ ! -e "$FINISHED_FILE" ] && [ -e "$DISK_QUOTA_DIR" ]; do fi done & -export GO_FAILPOINTS="github.com/pingcap/br/pkg/lightning/restore/SlowDownWriteRows=sleep(50)" +export GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/lightning/restore/SlowDownWriteRows=sleep(50)" run_lightning --sorted-kv-dir "$DISK_QUOTA_DIR/sorted" --log-file "$TEST_DIR/lightning-disk-quota.log" touch "$FINISHED_FILE" # if $FINISHED_FILE has content, it is only because the hard disk quota is exceeded. diff --git a/br/tests/lightning_error_summary/run.sh b/br/tests/lightning_error_summary/run.sh index 180523930c2ca..0b61e052e68cb 100755 --- a/br/tests/lightning_error_summary/run.sh +++ b/br/tests/lightning_error_summary/run.sh @@ -24,7 +24,7 @@ run_sql 'DROP TABLE IF EXISTS error_summary.a;' run_sql 'DROP TABLE IF EXISTS error_summary.c;' run_sql 'CREATE TABLE error_summary.a (id INT NOT NULL PRIMARY KEY, k INT NOT NULL);' run_sql 'CREATE TABLE error_summary.c (id INT NOT NULL PRIMARY KEY, k INT NOT NULL);' -export GO_FAILPOINTS="github.com/pingcap/br/pkg/lightning/restore/InitializeCheckpointExit=return(true)" +export GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/lightning/restore/InitializeCheckpointExit=return(true)" run_lightning --enable-checkpoint=1 --log-file "$TEST_DIR/lightning-error-summary.log" run_sql 'INSERT INTO error_summary.a VALUES (2, 4), (6, 8);' run_sql 'INSERT INTO error_summary.c VALUES (3, 9), (27, 81);' diff --git a/br/tests/lightning_fail_fast/run.sh b/br/tests/lightning_fail_fast/run.sh index 41a9667dc7861..a1a6b85fc3091 100755 --- a/br/tests/lightning_fail_fast/run.sh +++ b/br/tests/lightning_fail_fast/run.sh @@ -15,7 +15,7 @@ set -eux -export GO_FAILPOINTS='github.com/pingcap/br/pkg/lightning/restore/SlowDownWriteRows=sleep(50);github.com/pingcap/br/pkg/lightning/restore/SetMinDeliverBytes=return(1)' +export GO_FAILPOINTS='github.com/pingcap/tidb/br/pkg/lightning/restore/SlowDownWriteRows=sleep(50);github.com/pingcap/tidb/br/pkg/lightning/restore/SetMinDeliverBytes=return(1)' for CFG in chunk engine; do rm -f "$TEST_DIR/lightning-tidb.log" diff --git a/br/tests/lightning_local_backend/run.sh b/br/tests/lightning_local_backend/run.sh index cfecd3e72ab1b..bb909a6eb9904 100755 --- a/br/tests/lightning_local_backend/run.sh +++ b/br/tests/lightning_local_backend/run.sh @@ -23,7 +23,7 @@ ENGINE_COUNT=6 rm -f "$TEST_DIR/lightning-local.log" rm -f "/tmp/tidb_lightning_checkpoint_local_backend_test.pb" run_sql 'DROP DATABASE IF EXISTS cpeng;' -export GO_FAILPOINTS='github.com/pingcap/br/pkg/lightning/backend/local/FailIngestMeta=1*return("notleader")' +export GO_FAILPOINTS='github.com/pingcap/tidb/br/pkg/lightning/backend/local/FailIngestMeta=1*return("notleader")' run_lightning --backend local --enable-checkpoint=1 --log-file "$TEST_DIR/lightning-local.log" --config "tests/$TEST_NAME/config.toml" @@ -40,7 +40,7 @@ check_contains 'sum(c): 46' run_sql 'DROP DATABASE cpeng;' rm -f "/tmp/tidb_lightning_checkpoint_local_backend_test.pb" -export GO_FAILPOINTS='github.com/pingcap/br/pkg/lightning/backend/local/FailIngestMeta=2*return("epochnotmatch")' +export GO_FAILPOINTS='github.com/pingcap/tidb/br/pkg/lightning/backend/local/FailIngestMeta=2*return("epochnotmatch")' run_lightning --backend local --enable-checkpoint=1 --log-file "$TEST_DIR/lightning-local.log" --config "tests/$TEST_NAME/config.toml" @@ -58,7 +58,7 @@ run_sql 'DROP DATABASE cpeng;' rm -f "/tmp/tidb_lightning_checkpoint_local_backend_test.pb" set +e -export GO_FAILPOINTS='github.com/pingcap/br/pkg/lightning/restore/FailIfStatusBecomes=return(90);' +export GO_FAILPOINTS='github.com/pingcap/tidb/br/pkg/lightning/restore/FailIfStatusBecomes=return(90);' for i in $(seq "$ENGINE_COUNT"); do echo "******** Importing Table Now (step $i/$ENGINE_COUNT) ********" run_lightning --backend local --enable-checkpoint=1 --log-file "$TEST_DIR/lightning-local.log" --config "tests/$TEST_NAME/config.toml" @@ -87,7 +87,7 @@ for ckpt in mysql file; do # before chunk pos is updated, local files could handle lost set +e - export GO_FAILPOINTS="github.com/pingcap/br/pkg/lightning/restore/FailAfterWriteRows=return" + export GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/lightning/restore/FailAfterWriteRows=return" run_lightning --backend local --enable-checkpoint=1 --log-file "$TEST_DIR/lightning-local.log" --config "tests/$TEST_NAME/$ckpt.toml" set -e run_lightning_ctl --check-local-storage \ @@ -101,7 +101,7 @@ for ckpt in mysql file; do run_sql 'DROP DATABASE IF EXISTS tidb_lightning_checkpoint_local_backend_test' rm -f "/tmp/tidb_lightning_checkpoint_local_backend_test.pb" set +e - export GO_FAILPOINTS="github.com/pingcap/br/pkg/lightning/restore/LocalBackendSaveCheckpoint=return;github.com/pingcap/br/pkg/lightning/restore/FailIfImportedChunk=return(1)" + export GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/lightning/restore/LocalBackendSaveCheckpoint=return;github.com/pingcap/tidb/br/pkg/lightning/restore/FailIfImportedChunk=return(1)" run_lightning --backend local --enable-checkpoint=1 --log-file "$TEST_DIR/lightning-local.log" --config "tests/$TEST_NAME/$ckpt.toml" set -e run_lightning_ctl --check-local-storage \ @@ -114,7 +114,7 @@ for ckpt in mysql file; do # after index engine is imported, local file could handle lost set +e - export GO_FAILPOINTS="github.com/pingcap/br/pkg/lightning/restore/FailIfIndexEngineImported=return(1)" + export GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/lightning/restore/FailIfIndexEngineImported=return(1)" run_lightning --backend local --enable-checkpoint=1 --log-file "$TEST_DIR/lightning-local.log" --config "tests/$TEST_NAME/$ckpt.toml" set -e run_lightning_ctl --check-local-storage \ diff --git a/br/tests/lightning_restore/run.sh b/br/tests/lightning_restore/run.sh index 8e7482f2d5bb0..02e4400d6b2eb 100755 --- a/br/tests/lightning_restore/run.sh +++ b/br/tests/lightning_restore/run.sh @@ -28,7 +28,7 @@ done # Count OpenEngine and CloseEngine events. # Abort if number of unbalanced OpenEngine is >= 4 -export GO_FAILPOINTS='github.com/pingcap/br/pkg/lightning/backend/FailIfEngineCountExceeds=return(4)' +export GO_FAILPOINTS='github.com/pingcap/tidb/br/pkg/lightning/backend/FailIfEngineCountExceeds=return(4)' # Start importing run_sql 'DROP DATABASE IF EXISTS restore_tsr' diff --git a/executor/brie.go b/executor/brie.go index 27b34ec2650fa..97c2eb2cc3ed8 100644 --- a/executor/brie.go +++ b/executor/brie.go @@ -21,9 +21,9 @@ import ( "sync/atomic" "time" - "github.com/pingcap/br/pkg/glue" - "github.com/pingcap/br/pkg/storage" - "github.com/pingcap/br/pkg/task" + "github.com/pingcap/tidb/br/pkg/glue" + "github.com/pingcap/tidb/br/pkg/storage" + "github.com/pingcap/tidb/br/pkg/task" "github.com/pingcap/errors" "github.com/pingcap/parser/ast" "github.com/pingcap/parser/model" From 14438ce0c88405d41d2e8c450a0167eefe5438a1 Mon Sep 17 00:00:00 2001 From: 3pointer Date: Mon, 5 Jul 2021 10:52:06 +0800 Subject: [PATCH 3/7] merge Makefile && remove br/go.mod --- Makefile | 86 ++++++- Makefile.common | 8 + br/pkg/task/restore.go | 6 +- br/pkg/task/restore_raw.go | 1 - executor/brie.go | 6 +- go.mod | 62 +++-- go.sum | 477 +++++++++++++++++++++++++++++-------- 7 files changed, 517 insertions(+), 129 deletions(-) diff --git a/Makefile b/Makefile index 50ae4507a3ed2..debbd4665b726 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ include Makefile.common -.PHONY: all clean test gotest server dev benchkv benchraw check checklist parser tidy ddltest +.PHONY: all clean test gotest server dev benchkv benchraw check checklist parser tidy ddltest web default: server buildsucc @@ -104,14 +104,64 @@ testSuite: clean: failpoint-disable $(GO) clean -i ./... +build_tools: build_br build_lightning build_lightning-ctl + +br_web: + @cd br/web && npm install && npm run build + +build_br: + $(GOBUILD) $(RACEFLAG) -o $(BR_BIN) br/cmd/br/*.go + +build_lightning_for_web: + $(GOBUILD) $(RACEFLAG) -tags dev -o $(LIGHTNING_BIN) br/cmd/tidb-lightning/main.go + +build_lightning: + $(GOBUILD) $(RACEFLAG) -o $(LIGHTNING_BIN) br/cmd/tidb-lightning/main.go + +build_lightning-ctl: + $(GOBUILD) $(RACEFLAG) -o $(LIGHTNING_CTL_BIN) br/cmd/tidb-lightning-ctl/main.go + +build_for_br_integration_test: + @make failpoint-enable + ($(GOTEST) -c -cover -covermode=count \ + -coverpkg=$(BR_PKG)/... \ + -o $(BR_BIN).test \ + github.com/pingcap/br/cmd/br && \ + $(GOTEST) -c -cover -covermode=count \ + -coverpkg=$(BR_PKG)/... \ + -o $(LIGHTNING_BIN).test \ + github.com/pingcap/br/cmd/tidb-lightning && \ + $(GOTEST) -c -cover -covermode=count \ + -coverpkg=$(BR_PKG)/... \ + -o $(LIGHTNING_CTL_BIN).test \ + github.com/pingcap/br/cmd/tidb-lightning-ctl && \ + $(GOBUILD) $(RACEFLAG) -o bin/locker br/tests/br_key_locked/*.go && \ + $(GOBUILD) $(RACEFLAG) -o bin/gc br/tests/br_z_gc_safepoint/*.go && \ + $(GOBUILD) $(RACEFLAG) -o bin/oauth br/tests/br_gcs/*.go && \ + $(GOBUILD) $(RACEFLAG) -o bin/rawkv br/tests/br_rawkv/*.go && \ + $(GOBUILD) $(RACEFLAG) -o bin/parquet_gen br/tests/lightning_checkpoint_parquet/*.go \ + ) || (make failpoint-disable && exit 1) + @make failpoint-disable + # Split tests for CI to run `make test` in parallel. -test: test_part_1 test_part_2 +test: test_part_1 test_part_2 test_part_br @>&2 echo "Great, all tests passed." test_part_1: checklist explaintest test_part_2: gotest gogenerate +test_part_br: br_unit_test br_integration_test + +br_integration_test: br_bins br_build br_build_for_integration_test + @cd br && tests/run.sh + +br_compatibility_test_prepare: + @cd br && tests/run_compatible.sh prepare + +br_compatibility_test: + @cd br && tests/run_compatible.sh run + explaintest: server_check @cd cmd/explaintest && ./run-tests.sh -s ../../bin/tidb-server @@ -269,3 +319,35 @@ endif bench-daily: cd ./session && \ go test -run TestBenchDaily --date `git log -n1 --date=unix --pretty=format:%cd` --commit `git log -n1 --pretty=format:%h` --outfile $(TO) + +# There is no FreeBSD environment for GitHub actions. So cross-compile on Linux +# but that doesn't work with CGO_ENABLED=1, so disable cgo. The reason to have +# cgo enabled on regular builds is performance. +ifeq ("$(GOOS)", "freebsd") + GOBUILD = CGO_ENABLED=0 GO111MODULE=on go build -trimpath -ldflags '$(LDFLAGS)' +endif + +br_coverage: + tools/bin/gocovmerge "$(TEST_DIR)"/cov.* | grep -vE ".*.pb.go|.*__failpoint_binding__.go" > "$(TEST_DIR)/all_cov.out" +ifeq ("$(JenkinsCI)", "1") + tools/bin/goveralls -coverprofile=$(TEST_DIR)/all_cov.out -service=jenkins-ci -repotoken $(COVERALLS_TOKEN) +else + go tool cover -html "$(TEST_DIR)/all_cov.out" -o "$(TEST_DIR)/all_cov.html" + grep -F '= 1.14, ref: etcd-io/bbolt#201 https://github.com/etcd-io/bbolt/pull/201 go.etcd.io/bbolt v1.3.5 // indirect go.etcd.io/etcd v0.5.0-alpha.5.0.20200824191128-ae9734ed278b go.uber.org/atomic v1.8.0 go.uber.org/automaxprocs v1.4.0 go.uber.org/goleak v1.1.10 + go.uber.org/multierr v1.7.0 go.uber.org/zap v1.18.1 - golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 + golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420 + golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c - golang.org/x/sys v0.0.0-20210510120138-977fb7262007 + golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 golang.org/x/text v0.3.6 golang.org/x/tools v0.1.4 - google.golang.org/grpc v1.27.1 + google.golang.org/api v0.50.0 + google.golang.org/grpc v1.38.0 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v2 v2.4.0 - modernc.org/mathutil v1.2.2 // indirect + modernc.org/mathutil v1.4.1 sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0 sourcegraph.com/sourcegraph/appdash-data v0.0.0-20151005221446-73f23eafcf67 ) -go 1.16 +replace cloud.google.com/go/storage => github.com/3pointer/google-cloud-go/storage v1.6.1-0.20210108125931-b59bfa0720b2 + +replace github.com/tikv/pd => github.com/tikv/pd v1.1.0-beta.0.20210609101029-3ba158cf41a4 + +replace google.golang.org/grpc => google.golang.org/grpc v1.27.1 diff --git a/go.sum b/go.sum index 2ec69dcd9e0cf..858a55663bd4f 100644 --- a/go.sum +++ b/go.sum @@ -1,55 +1,84 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= -cloud.google.com/go v0.53.0 h1:MZQCQQaRwOrAcuKjiHWHrgKykt4fZyuwF2dtiG3fGW8= cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= +cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= +cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= +cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= +cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= +cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= +cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= +cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= +cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= +cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= +cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= +cloud.google.com/go v0.86.0 h1:Lo1JDRwMOAxQxTQcbGXi4p60jyMoXNpkmzzzL2Agt5k= +cloud.google.com/go v0.86.0/go.mod h1:YG2MRW8zzPSZaztnTZtxbMPK2VYaHg4NTDYZMG+5ZqQ= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= -cloud.google.com/go/bigquery v1.4.0 h1:xE3CPsOgttP4ACBePh79zTKALtXwn/Edhcr16R5hMWU= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= -cloud.google.com/go/datastore v1.1.0 h1:/May9ojXjRkPBNVrq+oWLqmWCkr4OU5uRY29bu0mRyQ= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/pubsub v1.2.0 h1:Lpy6hKgdcl7a3WGSfJIFmxmcdjSpP6OmBEfcOv1Y680= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= -cloud.google.com/go/storage v1.6.0 h1:UDpwYIwla4jHGzZJaEJYx1tOejbgSoNqsAfHAUYe2r8= -cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/3pointer/google-cloud-go/storage v1.6.1-0.20210108125931-b59bfa0720b2 h1:Bnm+q0FAI1AXoPX3cPIi2/a4sg2J2f/D0yPr+7EMPg0= +github.com/3pointer/google-cloud-go/storage v1.6.1-0.20210108125931-b59bfa0720b2/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= +github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= +github.com/Azure/azure-pipeline-go v0.2.2/go.mod h1:4rQ/NZncSvGqNkkOsNpOU1tgoNuIlp9AfUH5G1tvCHc= +github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k= +github.com/Azure/azure-storage-blob-go v0.10.0/go.mod h1:ep1edmW+kNQx4UfWM9heESNmQdijykocJ0YOxmMX8SE= +github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= +github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= +github.com/Azure/go-autorest/autorest/adal v0.8.3/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= +github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= +github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= +github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= +github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= +github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/CloudyKit/fastprinter v0.0.0-20170127035650-74b38d55f37a/go.mod h1:EFZQ978U7x8IRnstaskI3IysnWY5Ao3QgZUKOXlsAdw= +github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible/go.mod h1:HPYO+50pSWkPoj9Q/eq0aRGByCL6ScRlUmiEX5Zgm+w= github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= -github.com/HdrHistogram/hdrhistogram-go v0.9.0 h1:dpujRju0R4M/QZzcnR1LH1qm+TVG3UzkWdp5tH1WMcg= -github.com/HdrHistogram/hdrhistogram-go v0.9.0/go.mod h1:nxrse8/Tzg2tg3DZcZjm6qEclQKK70g0KxO61gFFZD4= +github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ= +github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= +github.com/HdrHistogram/hdrhistogram-go v1.1.0 h1:6dpdDPTRoo78HxAJ6T1HfMiKSnqhgRRqzCuPshRkQ7I= +github.com/HdrHistogram/hdrhistogram-go v1.1.0/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= github.com/Jeffail/gabs/v2 v2.5.1 h1:ANfZYjpMlfTTKebycu4X1AgkVWumFVDYQl7JwOr4mDk= github.com/Jeffail/gabs/v2 v2.5.1/go.mod h1:xCn81vdHKxFUuWWAaD5jCTQDNPBMh5pPs9IJ+NcziBI= +github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= +github.com/Joker/jade v1.0.1-0.20190614124447-d475f43051e7/go.mod h1:6E6s8o2AE4KhCrqr6GRJjdC/gNfTdxkIXvuGZZda2VM= github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +github.com/ReneKroon/ttlcache/v2 v2.3.0/go.mod h1:zbo6Pv/28e21Z8CzzqgYRArQYGYtjONRxaAKGxzQvG4= +github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0= github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk= github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/VividCortex/ewma v1.1.1 h1:MnEK4VOv6n0RSY4vtRe3h11qjxL3+t0B8yOL8iMXdcM= github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmxzcbUokwA= github.com/VividCortex/mysqlerr v0.0.0-20200629151747-c28746d985dd/go.mod h1:f3HiCrHjHBdcm6E83vGaXh1KomZMA2P6aeo3hKx/wg0= github.com/Xeoncross/go-aesctr-with-hmac v0.0.0-20200623134604-12b17a7ff502/go.mod h1:pmnBM9bxWSiHvC/gSWunUIyDvGn33EkP2CUjxFKtTTM= +github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= +github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alvaroloes/enumer v1.1.2/go.mod h1:FxrjvuXoDAx9isTJrv4c+T410zFi0DtXIT0m65DJ+Wo= github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q= github.com/apache/thrift v0.0.0-20181112125854-24918abba929/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.13.1-0.20201008052519-daf620915714 h1:Jz3KVLYY5+JO7rDiX0sAuRGtuv2vG01r17Y9nLMWNUw= @@ -60,6 +89,7 @@ github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5 github.com/aws/aws-sdk-go v1.30.19/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.35.3 h1:r0puXncSaAfRt7Btml2swUo74Kao+vKhO3VLjwDjK54= github.com/aws/aws-sdk-go v1.35.3/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48= +github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -77,17 +107,31 @@ github.com/cenkalti/backoff/v4 v4.0.2/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM= github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cheggaaa/pb/v3 v3.0.4 h1:QZEPYOj2ix6d5oEg63fbHmpolrnNiwjUsk+h74Yt4bM= -github.com/cheggaaa/pb/v3 v3.0.4/go.mod h1:7rgWxLrAUcFMkvJuv09+DYi7mMUYi8nO9iOWcvGJPfw= +github.com/cheggaaa/pb/v3 v3.0.8 h1:bC8oemdChbke2FHIIGy9mn4DPJ2caZYQnfbRqwmdCoA= +github.com/cheggaaa/pb/v3 v3.0.8/go.mod h1:UICbiLec/XO6Hw6k+BHEtHeQFzzBH4i2/qk/ow1EJTA= +github.com/cheynewallace/tabby v1.1.1 h1:JvUR8waht4Y0S3JF17G6Vhyt+FRhnqVCkk8l4YrOU54= +github.com/cheynewallace/tabby v1.1.1/go.mod h1:Pba/6cUL8uYqvOc9RkyvFbHGrQ9wShyrn6/S/1OYVys= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa h1:OaNxuTZr7kxeODyLWsRMC+OD03aFUH+mW6r2d+MWa5Y= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= +github.com/cockroachdb/datadriven v1.0.0 h1:uhZrAfEayBecH2w2tZmhe20HJ7hDvrrA4x2Bg9YdZKM= +github.com/cockroachdb/datadriven v1.0.0/go.mod h1:5Ib8Meh+jk1RlHIXej6Pzevx/NLlNvQB9pmSBZErGA4= +github.com/cockroachdb/errors v1.6.1/go.mod h1:tm6FTP5G81vwJ5lC0SizQo374JNCOPrHyXGitRJoDqM= +github.com/cockroachdb/errors v1.8.1 h1:A5+txlVZfOqFBDa4mGz2bUWSp0aHElvHX2bKkdbQu+Y= +github.com/cockroachdb/errors v1.8.1/go.mod h1:qGwQn6JmZ+oMjuLwjWzUNqblqk0xl4CVV3SQbGwK7Ac= +github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f h1:o/kfcElHqOiXqcou5a3rIlMc7oJbMQkeLk0VQJ7zgqY= +github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= +github.com/cockroachdb/pebble v0.0.0-20210704190057-31f3ea68e61c h1:ldR+FwJQJVidfq+yZhNroiCkiU5WcygyNRFA8hjEaOA= +github.com/cockroachdb/pebble v0.0.0-20210704190057-31f3ea68e61c/go.mod h1:JXfQr3d+XO4bL1pxGwKKo09xylQSdZ/mpZ9b2wfVcPs= +github.com/cockroachdb/redact v1.0.8 h1:8QG/764wK+vmEYoOlfobpe12EQcS81ukx/a4hdVMxNw= +github.com/cockroachdb/redact v1.0.8/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= +github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 h1:IKgmqgMQlVJIZj19CdocBeSfSaiCbEBZGKODaixqtHM= +github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2/go.mod h1:8BT+cPK6xvFOcRlk0R8eg+OTkcqI6baNH4xAkpiYVvQ= +github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= +github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= github.com/colinmarc/hdfs/v2 v2.1.1/go.mod h1:M3x+k8UKKmxtFu++uAZ0OtDU8jR3jnaZIAc6yK4Ue0c= github.com/coocood/bbloom v0.0.0-20190830030839-58deb6228d64 h1:W1SHiII3e0jVwvaQFglwu3kS9NLxOeTpvik7MbKCyuQ= github.com/coocood/bbloom v0.0.0-20190830030839-58deb6228d64/go.mod h1:F86k/6c7aDUdwSUevnLpHS/3Q9hzYCE99jGk2xsHnt0= @@ -127,6 +171,7 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= +github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= github.com/dgraph-io/ristretto v0.0.1 h1:cJwdnj42uV8Jg4+KLrYovLiCgIfz9wtWm6E6KA+1tLs= github.com/dgraph-io/ristretto v0.0.1/go.mod h1:T40EBc7CJke8TkpiYfGGKAeFjSaxuFXhuXRyumBd6RE= github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= @@ -140,20 +185,32 @@ github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385 h1:clC1lXBpe2kTj2VHdaIu9ajZQe4kcEY9j0NsnDDBZ3o= github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= +github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw= +github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg= github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= +github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= +github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= +github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4/go.mod h1:T9YF2M40nIgbVgp3rreNmTged+9HrbNTIQf1PsaIiTA= +github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsouza/fake-gcs-server v1.17.0 h1:OeH75kBZcZa3ZE+zz/mFdJ2btt9FgqfjI7gIh9+5fvk= -github.com/fsouza/fake-gcs-server v1.17.0/go.mod h1:D1rTE4YCyHFNa99oyJJ5HyclvN/0uQR+pM/VdlL83bw= +github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fsouza/fake-gcs-server v1.27.0 h1:Nhio4V6SpdZFtjcRbUASqdVHBpFf9p2vjnjWUXfpHYs= +github.com/fsouza/fake-gcs-server v1.27.0/go.mod h1:cIYhxy+W+2I6g8adUF9QjMUNkB81nI3B2WiKAe8Vtws= +github.com/fzipp/gocyclo v0.3.1/go.mod h1:DJHO6AUmbdqj2ET4Z9iArSuwWgYDRryYt2wASxc7x3E= +github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc= +github.com/ghemawat/stream v0.0.0-20171120220530-696b145b53b9/go.mod h1:106OIgooyS7OzLDOpUGgm9fA3bQENb/cFSyyBmMoJDs= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/gzip v0.0.1/go.mod h1:fGBJBCdt6qCZuCAOwWuFhBB4OOq9EFqlo5dEaFhhu5w= github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s= @@ -162,8 +219,11 @@ github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm github.com/gin-gonic/gin v1.3.0/go.mod h1:7cKuhb5qV2ggCFctp2fJQ+ErvciLZrIeoOSOm6mUr7Y= github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM= github.com/gin-gonic/gin v1.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmCsR2Do= +github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98= github.com/go-chi/chi v4.0.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= github.com/go-echarts/go-echarts v1.0.0/go.mod h1:qbmyAb/Rl1f2w7wKba1D4LoNq4U164yO4/wedFbcWyo= +github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w= +github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -172,6 +232,7 @@ github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= +github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI= github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= @@ -194,14 +255,20 @@ github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= +github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= +github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= github.com/goccy/go-graphviz v0.0.5/go.mod h1:wXVsXxmyMQU6TN3zGRttjNn3h+iCAS7xQFC6TlNvLhk= +github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v0.0.0-20180717141946-636bf0302bc9/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/gogo/status v1.1.0/go.mod h1:BFv9nrluPLmrS0EmGVvLaPNmRosr9KapBYd5/hpY1WM= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= @@ -216,20 +283,37 @@ github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3 h1:GV+pQPG/EUUbkh47niozDcADz6go/dUwhVzdUQHIVRw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= +github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v0.0.0-20180814211427-aa810b61a9c7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4 h1:87PNWwrRvUSnqS4dlcBU/ftvOIBep4sYuBLlh6rX2wk= github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.2-0.20190904063534-ff6b7dc882cf h1:gFVkHXmVAhEbxZVDln5V9GKrLaluNoFHDbrZwAWZgws= github.com/golang/snappy v0.0.2-0.20190904063534-ff6b7dc882cf/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA= +github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -237,18 +321,36 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.2.1 h1:d8MncMlErDFTwQGBK1xhv026j9kqhvw1Qv9IbWT1VLQ= +github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200407044318-7d83b28da2e9 h1:K+lX49/3eURCE1IjlaZN//u6c+9nfDAMnyQ9E2dsJbY= +github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200407044318-7d83b28da2e9/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9 h1:2tft2559dNwKl2znYB58oVTql0grRB+Ml3LWIBbc4WM= +github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf/go.mod h1:RpwtwJQFrIEPstU94h88MWPXP2ektJZ8cZ0YntAmXiE= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -257,11 +359,13 @@ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/gorilla/handlers v1.4.2 h1:0QniY0USkHQ1RGCLfKxeNHK9bkDHGRYGNDFBCS+YARg= -github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= +github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc= github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= +github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= @@ -277,18 +381,27 @@ github.com/grpc-ecosystem/grpc-gateway v1.12.1 h1:zCy2xE9ablevUOrUZc3Dl72Dt+ya2F github.com/grpc-ecosystem/grpc-gateway v1.12.1/go.mod h1:8XEsbTttt/W+VvjtQhLACqCisSPWTxCZ7sBRjU6iH9c= github.com/gtank/cryptopasta v0.0.0-20170601214702-1f550f6f2f69/go.mod h1:YLEMZOtU+AZ7dhN9T/IpGhXVGly2bvkJQ+zxj3WeVQo= github.com/hashicorp/go-uuid v0.0.0-20180228145832-27454136f036/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/hydrogen18/memlistener v0.0.0-20141126152155-54553eb933fb/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE= github.com/hypnoglow/gormzap v0.3.0/go.mod h1:5Wom8B7Jl2oK0Im9hs6KQ+Kl92w4Y7gKCrj66rhyvw0= github.com/iancoleman/strcase v0.0.0-20191112232945-16388991a334 h1:VHgatEHNcBFEB7inlalqfNqw65aNkM1lGX2yt3NmbS8= github.com/iancoleman/strcase v0.0.0-20191112232945-16388991a334/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI= +github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0= +github.com/iris-contrib/i18n v0.0.0-20171121225848-987a633949d0/go.mod h1:pMCz62A0xJL6I+umB2YTlFRwWXaDFA0jy+5HzGiJjqI= +github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw= github.com/jcmturner/gofork v0.0.0-20180107083740-2aebee971930/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= +github.com/jedib0t/go-pretty/v6 v6.2.2 h1:o3McN0rQ4X+IU+HduppSp9TwRdGLRW2rhJXy9CJaCRw= +github.com/jedib0t/go-pretty/v6 v6.2.2/go.mod h1:+nE9fyyHGil+PuISTCrp7avEdo6bqoMwqZnuiK2r2a0= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jinzhu/gorm v1.9.12/go.mod h1:vhTjlKSJUTWNtcbQtrMBFCxy7eXTzeCAzfL5fBZT/Qs= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= @@ -299,8 +412,8 @@ github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHW github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= -github.com/joho/sqltocsv v0.0.0-20210208114054-cb2c3a95fb99 h1:yYV8KMzsc4ius4P8A9BK13cY6nFDL3jlVX25HvEXOkw= -github.com/joho/sqltocsv v0.0.0-20210208114054-cb2c3a95fb99/go.mod h1:mAVCUAYtW9NG31eB30umMSLKcDt6mCUWSjoSn5qBh0k= +github.com/joho/sqltocsv v0.0.0-20210428211105-a6d6801d59df h1:Zrb0IbuLOGHL7nrO2WrcuNWgDTlzFv3zY69QMx4ggQE= +github.com/joho/sqltocsv v0.0.0-20210428211105-a6d6801d59df/go.mod h1:mAVCUAYtW9NG31eB30umMSLKcDt6mCUWSjoSn5qBh0k= github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/joomcode/errorx v1.0.1/go.mod h1:kgco15ekB6cs+4Xjzo7SPeXzx38PbJzBwbnu9qfVNHQ= @@ -312,21 +425,33 @@ github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/juju/errors v0.0.0-20181118221551-089d3ea4e4d5/go.mod h1:W54LbzXuIE0boCoNJfwqpmkKJ1O4TCTZMetAt6jGk7Q= +github.com/juju/loggo v0.0.0-20180524022052-584905176618/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U= github.com/juju/ratelimit v1.0.1 h1:+7AIFJVQ0EQgq/K9+0Krm7m530Du7tIz0METWzN0RgY= github.com/juju/ratelimit v1.0.1/go.mod h1:qapgC/Gy+xNh9UxzV13HGGl/6UXNN+ct+vwSgWNm/qk= +github.com/juju/testing v0.0.0-20180920084828-472a3e8b2073/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= +github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= +github.com/kataras/golog v0.0.9/go.mod h1:12HJgwBIZFNGL0EJnMRhmvGA0PQGx8VFwrZtM4CqbAk= +github.com/kataras/iris/v12 v12.0.1/go.mod h1:udK4vLQKkdDqMGJJVd/msuMtN6hpYJhg/lSzuxjhO+U= +github.com/kataras/neffos v0.0.10/go.mod h1:ZYmJC07hQPW67eKuzlfY7SO3bC0mw83A3j6im82hfqw= +github.com/kataras/pio v0.0.0-20190103105442-ea782b38602d/go.mod h1:NV88laa9UiiDuX9AhMbDPkGYSPugBOV6yTZB1l2K9Z0= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= +github.com/klauspost/compress v1.9.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.9.7/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.10.5 h1:7q6vHIqubShURwQz8cQK6yIe/xC3IF0Vm7TGfqjewrc= github.com/klauspost/compress v1.10.5/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/klauspost/compress v1.11.7 h1:0hzRabrMN4tSTvMfnL3SCv1ZGeAP23ynzodBgaHeMeg= +github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/cpuid v1.2.1 h1:vJi+O/nMdFt0vqm8NZBI6wzALWdA2X+egi0ogNyrC/w= github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= @@ -337,6 +462,8 @@ github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvfxNnFqi74g= +github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw= github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= @@ -348,24 +475,30 @@ github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVc github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= +github.com/mattn/go-ieproxy v0.0.1/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/gNWuh88E= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= -github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mattn/go-runewidth v0.0.10 h1:CoZ3S2P7pvtP45xOtBw+/mDL2z0RKI576gSkzRRpdGg= -github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= +github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/mattn/go-runewidth v0.0.12 h1:Y41i/hVW3Pgwr8gV+J23B9YEY0zxjptBuCWEaxmAOow= +github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= github.com/mattn/go-sqlite3 v2.0.1+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mediocregopher/mediocre-go-lib v0.0.0-20181029021733-cb65787f37ed/go.mod h1:dSsfyI2zABAdhcbvkXqgxOxrCsbYeHCPgrZkku60dSg= +github.com/mediocregopher/radix/v3 v3.3.0/go.mod h1:EmfVyvspXz1uZEyPBMyGK+kjWiKQGvsUt6O3Pj+LDCQ= github.com/mgechev/dots v0.0.0-20190921121421-c36f7dcfbb81/go.mod h1:KQ7+USdGKfpPjXk4Ga+5XxQM4Lm4e3gAogrreFAYpOg= github.com/mgechev/revive v1.0.2/go.mod h1:rb0dQy1LVAxW9SWy5R3LPUjevzUbUS316U5MFySA2lo= +github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -376,28 +509,41 @@ github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/montanaflynn/stats v0.5.0 h1:2EkzeTSqBB4V4bJwWrt5gIIrZmpJBcoIRGS2kWLgzmk= github.com/montanaflynn/stats v0.5.0/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= +github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/nats-io/nats.go v1.8.1/go.mod h1:BrFz9vVn0fU3AcH9Vn4Kd7W0NpJ651tD5omQ3M8LwxM= +github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7TDb/4= +github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/ncw/directio v1.0.4 h1:CojwI07mCEmRkajgx42Pf8jyCwTs1ji9/Ij9/PJG12k= github.com/ncw/directio v1.0.4/go.mod h1:CKGdcN7StAaqjT7Qack3lAXeX4pjnyc46YeqZH1yWVY= +github.com/ncw/swift v1.0.52/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= github.com/nfnt/resize v0.0.0-20160724205520-891127d8d1b5/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= github.com/ngaut/pools v0.0.0-20180318154953-b7bc8c42aac7 h1:7KAv7KMGTTqSmYZtNdcNTgsos+vFzULLwyElndwn+5c= github.com/ngaut/pools v0.0.0-20180318154953-b7bc8c42aac7/go.mod h1:iWMfgwqYW+e8n5lC/jjNEhwcjbRDpl5NT7n2h+4UNcI= github.com/ngaut/sync2 v0.0.0-20141008032647-7a24ed77b2ef h1:K0Fn+DoFqNqktdZtdV3bPQ/0cuYh2H4rkg0tytX/07k= github.com/ngaut/sync2 v0.0.0-20141008032647-7a24ed77b2ef/go.mod h1:7WjlapSfwQyo6LNmIvEWzsW1hbBQfpUO4JWnuQRmva8= github.com/nicksnyder/go-i18n v1.10.0/go.mod h1:HrK7VCrbOvQoUAQ7Vpy7i87N7JZZZ7R2xBGjv0j365Q= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/oleiade/reflections v1.0.1/go.mod h1:rdFxbxq4QXVZWj0F+e9jqjDkc7dbp97vkRixKo2JR60= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.13.0 h1:M76yO2HkZASFjXL0HSoZJ1AYEmQxNJmY41Jx1zNUq1Y= +github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/opentracing/basictracer-go v1.0.0 h1:YyUAhaEfjoWXclZVJ9sGoNct7j4TVk7lZWlQw5UXuoo= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/pascaldekloe/name v0.0.0-20180628100202-0fd16699aae1/go.mod h1:eD5JxqMiuNYyFNmyY9rkJ/slN8y59oEu4Ei7F8OoKWQ= github.com/pborman/getopt v0.0.0-20180729010549-6fdd0a2c7117/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.3.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo= @@ -408,13 +554,12 @@ 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.2.0-alpha.0.20210714104733-65ae7dd3a2f2+incompatible h1:KIh0fJHRB44kRPccXl7V0f5mtzXmR+0mM8vNciWst8g= -github.com/pingcap/br v5.2.0-alpha.0.20210714104733-65ae7dd3a2f2+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= github.com/pingcap/check v0.0.0-20200212061837-5e12011dc712 h1:R8gStypOBmpnHEx1qi//SaqxJVI4inOqljg/Aj5/390= github.com/pingcap/check v0.0.0-20200212061837-5e12011dc712/go.mod h1:PYMCGwN0JHjoqGr3HrZoD+b8Tgx8bKnArhSq8YVzUMc= +github.com/pingcap/errcode v0.3.0 h1:IF6LC/4+b1KNwrMlr2rBTUrojFPMexXBcDWZSpNwxjg= github.com/pingcap/errcode v0.3.0/go.mod h1:4b2X8xSqxIroj/IZ9MX/VGZhAwc11wB9wRIzHvz6SeM= github.com/pingcap/errors v0.11.0/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= @@ -434,12 +579,13 @@ github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989 h1:surzm05a8C9dN github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989/go.mod h1:O17XtbryoCJhkKGbT62+L2OlrniwqiGLSqrmdHCMzZw= github.com/pingcap/kvproto v0.0.0-20191211054548-3c6b38ea5107/go.mod h1:WWLmULLO7l8IOcQG+t+ItJ3fEcrL5FxF0Wu+HrMy26w= github.com/pingcap/kvproto v0.0.0-20200411081810-b85805c9476c/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI= -github.com/pingcap/kvproto v0.0.0-20210219064844-c1844a4775d6/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI= +github.com/pingcap/kvproto v0.0.0-20210527074428-73468940541b/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI= github.com/pingcap/kvproto v0.0.0-20210712050333-b66fdbd6bfd5 h1:LN/ml4lm5+AYdn+N/CJ102wFUph2OIpo8hHqi8QxKiQ= github.com/pingcap/kvproto v0.0.0-20210712050333-b66fdbd6bfd5/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI= github.com/pingcap/log v0.0.0-20191012051959-b742a5d432e9/go.mod h1:4rbK1p9ILyIfb6hU7OG2CiWSqMXnp3JMbiaVJ6mvoY8= +github.com/pingcap/log v0.0.0-20191012051959-b742a5d432e9/go.mod h1:4rbK1p9ILyIfb6hU7OG2CiWSqMXnp3JMbiaVJ6mvoY8= +github.com/pingcap/log v0.0.0-20200511115504-543df19646ad/go.mod h1:4rbK1p9ILyIfb6hU7OG2CiWSqMXnp3JMbiaVJ6mvoY8= github.com/pingcap/log v0.0.0-20200511115504-543df19646ad/go.mod h1:4rbK1p9ILyIfb6hU7OG2CiWSqMXnp3JMbiaVJ6mvoY8= -github.com/pingcap/log v0.0.0-20201112100606-8f1e84a3abc8/go.mod h1:4rbK1p9ILyIfb6hU7OG2CiWSqMXnp3JMbiaVJ6mvoY8= github.com/pingcap/log v0.0.0-20210317133921-96f4fcab92a4/go.mod h1:4rbK1p9ILyIfb6hU7OG2CiWSqMXnp3JMbiaVJ6mvoY8= github.com/pingcap/log v0.0.0-20210625125904-98ed8e2eb1c7 h1:k2BbABz9+TNpYRwsCCFS8pEEnFVOdbgEjL/kTlLuzZQ= github.com/pingcap/log v0.0.0-20210625125904-98ed8e2eb1c7/go.mod h1:8AanEdAHATuRurdGxZXBz0At+9avep+ub7U1AGYLIMM= @@ -449,7 +595,7 @@ github.com/pingcap/parser v0.0.0-20210707071004-31c87e37af5c/go.mod h1:Ek0mLKEqU github.com/pingcap/sysutil v0.0.0-20200206130906-2bfa6dc40bcd/go.mod h1:EB/852NMQ+aRKioCpToQ94Wl7fktV+FNnxf3CX/TTXI= github.com/pingcap/sysutil v0.0.0-20210315073920-cc0985d983a3 h1:A9KL9R+lWSVPH8IqUuH1QSTRJ5FGoY1bT2IcfPKsWD8= github.com/pingcap/sysutil v0.0.0-20210315073920-cc0985d983a3/go.mod h1:tckvA041UWP+NqYzrJ3fMgC/Hw9wnmQ/tUkp/JaHly8= -github.com/pingcap/tidb-dashboard v0.0.0-20210312062513-eef5d6404638/go.mod h1:OzFN8H0EDMMqeulPhPMw2i2JaiZWOKFQ7zdRPhENNgo= +github.com/pingcap/tidb-dashboard v0.0.0-20210512074702-4ee3e3909d5e/go.mod h1:7HnQAeqKOuJwCBUeglCUel7SjW6fPNnoXawuv+6Q6Ek= github.com/pingcap/tidb-tools v5.0.3+incompatible h1:vYMrW9ux+3HRMeRZ1fUOjy2nyiodtuVyAyK270EKBEs= github.com/pingcap/tidb-tools v5.0.3+incompatible/go.mod h1:XGdcy9+yqlDSEMTpOXnwf3hiTeqrV6MN/u1se9N8yIM= github.com/pingcap/tipb v0.0.0-20210708040514-0f154bb0dc0f h1:q6WgGOeY+hbkvtKLyi6nAew7Ptl5vXyeI61VJuJdXnQ= @@ -458,13 +604,14 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v0.9.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.2.1/go.mod h1:XMU6Z2MjaRKVu/dC1qupJI9SiNkDYzz3xecMgSW/F+U= +github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= github.com/prometheus/client_golang v1.5.1 h1:bdHYieyGlH+6OLEk2YQha8THib30KP0/yD0YH9m6xcA= github.com/prometheus/client_golang v1.5.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= @@ -476,12 +623,13 @@ github.com/prometheus/common v0.0.0-20181020173914-7e9e6cabbd39/go.mod h1:daVV7q github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= +github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= github.com/prometheus/common v0.9.1 h1:KOMtN28tlbam3/7ZKEYKHhKoJZYYj3gMH4uc62x7X7U= github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= github.com/prometheus/procfs v0.0.8 h1:+fpWZdT24pJBiqJdAwYBjPSk+5YmQzYNPYzQsdzLkt8= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= @@ -498,8 +646,10 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= 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/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/sergi/go-diff v1.0.1-0.20180205163309-da645544ed44/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= 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= @@ -508,14 +658,18 @@ github.com/shirou/gopsutil v3.21.2+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc= github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 h1:bUGsEnyNbVPw06Bs80sCeARAlK8lhwqGyi6UT8ymuGk= github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= +github.com/shurcooL/httpgzip v0.0.0-20190720172056-320755c1c1b0 h1:mj/nMDAwTBiaCqMEs4cYCqF7pO6Np7vhy1D1wcQGz+E= github.com/shurcooL/httpgzip v0.0.0-20190720172056-320755c1c1b0/go.mod h1:919LwcH0M7/W4fcZ0/jy0qGght1GIhqyS/EgWGH2j5Q= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd h1:ug7PpSOB5RBPK1Kg6qskGBoP3Vnj/aNYFTznWvlkGo0= github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= +github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4 h1:0HKaf1o97UwFjHH9o5XsHUOF+tqmdA7KEzXLpiyaw0E= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ= @@ -553,7 +707,7 @@ github.com/swaggo/swag v1.6.3/go.mod h1:wcc83tB4Mb2aNiL/HP4MFeQdpHUrca+Rp/DRNgWA github.com/swaggo/swag v1.6.6-0.20200529100950-7c765ddd0476/go.mod h1:xDhTyuFIujYiN3DKWC/H/83xcfHp+UE/IzWWampG7Zc= github.com/syndtr/goleveldb v1.0.1-0.20190318030020-c3a204f8e965 h1:1oFLiOyVl+W7bnBzGhf7BbIv9loSFQcieWWYIjLqcAw= github.com/syndtr/goleveldb v1.0.1-0.20190318030020-c3a204f8e965/go.mod h1:9OrXJhf154huy1nPWmuSrkgjPUtUNhA+Zmy+6AESzuA= -github.com/thoas/go-funk v0.7.0/go.mod h1:+IWnUfUmFO1+WVYQWQtIJHeRRdaIyyYglZN7xzUPe4Q= +github.com/thoas/go-funk v0.8.0/go.mod h1:+IWnUfUmFO1+WVYQWQtIJHeRRdaIyyYglZN7xzUPe4Q= github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2 h1:mbAskLJ0oJfDRtkanvQPiooDH8HvJ2FBh+iKT/OmiQQ= github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2/go.mod h1:2PfKggNGDuadAa0LElHrByyrz4JPZ9fFx6Gs7nx7ZZU= github.com/tidwall/gjson v1.3.5/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls= @@ -561,8 +715,8 @@ github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tikv/client-go/v2 v2.0.0-alpha.0.20210716061512-f99e5a9251ff h1:TcEz4Z/V1IGRtlpVurlo/RrqVEYOPC/dndhYbCcB+aE= github.com/tikv/client-go/v2 v2.0.0-alpha.0.20210716061512-f99e5a9251ff/go.mod h1:+bOiuuZZUqIq19EqyhTWQFaB0PeXLOh/il1vnVZx3Tk= -github.com/tikv/pd v1.1.0-beta.0.20210323121136-78679e5e209d h1:K0XnvsnT6ofLDuM8Rt3PuFQO4p8bNraeHYstspD316g= -github.com/tikv/pd v1.1.0-beta.0.20210323121136-78679e5e209d/go.mod h1:Jw9KG11C/23Rr7DW4XWQ7H5xOgGZo6DFL1OKAF4+Igw= +github.com/tikv/pd v1.1.0-beta.0.20210609101029-3ba158cf41a4 h1:QljEYXHc2krYg6f1zol6f7Ut9QBDtK1UVm9UZOT0YFE= +github.com/tikv/pd v1.1.0-beta.0.20210609101029-3ba158cf41a4/go.mod h1:4AiyUYyIG4cA7P+xDU/Mep0yo4Hb+2IfFstiOSKFbJ4= github.com/tklauser/go-sysconf v0.3.4 h1:HT8SVixZd3IzLdfs/xlpq0jeSfTX57g1v6wB1EuzV7M= github.com/tklauser/go-sysconf v0.3.4/go.mod h1:Cl2c8ZRWfHD5IrfHo9VN+FX9kCFjIOyVklgXycLB6ek= github.com/tklauser/numcpus v0.2.1 h1:ct88eFm+Q7m2ZfXJdan1xYoXKlmwsfP+k88q05KvlZc= @@ -576,8 +730,8 @@ github.com/uber-go/atomic v1.4.0 h1:yOuPqEq4ovnhEjpHmfFwsqBXDYbQeT6Nb0bwD6XnD5o= github.com/uber-go/atomic v1.4.0/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g= github.com/uber/jaeger-client-go v2.22.1+incompatible h1:NHcubEkVbahf9t3p75TOCR83gdUHXjRJvjoBh1yACsM= github.com/uber/jaeger-client-go v2.22.1+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= -github.com/uber/jaeger-lib v2.4.0+incompatible h1:fY7QsGQWiCt8pajv4r7JEvmATdCVaWxXbjwyYwsNaLQ= -github.com/uber/jaeger-lib v2.4.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= +github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg= +github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go v1.1.5-pre/go.mod h1:FwP/aQVg39TXzItUBMwnWp9T9gPQnXw4Poh4/oBQZ/0= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= @@ -585,25 +739,43 @@ github.com/ugorji/go/codec v0.0.0-20181022190402-e5e69e061d4f/go.mod h1:VFNgLljT github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ugorji/go/codec v1.1.5-pre/go.mod h1:tULtS6Gy1AE1yCENaw4Vb//HLH5njI2tfCQDUqRd8fI= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= +github.com/unrolled/render v1.0.1 h1:VDDnQQVfBMsOsp3VaCJszSO0nkBIVEYoPWeRThk9spY= github.com/unrolled/render v1.0.1/go.mod h1:gN9T0NhL4Bfbwu8ann7Ry/TGHYfosul+J0obPf6NBdM= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli/v2 v2.1.1/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ= github.com/urfave/negroni v0.3.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= +github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc= +github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w= +github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= +github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= github.com/vmihailenco/msgpack/v4 v4.3.11/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4= github.com/vmihailenco/msgpack/v5 v5.0.0-beta.1/go.mod h1:xlngVLeyQ/Qi05oQxhQ+oTuqa03RjMwMfk/7/TCs+QI= github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= github.com/wangjohn/quickselect v0.0.0-20161129230411-ed8402a42d5f h1:9DDCDwOyEy/gId+IEMrFHLuQ5R/WV0KNxWLler8X2OY= github.com/wangjohn/quickselect v0.0.0-20161129230411-ed8402a42d5f/go.mod h1:8sdOQnirw1PrcnTJYkmW1iOHtUmblMmGdUOHyWYycLI= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= +github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xitongsys/parquet-go v1.5.1/go.mod h1:xUxwM8ELydxh4edHGegYq1pA8NnMKDx0K/GyB0o2bww= -github.com/xitongsys/parquet-go v1.5.5-0.20201110004701-b09c49d6d457 h1:tBbuFCtyJNKT+BFAv6qjvTFpVdy97IYNaBwGUXifIUs= -github.com/xitongsys/parquet-go v1.5.5-0.20201110004701-b09c49d6d457/go.mod h1:pheqtXeHQFzxJk45lRQ0UIGIivKnLXvialZSFWs81A8= +github.com/xitongsys/parquet-go v1.6.0 h1:j6YrTVZdQx5yywJLIOklZcKVsCoSD1tqOVRXyTBFSjs= +github.com/xitongsys/parquet-go v1.6.0/go.mod h1:pheqtXeHQFzxJk45lRQ0UIGIivKnLXvialZSFWs81A8= github.com/xitongsys/parquet-go-source v0.0.0-20190524061010-2b72cbee77d5/go.mod h1:xxCx7Wpym/3QCo6JhujJX51dzSXrwmb0oH6FQb39SEA= github.com/xitongsys/parquet-go-source v0.0.0-20200817004010-026bad9b25d0/go.mod h1:HYhIKsdns7xz80OgkbgJYrtQY7FjHWHKH6cvN7+czGE= +github.com/xitongsys/parquet-go-source v0.0.0-20201108113611-f372b7d813be h1:33jqDHcXK6vfgtLossgwZmTXyLCdPZU3/KZ3988bk3Q= +github.com/xitongsys/parquet-go-source v0.0.0-20201108113611-f372b7d813be/go.mod h1:SQSSW1CBj/egoUhnaTXihUlDayvpp01Fn8qwuEpK5bY= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI= github.com/yookoala/realpath v1.0.0/go.mod h1:gJJMA9wuX7AcqLy1+ffPatSCySA1FQ2S8Ya9AIoYBpE= +github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= +github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= +github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= @@ -617,8 +789,11 @@ go.etcd.io/etcd v0.5.0-alpha.5.0.20200824191128-ae9734ed278b/go.mod h1:yVHk9ub3C go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= +go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= +go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= @@ -657,27 +832,32 @@ golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a h1:vclmkQCjlDX5OydZ9wv8rBCcS0QyQY66Mpf/7BZbInM= golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= -golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6 h1:QE6XYQK6naiK1EPAe1g/ILLxN5RBoH5xkJk3CqlMI/Y= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/exp v0.0.0-20200513190911-00229845015e h1:rMqLP+9XLy+LdbCXHjJHAmTfXCr93W7oruWA6Hq1Alc= +golang.org/x/exp v0.0.0-20200513190911-00229845015e/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= +golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20200119044424-58c23975cae1/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= @@ -686,6 +866,8 @@ golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= @@ -696,10 +878,11 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -707,6 +890,7 @@ golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -715,37 +899,61 @@ golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR golang.org/x/net v0.0.0-20190611141213-3f473d35a33a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 h1:4nGaVu0QrbjT/AK2PRLuQfQuh6DJve+pELhqTdAj3x0= +golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420 h1:a8jGStKg0XqKDlKqjLrXn0ioF5MH36pT7Z0BRTqLhbk= +golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914 h1:3B43BWw0xEBsLZ/NO1VALz6fppU3481pik+2Ksv45z8= +golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180816055513-1c9583448a9c/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -764,16 +972,16 @@ golang.org/x/sys v0.0.0-20190610200419-93c9922d18ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -781,19 +989,38 @@ golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210217105451-b926d437f341/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= +golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 h1:RqytpXGR1iVNX7psjB3ff8y7sNFinVFvkx1c8SjBkio= +golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -802,16 +1029,21 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190327201419-c70d86f8b7cf/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524210228-3d17549cdc6b/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190606050223-4d9ae51c2468/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190611222205-d73e1c7e250b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= @@ -832,8 +1064,6 @@ golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -842,11 +1072,24 @@ golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200225230052-807dcd883420/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200527183253-8e7acdbce89d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= +golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201125231158-b5590deeca9b/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210112230658-8b4aab62c064/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4 h1:cVngSRcfgyZCzys3KYOpCFa+4dqX/Oub9tAq00ttGVs= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -854,6 +1097,10 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= +gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= +gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= +gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -862,14 +1109,27 @@ google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsb google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.18.0 h1:TgDr+1inK2XVUKZx3BYAqQg/GwucGdBkzZjWaTg/I+A= google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= +google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= +google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= +google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= +google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= +google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= +google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= +google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= +google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= +google.golang.org/api v0.50.0 h1:LX7NFCFYOHzr7WHaYiRUpeipZe9o5L8T+2F4Z798VDw= +google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= +google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20181004005441-af9cb2a35e7f/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -882,38 +1142,61 @@ google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBr google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63 h1:YzfoEYWbODU5Fbt37+h7X16BWQbad7Q4S6gclTKFXM8= google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/grpc v0.0.0-20180607172857-7a6a684ca69e/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= +google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= +google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= +google.golang.org/genproto v0.0.0-20210701133433-6b8dcf568a95 h1:xyRjacsGcaSoZ2fTcaLCSzh2JEceLLOT4X8k32Q0xAQ= +google.golang.org/genproto v0.0.0-20210701133433-6b8dcf568a95/go.mod h1:yiaVoXHpRzHGyxV3o4DktVWY4mSUErTKaeEOq6C3t3U= google.golang.org/grpc v1.27.1 h1:zvIju4sqAGvwKspUQOhwnpcqSbzi7/H6QomNNjTL4sk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/alecthomas/gometalinter.v2 v2.0.12/go.mod h1:NDRytsqEZyolNuAgTzJkZMkSQM7FIKyzVzGhjB/qfYo= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/alecthomas/kingpin.v3-unstable v3.0.0-20180810215634-df19058c872c/go.mod h1:3HH7i1SgMqlzxCcBmUHW657sD4Kvv9sC3HpL3YukzwA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y= @@ -923,6 +1206,7 @@ gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod h1:m3v+5svpVOhtFAP/wSz+yzh4Mc0Fg7eR gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod h1:oG2kH0IvSYNIu80dVAyu/yoefjq1mNfM5bm88whjWx4= gopkg.in/jcmturner/gokrb5.v7 v7.3.0/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuvyavf11/WM= gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod h1:YIdkC4XfD6GXbzje11McwsDuOlZQSb9W4vfLvuNnlv8= +gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= @@ -936,6 +1220,7 @@ gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= @@ -947,12 +1232,12 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.2.0 h1:ws8AfbgTX3oIczLPNPCu5166oBg9ST2vNs0rcht+mDE= honnef.co/go/tools v0.2.0/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= -modernc.org/mathutil v1.2.2 h1:+yFk8hBprV+4c0U9GjFtL+dV3N8hOJ8JCituQcMShFY= -modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= +modernc.org/mathutil v1.4.1 h1:ij3fYGe8zBF4Vu+g0oT7mB06r8sqGWKuJu1yXeR4by8= +modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= From cc376c95240a7533c969dff8bb94861ca91f95f9 Mon Sep 17 00:00:00 2001 From: 3pointer Date: Mon, 5 Jul 2021 14:07:41 +0800 Subject: [PATCH 4/7] fix test in makefile --- Makefile | 120 +++++++++++--------- Makefile.common | 6 +- br/Makefile | 267 --------------------------------------------- tools/check/go.mod | 1 + tools/check/go.sum | 2 + 5 files changed, 75 insertions(+), 321 deletions(-) delete mode 100644 br/Makefile diff --git a/Makefile b/Makefile index debbd4665b726..f28837e76766c 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ include Makefile.common -.PHONY: all clean test gotest server dev benchkv benchraw check checklist parser tidy ddltest web +.PHONY: all clean test gotest server dev benchkv benchraw check checklist parser tidy ddltest br_web default: server buildsucc @@ -104,44 +104,6 @@ testSuite: clean: failpoint-disable $(GO) clean -i ./... -build_tools: build_br build_lightning build_lightning-ctl - -br_web: - @cd br/web && npm install && npm run build - -build_br: - $(GOBUILD) $(RACEFLAG) -o $(BR_BIN) br/cmd/br/*.go - -build_lightning_for_web: - $(GOBUILD) $(RACEFLAG) -tags dev -o $(LIGHTNING_BIN) br/cmd/tidb-lightning/main.go - -build_lightning: - $(GOBUILD) $(RACEFLAG) -o $(LIGHTNING_BIN) br/cmd/tidb-lightning/main.go - -build_lightning-ctl: - $(GOBUILD) $(RACEFLAG) -o $(LIGHTNING_CTL_BIN) br/cmd/tidb-lightning-ctl/main.go - -build_for_br_integration_test: - @make failpoint-enable - ($(GOTEST) -c -cover -covermode=count \ - -coverpkg=$(BR_PKG)/... \ - -o $(BR_BIN).test \ - github.com/pingcap/br/cmd/br && \ - $(GOTEST) -c -cover -covermode=count \ - -coverpkg=$(BR_PKG)/... \ - -o $(LIGHTNING_BIN).test \ - github.com/pingcap/br/cmd/tidb-lightning && \ - $(GOTEST) -c -cover -covermode=count \ - -coverpkg=$(BR_PKG)/... \ - -o $(LIGHTNING_CTL_BIN).test \ - github.com/pingcap/br/cmd/tidb-lightning-ctl && \ - $(GOBUILD) $(RACEFLAG) -o bin/locker br/tests/br_key_locked/*.go && \ - $(GOBUILD) $(RACEFLAG) -o bin/gc br/tests/br_z_gc_safepoint/*.go && \ - $(GOBUILD) $(RACEFLAG) -o bin/oauth br/tests/br_gcs/*.go && \ - $(GOBUILD) $(RACEFLAG) -o bin/rawkv br/tests/br_rawkv/*.go && \ - $(GOBUILD) $(RACEFLAG) -o bin/parquet_gen br/tests/lightning_checkpoint_parquet/*.go \ - ) || (make failpoint-disable && exit 1) - @make failpoint-disable # Split tests for CI to run `make test` in parallel. test: test_part_1 test_part_2 test_part_br @@ -153,15 +115,6 @@ test_part_2: gotest gogenerate test_part_br: br_unit_test br_integration_test -br_integration_test: br_bins br_build br_build_for_integration_test - @cd br && tests/run.sh - -br_compatibility_test_prepare: - @cd br && tests/run_compatible.sh prepare - -br_compatibility_test: - @cd br && tests/run_compatible.sh run - explaintest: server_check @cd cmd/explaintest && ./run-tests.sh -s ../../bin/tidb-server @@ -182,7 +135,7 @@ ifeq ("$(TRAVIS_COVERAGE)", "1") @export log_level=info; \ $(OVERALLS) -project=github.com/pingcap/tidb \ -covermode=count \ - -ignore='.git,vendor,cmd,docs,tests,LICENSES' \ + -ignore='.git,br,vendor,cmd,docs,tests,LICENSES' \ -concurrency=4 \ -- -coverpkg=./... \ || { $(FAILPOINT_DISABLE); exit 1; } @@ -293,6 +246,10 @@ tools/bin/errdoc-gen: tools/check/go.mod tools/bin/golangci-lint: curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b ./tools/bin v1.41.1 +tools/bin/vfsgendev: tools/check/go.mod + cd tools/check; \ + $(GO) build -o ../bin/vfsgendev github.com/shurcooL/vfsgen/cmd/vfsgendev + # Usage: # # $ make vectorized-bench VB_FILE=Time VB_FUNC=builtinCurrentDateSig @@ -320,6 +277,61 @@ bench-daily: cd ./session && \ go test -run TestBenchDaily --date `git log -n1 --date=unix --pretty=format:%cd` --commit `git log -n1 --pretty=format:%h` --outfile $(TO) +build_tools: build_br build_lightning build_lightning-ctl + +br_web: + @cd br/web && npm install && npm run build + +build_br: + $(GOBUILD) $(RACE_FLAG) -o $(BR_BIN) br/cmd/br/*.go + +build_lightning_for_web: + $(GOBUILD) $(RACE_FLAG) -tags dev -o $(LIGHTNING_BIN) br/cmd/tidb-lightning/main.go + +build_lightning: + $(GOBUILD) $(RACE_FLAG) -o $(LIGHTNING_BIN) br/cmd/tidb-lightning/main.go + +build_lightning-ctl: + $(GOBUILD) $(RACE_FLAG) -o $(LIGHTNING_CTL_BIN) br/cmd/tidb-lightning-ctl/main.go + +build_for_br_integration_test: + @make failpoint-enable + ($(GOTEST) -c -cover -covermode=count \ + -coverpkg=github.com/pingcap/tidb/br/... \ + -o $(BR_BIN).test \ + github.com/pingcap/tidb/br/cmd/br && \ + $(GOTEST) -c -cover -covermode=count \ + -coverpkg=github.com/pingcap/tidb/br/... \ + -o $(LIGHTNING_BIN).test \ + github.com/pingcap/tidb/br/cmd/tidb-lightning && \ + $(GOTEST) -c -cover -covermode=count \ + -coverpkg=github.com/pingcap/tidb/br/... \ + -o $(LIGHTNING_CTL_BIN).test \ + github.com/pingcap/tidb/br/cmd/tidb-lightning-ctl && \ + $(GOBUILD) $(RACE_FLAG) -o bin/locker br/tests/br_key_locked/*.go && \ + $(GOBUILD) $(RACE_FLAG) -o bin/gc br/tests/br_z_gc_safepoint/*.go && \ + $(GOBUILD) $(RACE_FLAG) -o bin/oauth br/tests/br_gcs/*.go && \ + $(GOBUILD) $(RACE_FLAG) -o bin/rawkv br/tests/br_rawkv/*.go && \ + $(GOBUILD) $(RACE_FLAG) -o bin/parquet_gen br/tests/lightning_checkpoint_parquet/*.go \ + ) || (make failpoint-disable && exit 1) + @make failpoint-disable + +br_unit_test: export ARGS=$$($(BR_PACKAGES)) +br_unit_test: + @make failpoint-enable + $(GOTEST) $(RACE_FLAG) -tags leak $(ARGS) || ( make failpoint-disable && exit 1 ) + @make failpoint-disable + +br_integration_test: br_bins build_br build_for_br_integration_test + @cd br && tests/run.sh + +br_compatibility_test_prepare: + @cd br && tests/run_compatible.sh prepare + +br_compatibility_test: + @cd br && tests/run_compatible.sh run +>>>>>>> 83df3a513 (fix test in makefile) + # There is no FreeBSD environment for GitHub actions. So cross-compile on Linux # but that doesn't work with CGO_ENABLED=1, so disable cgo. The reason to have # cgo enabled on regular builds is performance. @@ -330,7 +342,7 @@ endif br_coverage: tools/bin/gocovmerge "$(TEST_DIR)"/cov.* | grep -vE ".*.pb.go|.*__failpoint_binding__.go" > "$(TEST_DIR)/all_cov.out" ifeq ("$(JenkinsCI)", "1") - tools/bin/goveralls -coverprofile=$(TEST_DIR)/all_cov.out -service=jenkins-ci -repotoken $(COVERALLS_TOKEN) + tools/bin/goveralls -coverprofile=$(TEST_DIR)/all_cov.out -service=jenkins-ci -repotoken $(COVERALLS_TOKEN) else go tool cover -html "$(TEST_DIR)/all_cov.out" -o "$(TEST_DIR)/all_cov.html" grep -F ' $@ + @rm tmp_parser.go + +data_parsers: tools/bin/vfsgendev br/pkg/lightning/mydump/parser_generated.go br_web + PATH="$(GOPATH)/bin":"$(PATH)":"$(TOOLS)" protoc -I. -I"$(GOPATH)/src" br/pkg/lightning/checkpoints/checkpointspb/file_checkpoints.proto --gogofaster_out=. + tools/bin/vfsgendev -source='"github.com/pingcap/br/pkg/lightning/web".Res' && mv res_vfsdata.go br/pkg/lightning/web/ diff --git a/Makefile.common b/Makefile.common index c2f6a941e5bc9..2ae7791a52755 100644 --- a/Makefile.common +++ b/Makefile.common @@ -43,7 +43,7 @@ endif ARCH := "`uname -s`" LINUX := "Linux" MAC := "Darwin" -PACKAGE_LIST := go list ./...| grep -vE "cmd|github.com\/pingcap\/tidb\/tests" +PACKAGE_LIST := go list ./...| grep -vE "cmd|github.com\/pingcap\/tidb\/tests|github.com\/pingcap\/tidb\/br" PACKAGES ?= $$($(PACKAGE_LIST)) PACKAGE_DIRECTORIES := $(PACKAGE_LIST) | sed 's|github.com/pingcap/$(PROJECT)/||' FILES := $$(find $$($(PACKAGE_DIRECTORIES)) -name "*.go") @@ -79,10 +79,8 @@ ifeq ("$(WITH_CHECK)", "1") CHECK_FLAG = $(TEST_LDFLAGS) endif +BR_PACKAGES := go list ./...| grep "github.com\/pingcap\/tidb\/br" LIGHTNING_BIN := bin/tidb-lightning LIGHTNING_CTL_BIN := bin/tidb-lightning-ctl BR_BIN := bin/br -VFSGENDEV_BIN := tools/bin/vfsgendev TEST_DIR := /tmp/backup_restore_test - - diff --git a/br/Makefile b/br/Makefile deleted file mode 100644 index 8faf1a548621a..0000000000000 --- a/br/Makefile +++ /dev/null @@ -1,267 +0,0 @@ -PROTOC ?= $(shell which protoc) -CWD := $(shell pwd) -TOOLS := $(CWD)/tools/bin -PACKAGES := go list ./... | grep -vE 'vendor|tools' -COVERED_PACKAGES := $(PACKAGES) | grep -vE 'mock|tests|checkpointspb' -PACKAGE_DIRECTORIES := $(PACKAGES) | sed 's/github.com\/pingcap\/br\/*//' -PACKAGE_FILES := $$(find . -name '*.go' -type f | grep -vE 'vendor|\.pb\.go|mock|tools|res_vfsdata') -CHECKER := awk '{ print } END { if (NR > 0) { exit 1 } }' - -BR_PKG := github.com/pingcap/br - -RELEASE_VERSION = -ifeq ($(RELEASE_VERSION),) - RELEASE_VERSION := v5.0.0-master - release_version_regex := ^v5\..*$$ - release_branch_regex := "^release-[0-9]\.[0-9].*$$|^HEAD$$|^.*/*tags/v[0-9]\.[0-9]\..*$$" - ifneq ($(shell git rev-parse --abbrev-ref HEAD | egrep $(release_branch_regex)),) - # If we are in release branch, try to use tag version. - ifneq ($(shell git describe --tags --dirty | egrep $(release_version_regex)),) - RELEASE_VERSION := $(shell git describe --tags --dirty) - endif - else ifneq ($(shell git status --porcelain),) - # Add -dirty if the working tree is dirty for non release branch. - RELEASE_VERSION := $(RELEASE_VERSION)-dirty - endif -endif - -LDFLAGS += -X "$(BR_PKG)/pkg/version/build.ReleaseVersion=$(RELEASE_VERSION)" -LDFLAGS += -X "$(BR_PKG)/pkg/version/build.BuildTS=$(shell date -u '+%Y-%m-%d %I:%M:%S')" -LDFLAGS += -X "$(BR_PKG)/pkg/version/build.GitHash=$(shell git rev-parse HEAD)" -LDFLAGS += -X "$(BR_PKG)/pkg/version/build.GitBranch=$(shell git rev-parse --abbrev-ref HEAD)" - -LIGHTNING_BIN := bin/tidb-lightning -LIGHTNING_CTL_BIN := bin/tidb-lightning-ctl -BR_BIN := bin/br -VFSGENDEV_BIN := tools/bin/vfsgendev -TEST_DIR := /tmp/backup_restore_test - -path_to_add := $(addsuffix /bin,$(subst :,/bin:,$(GOPATH))) -export PATH := $(path_to_add):$(PATH) - -GOBUILD := CGO_ENABLED=1 GO111MODULE=on go build -trimpath -ldflags '$(LDFLAGS)' -GOTEST := CGO_ENABLED=1 GO111MODULE=on go test -ldflags '$(LDFLAGS)' -PREPARE_MOD := cp go.mod1 go.mod && cp go.sum1 go.sum -FINISH_MOD := cp go.mod go.mod1 && cp go.sum go.sum1 - -RACEFLAG = -ifeq ("$(WITH_RACE)", "1") - RACEFLAG = -race - GOBUILD = CGO_ENABLED=1 GO111MODULE=on $(GO) build -ldflags '$(LDFLAGS)' -endif - -# There is no FreeBSD environment for GitHub actions. So cross-compile on Linux -# but that doesn't work with CGO_ENABLED=1, so disable cgo. The reason to have -# cgo enabled on regular builds is performance. -ifeq ("$(GOOS)", "freebsd") - GOBUILD = CGO_ENABLED=0 GO111MODULE=on go build -trimpath -ldflags '$(LDFLAGS)' -endif - -all: build check test - -prepare: - $(PREPARE_MOD) - -finish-prepare: - $(FINISH_MOD) - -%_generated.go: %.rl - ragel -Z -G2 -o tmp_parser.go $< - @echo '// Code generated by ragel DO NOT EDIT.' | cat - tmp_parser.go | sed 's|//line |//.... |g' > $@ - @rm tmp_parser.go - -data_parsers: tools pkg/lightning/mydump/parser_generated.go web - PATH="$(GOPATH)/bin":"$(PATH)":"$(TOOLS)" protoc -I. -I"$(GOPATH)/src" pkg/lightning/checkpoints/checkpointspb/file_checkpoints.proto --gogofaster_out=. - $(TOOLS)/vfsgendev -source='"github.com/pingcap/br/pkg/lightning/web".Res' && mv res_vfsdata.go pkg/lightning/web/ - -web: - cd web && npm install && npm run build - -build: br lightning lightning-ctl - -br: - $(PREPARE_MOD) - $(GOBUILD) $(RACEFLAG) -o $(BR_BIN) cmd/br/*.go - -lightning_for_web: - $(PREPARE_MOD) - $(GOBUILD) $(RACEFLAG) -tags dev -o $(LIGHTNING_BIN) cmd/tidb-lightning/main.go - -lightning: - $(PREPARE_MOD) - $(GOBUILD) $(RACEFLAG) -o $(LIGHTNING_BIN) cmd/tidb-lightning/main.go - -lightning-ctl: - $(PREPARE_MOD) - $(GOBUILD) $(RACEFLAG) -o $(LIGHTNING_CTL_BIN) cmd/tidb-lightning-ctl/main.go - -build_for_integration_test: - $(PREPARE_MOD) - @make failpoint-enable - ($(GOTEST) -c -cover -covermode=count \ - -coverpkg=$(BR_PKG)/... \ - -o $(BR_BIN).test \ - github.com/pingcap/br/cmd/br && \ - $(GOTEST) -c -cover -covermode=count \ - -coverpkg=$(BR_PKG)/... \ - -o $(LIGHTNING_BIN).test \ - github.com/pingcap/br/cmd/tidb-lightning && \ - $(GOTEST) -c -cover -covermode=count \ - -coverpkg=$(BR_PKG)/... \ - -o $(LIGHTNING_CTL_BIN).test \ - github.com/pingcap/br/cmd/tidb-lightning-ctl && \ - $(GOBUILD) $(RACEFLAG) -o bin/locker tests/br_key_locked/*.go && \ - $(GOBUILD) $(RACEFLAG) -o bin/gc tests/br_z_gc_safepoint/*.go && \ - $(GOBUILD) $(RACEFLAG) -o bin/oauth tests/br_gcs/*.go && \ - $(GOBUILD) $(RACEFLAG) -o bin/rawkv tests/br_rawkv/*.go && \ - $(GOBUILD) $(RACEFLAG) -o bin/parquet_gen tests/lightning_checkpoint_parquet/*.go \ - ) || (make failpoint-disable && exit 1) - @make failpoint-disable - -test: export ARGS=$$($(PACKAGES)) -test: - $(PREPARE_MOD) - @make failpoint-enable - $(GOTEST) $(RACEFLAG) -tags leak $(ARGS) || ( make failpoint-disable && exit 1 ) - @make failpoint-disable - -testcover: tools - mkdir -p "$(TEST_DIR)" - $(PREPARE_MOD) - @make failpoint-enable - $(GOTEST) -cover -covermode=count -coverprofile="$(TEST_DIR)/cov.unit.out" \ - $$($(COVERED_PACKAGES)) || ( make failpoint-disable && exit 1 ) - @make failpoint-disable - -integration_test: bins build build_for_integration_test - tests/run.sh - -compatibility_test_prepare: - tests/run_compatible.sh prepare - -compatibility_test: br - tests/run_compatible.sh run - -coverage: tools - tools/bin/gocovmerge "$(TEST_DIR)"/cov.* | grep -vE ".*.pb.go|.*__failpoint_binding__.go" > "$(TEST_DIR)/all_cov.out" -ifeq ("$(JenkinsCI)", "1") - tools/bin/goveralls -coverprofile=$(TEST_DIR)/all_cov.out -service=jenkins-ci -repotoken $(COVERALLS_TOKEN) -else - go tool cover -html "$(TEST_DIR)/all_cov.out" -o "$(TEST_DIR)/all_cov.html" - grep -F '&1 | $(CHECKER) - # TODO: go vet lightning packages too. - tools/bin/govet --shadow $$($(PACKAGE_DIRECTORIES) | grep -v "lightning") 2>&1 | $(CHECKER) - - # TODO: lint lightning packages too. - @# why some lints are disabled? - @# gochecknoglobals - disabled because we do use quite a lot of globals - @# goimports - executed above already, gofumports - @# gofmt - ditto - @# gci - ditto - @# wsl - too pedantic about the formatting - @# funlen - PENDING REFACTORING - @# gocognit - PENDING REFACTORING - @# godox - TODO - @# gomnd - too many magic numbers, and too pedantic (even 2*x got flagged...) - @# testpackage - several test packages still rely on private functions - @# nestif - PENDING REFACTORING - @# goerr113 - it mistaken pingcap/errors with standard errors - @# lll - pingcap/errors may need to write a long line - @# paralleltest - no need to run test parallel - @# nlreturn - no need to ensure a new line before continue or return - @# exhaustivestruct - Protobuf structs have hidden fields, like "XXX_NoUnkeyedLiteral" - @# exhaustive - no need to check exhaustiveness of enum switch statements - @# gosec - too many false positive - @# errorlint - pingcap/errors is incompatible with std errors. - @# wrapcheck - there are too many unwrapped errors in tidb-lightning - CGO_ENABLED=0 tools/bin/golangci-lint run --enable-all --deadline 120s \ - --disable gochecknoglobals \ - --disable goimports \ - --disable gofmt \ - --disable gci \ - --disable wsl \ - --disable funlen \ - --disable gocognit \ - --disable godox \ - --disable gomnd \ - --disable testpackage \ - --disable nestif \ - --disable goerr113 \ - --disable lll \ - --disable paralleltest \ - --disable nlreturn \ - --disable exhaustivestruct \ - --disable exhaustive \ - --disable godot \ - --disable gosec \ - --disable errorlint \ - --disable wrapcheck \ - $(PACKAGE_DIRECTORIES) - # pingcap/errors APIs are mixed with multiple patterns 'pkg/errors', - # 'juju/errors' and 'pingcap/parser'. To avoid confusion and mistake, - # we only allow a subset of APIs, that's "Normalize|Annotate|Trace|Cause|Find". - # TODO: check lightning packages. - @# TODO: allow more APIs when we need to support "workaound". - grep -Rn --include="*.go" --exclude="*_test.go" -E "(\t| )errors\.[A-Z]" \ - $$($(PACKAGE_DIRECTORIES) | grep -vE "tests|lightning") | \ - grep -vE "Normalize|Annotate|Trace|Cause|RedactLogEnabled|Find" 2>&1 | $(CHECKER) - # The package name of "github.com/pingcap/kvproto/pkg/backup" collides - # "github.com/pingcap/br/pkg/backup", so we rename kvproto to backuppb. - grep -Rn --include="*.go" -E '"github.com/pingcap/kvproto/pkg/backup"' \ - $$($(PACKAGE_DIRECTORIES)) | \ - grep -vE "backuppb" | $(CHECKER) - -lint: prepare tools - @echo "linting" - # TODO: lint lightning packages. - CGO_ENABLED=0 tools/bin/revive -formatter friendly -config revive.toml $$($(PACKAGES) | grep -v "lightning") - -tidy: - @echo "go mod tidy" - $(PREPARE_MOD) - GO111MODULE=on go mod tidy - $(FINISH_MOD) - cd tests && GO111MODULE=on go mod tidy - git diff --exit-code go.mod1 go.sum1 tools/go.mod tools/go.sum - -errdoc: tools - @echo "generator errors.toml" - ./tools/check-errdoc.sh - -failpoint-enable: tools - tools/bin/failpoint-ctl enable - -failpoint-disable: tools - tools/bin/failpoint-ctl disable - -.PHONY: tools web diff --git a/tools/check/go.mod b/tools/check/go.mod index 90b34e7a296c4..eb07ce556ffdd 100644 --- a/tools/check/go.mod +++ b/tools/check/go.mod @@ -14,6 +14,7 @@ require ( github.com/pingcap/errors v0.11.5-0.20210513014640-40f9a1999b3b // indirect github.com/pingcap/failpoint v0.0.0-20200702092429-9f69995143ce // indirect github.com/securego/gosec v0.0.0-20181211171558-12400f9a1ca7 + github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd gopkg.in/alecthomas/gometalinter.v2 v2.0.12 // indirect gopkg.in/alecthomas/gometalinter.v3 v3.0.0 // indirect gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect diff --git a/tools/check/go.sum b/tools/check/go.sum index 7558a1677d777..3ab5b1e3c329a 100644 --- a/tools/check/go.sum +++ b/tools/check/go.sum @@ -60,6 +60,8 @@ github.com/securego/gosec v0.0.0-20181211171558-12400f9a1ca7 h1:Ca7U7/rZ+caxjW2n github.com/securego/gosec v0.0.0-20181211171558-12400f9a1ca7/go.mod h1:m3KbCTwh9vLhm6AKBjE+ALesKilKcQHezI1uVOti0Ks= github.com/sergi/go-diff v1.0.1-0.20180205163309-da645544ed44 h1:tB9NOR21++IjLyVx3/PCPhWMwqGNCMQEH96A6dMZ/gc= github.com/sergi/go-diff v1.0.1-0.20180205163309-da645544ed44/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd h1:ug7PpSOB5RBPK1Kg6qskGBoP3Vnj/aNYFTznWvlkGo0= +github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= From 72c9bd7c2afe758a6dac61b178b4087890d9d6eb Mon Sep 17 00:00:00 2001 From: 3pointer Date: Mon, 5 Jul 2021 16:45:14 +0800 Subject: [PATCH 5/7] change backup proto path to brpb --- br/cmd/br/debug.go | 2 +- br/pkg/backup/client.go | 2 +- br/pkg/backup/client_test.go | 2 +- br/pkg/backup/push.go | 2 +- br/pkg/backup/schema.go | 2 +- br/pkg/backup/schema_test.go | 2 +- br/pkg/checksum/validate.go | 2 +- br/pkg/conn/conn.go | 2 +- br/pkg/logutil/logging.go | 2 +- br/pkg/logutil/logging_test.go | 2 +- br/pkg/metautil/metafile.go | 2 +- br/pkg/metautil/metafile_test.go | 2 +- br/pkg/restore/batcher.go | 2 +- br/pkg/restore/client.go | 2 +- br/pkg/restore/db_test.go | 2 +- br/pkg/restore/import.go | 2 +- br/pkg/restore/merge.go | 2 +- br/pkg/restore/merge_test.go | 2 +- br/pkg/restore/util.go | 2 +- br/pkg/restore/util_test.go | 2 +- br/pkg/rtree/logging_test.go | 2 +- br/pkg/rtree/rtree.go | 2 +- br/pkg/storage/gcs.go | 2 +- br/pkg/storage/gcs_test.go | 2 +- br/pkg/storage/parse.go | 2 +- br/pkg/storage/parse_test.go | 2 +- br/pkg/storage/s3.go | 2 +- br/pkg/storage/s3_test.go | 2 +- br/pkg/storage/storage.go | 2 +- br/pkg/task/backup.go | 2 +- br/pkg/task/backup_raw.go | 2 +- br/pkg/task/backup_test.go | 2 +- br/pkg/task/common.go | 2 +- br/pkg/task/restore.go | 2 +- br/pkg/utils/json.go | 2 +- br/pkg/utils/schema.go | 2 +- br/pkg/utils/schema_test.go | 2 +- go.mod | 2 ++ go.sum | 2 ++ 39 files changed, 41 insertions(+), 37 deletions(-) diff --git a/br/cmd/br/debug.go b/br/cmd/br/debug.go index cec2590c159f3..cbfa5a2fa2cdf 100644 --- a/br/cmd/br/debug.go +++ b/br/cmd/br/debug.go @@ -15,7 +15,7 @@ import ( "github.com/gogo/protobuf/proto" "github.com/pingcap/errors" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" "github.com/pingcap/kvproto/pkg/import_sstpb" "github.com/pingcap/log" "github.com/pingcap/parser/model" diff --git a/br/pkg/backup/client.go b/br/pkg/backup/client.go index ff13f2e76a7c4..257b9a204d36c 100644 --- a/br/pkg/backup/client.go +++ b/br/pkg/backup/client.go @@ -18,7 +18,7 @@ import ( "github.com/opentracing/opentracing-go" "github.com/pingcap/errors" "github.com/pingcap/failpoint" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" "github.com/pingcap/kvproto/pkg/metapb" "github.com/pingcap/log" "github.com/pingcap/parser/model" diff --git a/br/pkg/backup/client_test.go b/br/pkg/backup/client_test.go index 0431e558062c2..1354bf6d36d0b 100644 --- a/br/pkg/backup/client_test.go +++ b/br/pkg/backup/client_test.go @@ -9,7 +9,7 @@ import ( "time" . "github.com/pingcap/check" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" "github.com/pingcap/kvproto/pkg/errorpb" "github.com/pingcap/parser/model" "github.com/pingcap/tidb/kv" diff --git a/br/pkg/backup/push.go b/br/pkg/backup/push.go index 6af7519afb952..cdf0d26d22640 100644 --- a/br/pkg/backup/push.go +++ b/br/pkg/backup/push.go @@ -10,7 +10,7 @@ import ( "github.com/opentracing/opentracing-go" "github.com/pingcap/errors" "github.com/pingcap/failpoint" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" "github.com/pingcap/kvproto/pkg/metapb" "github.com/pingcap/log" "go.uber.org/zap" diff --git a/br/pkg/backup/schema.go b/br/pkg/backup/schema.go index 47ba9ff60789e..c0443b0a2983f 100644 --- a/br/pkg/backup/schema.go +++ b/br/pkg/backup/schema.go @@ -10,7 +10,7 @@ import ( "github.com/opentracing/opentracing-go" "github.com/pingcap/errors" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" "github.com/pingcap/log" "github.com/pingcap/parser/model" "github.com/pingcap/tidb/kv" diff --git a/br/pkg/backup/schema_test.go b/br/pkg/backup/schema_test.go index b620e6411f849..de0f49dc36c5a 100644 --- a/br/pkg/backup/schema_test.go +++ b/br/pkg/backup/schema_test.go @@ -8,7 +8,7 @@ import ( "sync/atomic" "github.com/golang/protobuf/proto" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" . "github.com/pingcap/check" filter "github.com/pingcap/tidb-tools/pkg/table-filter" diff --git a/br/pkg/checksum/validate.go b/br/pkg/checksum/validate.go index b6d613766d2f5..84558f07b1ee6 100644 --- a/br/pkg/checksum/validate.go +++ b/br/pkg/checksum/validate.go @@ -7,7 +7,7 @@ import ( "time" "github.com/pingcap/errors" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" "github.com/pingcap/log" "go.uber.org/zap" diff --git a/br/pkg/conn/conn.go b/br/pkg/conn/conn.go index 7bac08cb17921..b2858366a9694 100644 --- a/br/pkg/conn/conn.go +++ b/br/pkg/conn/conn.go @@ -23,7 +23,7 @@ import ( "google.golang.org/grpc/credentials" "google.golang.org/grpc/keepalive" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" "github.com/pingcap/kvproto/pkg/metapb" berrors "github.com/pingcap/tidb/br/pkg/errors" diff --git a/br/pkg/logutil/logging.go b/br/pkg/logutil/logging.go index 8534b1364f657..aadc28152586b 100644 --- a/br/pkg/logutil/logging.go +++ b/br/pkg/logutil/logging.go @@ -9,7 +9,7 @@ import ( "github.com/google/uuid" "github.com/pingcap/errors" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" "github.com/pingcap/kvproto/pkg/import_sstpb" "github.com/pingcap/kvproto/pkg/metapb" "github.com/pingcap/log" diff --git a/br/pkg/logutil/logging_test.go b/br/pkg/logutil/logging_test.go index 7a3cf5bc095aa..808e774d1fca4 100644 --- a/br/pkg/logutil/logging_test.go +++ b/br/pkg/logutil/logging_test.go @@ -9,7 +9,7 @@ import ( . "github.com/pingcap/check" "github.com/pingcap/errors" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" "github.com/pingcap/kvproto/pkg/import_sstpb" "github.com/pingcap/kvproto/pkg/metapb" "go.uber.org/zap" diff --git a/br/pkg/metautil/metafile.go b/br/pkg/metautil/metafile.go index a76075721f977..790143214eea1 100644 --- a/br/pkg/metautil/metafile.go +++ b/br/pkg/metautil/metafile.go @@ -15,7 +15,7 @@ import ( "github.com/gogo/protobuf/proto" "github.com/opentracing/opentracing-go" "github.com/pingcap/errors" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" "github.com/pingcap/log" "github.com/pingcap/parser/model" "github.com/pingcap/tidb/statistics/handle" diff --git a/br/pkg/metautil/metafile_test.go b/br/pkg/metautil/metafile_test.go index b36b53242e17e..816e90fedb68f 100644 --- a/br/pkg/metautil/metafile_test.go +++ b/br/pkg/metautil/metafile_test.go @@ -9,7 +9,7 @@ import ( "github.com/golang/mock/gomock" . "github.com/pingcap/check" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" mockstorage "github.com/pingcap/tidb/br/pkg/mock/storage" ) diff --git a/br/pkg/restore/batcher.go b/br/pkg/restore/batcher.go index e8e223fce1958..a1ed58e3fe7a6 100644 --- a/br/pkg/restore/batcher.go +++ b/br/pkg/restore/batcher.go @@ -9,7 +9,7 @@ import ( "time" "github.com/opentracing/opentracing-go" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" "github.com/pingcap/log" "go.uber.org/zap" diff --git a/br/pkg/restore/client.go b/br/pkg/restore/client.go index 79e86befb58e8..ddff751ab34f2 100644 --- a/br/pkg/restore/client.go +++ b/br/pkg/restore/client.go @@ -18,7 +18,7 @@ import ( "github.com/opentracing/opentracing-go" "github.com/pingcap/errors" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" "github.com/pingcap/kvproto/pkg/import_sstpb" "github.com/pingcap/kvproto/pkg/metapb" "github.com/pingcap/log" diff --git a/br/pkg/restore/db_test.go b/br/pkg/restore/db_test.go index 23b1756edad1d..f22f6f2ef3677 100644 --- a/br/pkg/restore/db_test.go +++ b/br/pkg/restore/db_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/golang/protobuf/proto" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" "github.com/pingcap/tidb/br/pkg/metautil" "github.com/pingcap/tidb/br/pkg/storage" diff --git a/br/pkg/restore/import.go b/br/pkg/restore/import.go index 14ea136a48ef3..c1a73b98c363c 100644 --- a/br/pkg/restore/import.go +++ b/br/pkg/restore/import.go @@ -12,7 +12,7 @@ import ( "github.com/google/uuid" "github.com/pingcap/errors" "github.com/pingcap/failpoint" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" "github.com/pingcap/kvproto/pkg/import_sstpb" "github.com/pingcap/kvproto/pkg/kvrpcpb" "github.com/pingcap/log" diff --git a/br/pkg/restore/merge.go b/br/pkg/restore/merge.go index 852a62a9027ea..a88cd5d7a7bb7 100644 --- a/br/pkg/restore/merge.go +++ b/br/pkg/restore/merge.go @@ -7,7 +7,7 @@ import ( "github.com/docker/go-units" "github.com/pingcap/errors" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" "github.com/pingcap/tidb/kv" "github.com/pingcap/tidb/tablecodec" diff --git a/br/pkg/restore/merge_test.go b/br/pkg/restore/merge_test.go index 8e298d8eac041..ec4fd3ebd1b58 100644 --- a/br/pkg/restore/merge_test.go +++ b/br/pkg/restore/merge_test.go @@ -12,7 +12,7 @@ import ( . "github.com/pingcap/check" "github.com/pingcap/errors" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" "github.com/pingcap/tidb/sessionctx/stmtctx" "github.com/pingcap/tidb/tablecodec" "github.com/pingcap/tidb/types" diff --git a/br/pkg/restore/util.go b/br/pkg/restore/util.go index 956a413d2bf8b..3d5c67918e3e1 100644 --- a/br/pkg/restore/util.go +++ b/br/pkg/restore/util.go @@ -12,7 +12,7 @@ import ( _ "github.com/go-sql-driver/mysql" // mysql driver "github.com/pingcap/errors" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" "github.com/pingcap/kvproto/pkg/import_sstpb" "github.com/pingcap/kvproto/pkg/metapb" "github.com/pingcap/log" diff --git a/br/pkg/restore/util_test.go b/br/pkg/restore/util_test.go index 88a69d738e230..26d902db45a9b 100644 --- a/br/pkg/restore/util_test.go +++ b/br/pkg/restore/util_test.go @@ -7,7 +7,7 @@ import ( "encoding/binary" . "github.com/pingcap/check" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" "github.com/pingcap/kvproto/pkg/import_sstpb" "github.com/pingcap/kvproto/pkg/metapb" "github.com/pingcap/tidb/tablecodec" diff --git a/br/pkg/rtree/logging_test.go b/br/pkg/rtree/logging_test.go index c5460e0f16a64..f53572da59fed 100644 --- a/br/pkg/rtree/logging_test.go +++ b/br/pkg/rtree/logging_test.go @@ -7,7 +7,7 @@ import ( "strings" . "github.com/pingcap/check" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/br/pkg/rtree/rtree.go b/br/pkg/rtree/rtree.go index dc12c37ec4772..3301a0a55ff52 100644 --- a/br/pkg/rtree/rtree.go +++ b/br/pkg/rtree/rtree.go @@ -6,7 +6,7 @@ import ( "bytes" "github.com/google/btree" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" "github.com/pingcap/log" "github.com/pingcap/tidb/br/pkg/logutil" diff --git a/br/pkg/storage/gcs.go b/br/pkg/storage/gcs.go index ecb201593b6e9..d5967942e0623 100644 --- a/br/pkg/storage/gcs.go +++ b/br/pkg/storage/gcs.go @@ -11,7 +11,7 @@ import ( "cloud.google.com/go/storage" "github.com/pingcap/errors" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" "github.com/pingcap/log" "github.com/spf13/pflag" "go.uber.org/zap" diff --git a/br/pkg/storage/gcs_test.go b/br/pkg/storage/gcs_test.go index 6a7166dca20b8..66167953492f4 100644 --- a/br/pkg/storage/gcs_test.go +++ b/br/pkg/storage/gcs_test.go @@ -9,7 +9,7 @@ import ( "github.com/fsouza/fake-gcs-server/fakestorage" . "github.com/pingcap/check" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" ) func (r *testStorageSuite) TestGCS(c *C) { diff --git a/br/pkg/storage/parse.go b/br/pkg/storage/parse.go index 79840ca13257e..a3cebaa928c03 100644 --- a/br/pkg/storage/parse.go +++ b/br/pkg/storage/parse.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/pingcap/errors" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" berrors "github.com/pingcap/tidb/br/pkg/errors" ) diff --git a/br/pkg/storage/parse_test.go b/br/pkg/storage/parse_test.go index ca45c1f258532..64c42700bb024 100644 --- a/br/pkg/storage/parse_test.go +++ b/br/pkg/storage/parse_test.go @@ -9,7 +9,7 @@ import ( "testing" . "github.com/pingcap/check" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" ) func Test(t *testing.T) { diff --git a/br/pkg/storage/s3.go b/br/pkg/storage/s3.go index 794aa6d9b615f..1897ed1076d88 100644 --- a/br/pkg/storage/s3.go +++ b/br/pkg/storage/s3.go @@ -23,7 +23,7 @@ import ( "github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/service/s3/s3iface" "github.com/pingcap/errors" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" "github.com/pingcap/log" "github.com/spf13/pflag" "go.uber.org/zap" diff --git a/br/pkg/storage/s3_test.go b/br/pkg/storage/s3_test.go index 9a033c1fa261e..9a6c619d8ed39 100644 --- a/br/pkg/storage/s3_test.go +++ b/br/pkg/storage/s3_test.go @@ -17,7 +17,7 @@ import ( "github.com/golang/mock/gomock" . "github.com/pingcap/check" "github.com/pingcap/errors" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" "github.com/pingcap/tidb/br/pkg/mock" . "github.com/pingcap/tidb/br/pkg/storage" diff --git a/br/pkg/storage/storage.go b/br/pkg/storage/storage.go index fcab6cefd9043..b16eebbff8ca3 100644 --- a/br/pkg/storage/storage.go +++ b/br/pkg/storage/storage.go @@ -8,7 +8,7 @@ import ( "net/http" "github.com/pingcap/errors" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" berrors "github.com/pingcap/tidb/br/pkg/errors" ) diff --git a/br/pkg/task/backup.go b/br/pkg/task/backup.go index 8eaac804055a7..810b772f964e7 100644 --- a/br/pkg/task/backup.go +++ b/br/pkg/task/backup.go @@ -14,7 +14,7 @@ import ( "github.com/opentracing/opentracing-go" "github.com/pingcap/errors" "github.com/pingcap/failpoint" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" "github.com/pingcap/log" "github.com/pingcap/parser/mysql" "github.com/pingcap/tidb/sessionctx/stmtctx" diff --git a/br/pkg/task/backup_raw.go b/br/pkg/task/backup_raw.go index c9a0e3bbd93f4..88686068b37c4 100644 --- a/br/pkg/task/backup_raw.go +++ b/br/pkg/task/backup_raw.go @@ -10,7 +10,7 @@ import ( "github.com/opentracing/opentracing-go" "github.com/pingcap/errors" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" "github.com/pingcap/log" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/br/pkg/task/backup_test.go b/br/pkg/task/backup_test.go index 33c3362c44166..40ba35ed4130e 100644 --- a/br/pkg/task/backup_test.go +++ b/br/pkg/task/backup_test.go @@ -7,7 +7,7 @@ import ( "time" . "github.com/pingcap/check" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" ) var _ = Suite(&testBackupSuite{}) diff --git a/br/pkg/task/common.go b/br/pkg/task/common.go index be5fbb6b6d63a..defc74568a12b 100644 --- a/br/pkg/task/common.go +++ b/br/pkg/task/common.go @@ -15,7 +15,7 @@ import ( "github.com/docker/go-units" "github.com/gogo/protobuf/proto" "github.com/pingcap/errors" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" "github.com/pingcap/log" filter "github.com/pingcap/tidb-tools/pkg/table-filter" "github.com/pingcap/tidb/sessionctx/variable" diff --git a/br/pkg/task/restore.go b/br/pkg/task/restore.go index ba3b4e8a65e57..90f280b0774ae 100644 --- a/br/pkg/task/restore.go +++ b/br/pkg/task/restore.go @@ -9,7 +9,7 @@ import ( "github.com/opentracing/opentracing-go" "github.com/pingcap/errors" "github.com/pingcap/failpoint" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" "github.com/pingcap/log" "github.com/pingcap/tidb/config" "github.com/spf13/pflag" diff --git a/br/pkg/utils/json.go b/br/pkg/utils/json.go index 34be22263633a..cb840742f8293 100644 --- a/br/pkg/utils/json.go +++ b/br/pkg/utils/json.go @@ -6,7 +6,7 @@ import ( "github.com/pingcap/errors" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" ) // MarshalBackupMeta converts the backupmeta strcture to JSON. diff --git a/br/pkg/utils/schema.go b/br/pkg/utils/schema.go index 71de62fe6ffcb..65a81d58fb518 100644 --- a/br/pkg/utils/schema.go +++ b/br/pkg/utils/schema.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/pingcap/errors" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" "github.com/pingcap/parser/model" "github.com/pingcap/parser/mysql" diff --git a/br/pkg/utils/schema_test.go b/br/pkg/utils/schema_test.go index d96fe8811ab99..4e34c09aa6c4b 100644 --- a/br/pkg/utils/schema_test.go +++ b/br/pkg/utils/schema_test.go @@ -14,7 +14,7 @@ import ( "github.com/pingcap/tidb/br/pkg/metautil" . "github.com/pingcap/check" - backuppb "github.com/pingcap/kvproto/pkg/backup" + backuppb "github.com/pingcap/kvproto/pkg/brpb" "github.com/pingcap/parser/model" "github.com/pingcap/tidb/statistics/handle" "github.com/pingcap/tidb/tablecodec" diff --git a/go.mod b/go.mod index 2c5eb8a1871cf..79c8648f3cf6b 100644 --- a/go.mod +++ b/go.mod @@ -100,3 +100,5 @@ replace cloud.google.com/go/storage => github.com/3pointer/google-cloud-go/stora replace github.com/tikv/pd => github.com/tikv/pd v1.1.0-beta.0.20210609101029-3ba158cf41a4 replace google.golang.org/grpc => google.golang.org/grpc v1.27.1 + +replace github.com/pingcap/kvproto => github.com/3pointer/kvproto v0.0.0-20210705083155-dd85fc377bc7 diff --git a/go.sum b/go.sum index 858a55663bd4f..8a26c4a3d00f1 100644 --- a/go.sum +++ b/go.sum @@ -29,6 +29,8 @@ cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIA dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/3pointer/google-cloud-go/storage v1.6.1-0.20210108125931-b59bfa0720b2 h1:Bnm+q0FAI1AXoPX3cPIi2/a4sg2J2f/D0yPr+7EMPg0= github.com/3pointer/google-cloud-go/storage v1.6.1-0.20210108125931-b59bfa0720b2/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= +github.com/3pointer/kvproto v0.0.0-20210705083155-dd85fc377bc7 h1:O35GhMOFQpexCinIku5n4xpDBsYAD2f9P5mVD5glVW0= +github.com/3pointer/kvproto v0.0.0-20210705083155-dd85fc377bc7/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI= github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= github.com/Azure/azure-pipeline-go v0.2.2/go.mod h1:4rQ/NZncSvGqNkkOsNpOU1tgoNuIlp9AfUH5G1tvCHc= github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k= From 75e5f0dfe6caf89f16c61aeb869a061ba16c2bc6 Mon Sep 17 00:00:00 2001 From: 3pointer Date: Mon, 5 Jul 2021 19:03:42 +0800 Subject: [PATCH 6/7] fix the br unit tests --- Makefile | 3 +-- br/pkg/lightning/log/filter_test.go | 2 +- br/pkg/storage/s3_test.go | 27 ++++++++++---------- br/tests/br_rawkv/client.go | 31 +++++++++++------------ go.mod | 6 ++--- go.sum | 38 ++++------------------------- 6 files changed, 40 insertions(+), 67 deletions(-) diff --git a/Makefile b/Makefile index f28837e76766c..b1e4ad0f16ea7 100644 --- a/Makefile +++ b/Makefile @@ -280,7 +280,7 @@ bench-daily: build_tools: build_br build_lightning build_lightning-ctl br_web: - @cd br/web && npm install && npm run build + @cd br/web && npm install && npm run build build_br: $(GOBUILD) $(RACE_FLAG) -o $(BR_BIN) br/cmd/br/*.go @@ -330,7 +330,6 @@ br_compatibility_test_prepare: br_compatibility_test: @cd br && tests/run_compatible.sh run ->>>>>>> 83df3a513 (fix test in makefile) # There is no FreeBSD environment for GitHub actions. So cross-compile on Linux # but that doesn't work with CGO_ENABLED=1, so disable cgo. The reason to have diff --git a/br/pkg/lightning/log/filter_test.go b/br/pkg/lightning/log/filter_test.go index 740b16172652d..911a43012e58e 100644 --- a/br/pkg/lightning/log/filter_test.go +++ b/br/pkg/lightning/log/filter_test.go @@ -32,7 +32,7 @@ func (s *testFilterSuite) TestFilter(c *C) { c.Assert(buffer.Stripped(), HasLen, 0) logger, buffer = log.MakeTestLogger(zap.WrapCore(func(c zapcore.Core) zapcore.Core { - return log.NewFilterCore(c, "github.com/pingcap/tidb/").With([]zap.Field{zap.String("a", "b")}) + return log.NewFilterCore(c, "github.com/pingcap/br/").With([]zap.Field{zap.String("a", "b")}) }), zap.AddCaller()) logger.Warn("the message", zap.Int("number", 123456), zap.Ints("array", []int{7, 8, 9})) c.Assert( diff --git a/br/pkg/storage/s3_test.go b/br/pkg/storage/s3_test.go index 9a6c619d8ed39..090344850ebe8 100644 --- a/br/pkg/storage/s3_test.go +++ b/br/pkg/storage/s3_test.go @@ -7,6 +7,7 @@ import ( "bytes" "context" "fmt" + "github.com/aws/aws-sdk-go/aws/request" "io" "math/rand" "os" @@ -442,7 +443,7 @@ func (s *s3Suite) TestWriteNoError(c *C) { putCall := s.s3.EXPECT(). PutObjectWithContext(ctx, gomock.Any()). - DoAndReturn(func(_ context.Context, input *s3.PutObjectInput) (*s3.PutObjectOutput, error) { + DoAndReturn(func(_ context.Context, input *s3.PutObjectInput, opt ...request.Option) (*s3.PutObjectOutput, error) { c.Assert(aws.StringValue(input.Bucket), Equals, "bucket") c.Assert(aws.StringValue(input.Key), Equals, "prefix/file") c.Assert(aws.StringValue(input.ACL), Equals, "acl") @@ -455,7 +456,7 @@ func (s *s3Suite) TestWriteNoError(c *C) { }) s.s3.EXPECT(). WaitUntilObjectExistsWithContext(ctx, gomock.Any()). - DoAndReturn(func(_ context.Context, input *s3.HeadObjectInput) error { + DoAndReturn(func(_ context.Context, input *s3.HeadObjectInput, opt ...request.Option) error { c.Assert(aws.StringValue(input.Bucket), Equals, "bucket") c.Assert(aws.StringValue(input.Key), Equals, "prefix/file") return nil @@ -475,7 +476,7 @@ func (s *s3Suite) TestReadNoError(c *C) { s.s3.EXPECT(). GetObjectWithContext(ctx, gomock.Any()). - DoAndReturn(func(_ context.Context, input *s3.GetObjectInput) (*s3.GetObjectOutput, error) { + DoAndReturn(func(_ context.Context, input *s3.GetObjectInput, opt ...request.Option) (*s3.GetObjectOutput, error) { c.Assert(aws.StringValue(input.Bucket), Equals, "bucket") c.Assert(aws.StringValue(input.Key), Equals, "prefix/file") return &s3.GetObjectOutput{ @@ -497,7 +498,7 @@ func (s *s3Suite) TestFileExistsNoError(c *C) { s.s3.EXPECT(). HeadObjectWithContext(ctx, gomock.Any()). - DoAndReturn(func(_ context.Context, input *s3.HeadObjectInput) (*s3.HeadObjectOutput, error) { + DoAndReturn(func(_ context.Context, input *s3.HeadObjectInput, opt ...request.Option) (*s3.HeadObjectOutput, error) { c.Assert(aws.StringValue(input.Bucket), Equals, "bucket") c.Assert(aws.StringValue(input.Key), Equals, "prefix/file") return &s3.HeadObjectOutput{}, nil @@ -582,7 +583,7 @@ func (s *s3Suite) TestOpenAsBufio(c *C) { s.s3.EXPECT(). GetObjectWithContext(ctx, gomock.Any()). - DoAndReturn(func(_ context.Context, input *s3.GetObjectInput) (*s3.GetObjectOutput, error) { + DoAndReturn(func(_ context.Context, input *s3.GetObjectInput, opt ...request.Option) (*s3.GetObjectOutput, error) { c.Assert(aws.StringValue(input.Range), Equals, "bytes=0-") return &s3.GetObjectOutput{ Body: io.NopCloser(bytes.NewReader([]byte("plain text\ncontent"))), @@ -720,7 +721,7 @@ func (s *s3Suite) expectedCalls(ctx context.Context, c *C, data []byte, startOff thisOffset := offset thisCall := s.s3.EXPECT(). GetObjectWithContext(ctx, gomock.Any()). - DoAndReturn(func(_ context.Context, input *s3.GetObjectInput) (*s3.GetObjectOutput, error) { + DoAndReturn(func(_ context.Context, input *s3.GetObjectInput, opt ...request.Option) (*s3.GetObjectOutput, error) { c.Assert(aws.StringValue(input.Range), Equals, fmt.Sprintf("bytes=%d-", thisOffset)) return &s3.GetObjectOutput{ Body: newReader(data, thisOffset), @@ -847,7 +848,7 @@ func (s *s3Suite) TestWalkDir(c *C) { // first call serve item #0, #1; second call #2, #3; third call #4. firstCall := s.s3.EXPECT(). ListObjectsWithContext(ctx, gomock.Any()). - DoAndReturn(func(_ context.Context, input *s3.ListObjectsInput) (*s3.ListObjectsOutput, error) { + DoAndReturn(func(_ context.Context, input *s3.ListObjectsInput, opt ...request.Option) (*s3.ListObjectsOutput, error) { c.Assert(aws.StringValue(input.Bucket), Equals, "bucket") c.Assert(aws.StringValue(input.Prefix), Equals, "prefix/sp/") c.Assert(aws.StringValue(input.Marker), Equals, "") @@ -860,7 +861,7 @@ func (s *s3Suite) TestWalkDir(c *C) { }) secondCall := s.s3.EXPECT(). ListObjectsWithContext(ctx, gomock.Any()). - DoAndReturn(func(_ context.Context, input *s3.ListObjectsInput) (*s3.ListObjectsOutput, error) { + DoAndReturn(func(_ context.Context, input *s3.ListObjectsInput, opt ...request.Option) (*s3.ListObjectsOutput, error) { c.Assert(aws.StringValue(input.Marker), Equals, aws.StringValue(contents[1].Key)) c.Assert(aws.Int64Value(input.MaxKeys), Equals, int64(2)) return &s3.ListObjectsOutput{ @@ -871,7 +872,7 @@ func (s *s3Suite) TestWalkDir(c *C) { After(firstCall) thirdCall := s.s3.EXPECT(). ListObjectsWithContext(ctx, gomock.Any()). - DoAndReturn(func(_ context.Context, input *s3.ListObjectsInput) (*s3.ListObjectsOutput, error) { + DoAndReturn(func(_ context.Context, input *s3.ListObjectsInput, opt ...request.Option) (*s3.ListObjectsOutput, error) { c.Assert(aws.StringValue(input.Marker), Equals, aws.StringValue(contents[3].Key)) c.Assert(aws.Int64Value(input.MaxKeys), Equals, int64(2)) return &s3.ListObjectsOutput{ @@ -882,7 +883,7 @@ func (s *s3Suite) TestWalkDir(c *C) { After(secondCall) fourthCall := s.s3.EXPECT(). ListObjectsWithContext(ctx, gomock.Any()). - DoAndReturn(func(_ context.Context, input *s3.ListObjectsInput) (*s3.ListObjectsOutput, error) { + DoAndReturn(func(_ context.Context, input *s3.ListObjectsInput, opt ...request.Option) (*s3.ListObjectsOutput, error) { c.Assert(aws.StringValue(input.Bucket), Equals, "bucket") c.Assert(aws.StringValue(input.Prefix), Equals, "prefix/") c.Assert(aws.StringValue(input.Marker), Equals, "") @@ -896,7 +897,7 @@ func (s *s3Suite) TestWalkDir(c *C) { After(thirdCall) s.s3.EXPECT(). ListObjectsWithContext(ctx, gomock.Any()). - DoAndReturn(func(_ context.Context, input *s3.ListObjectsInput) (*s3.ListObjectsOutput, error) { + DoAndReturn(func(_ context.Context, input *s3.ListObjectsInput, opt ...request.Option) (*s3.ListObjectsOutput, error) { c.Assert(aws.StringValue(input.Marker), Equals, aws.StringValue(contents[3].Key)) c.Assert(aws.Int64Value(input.MaxKeys), Equals, int64(4)) return &s3.ListObjectsOutput{ @@ -969,7 +970,7 @@ func (s *s3SuiteCustom) TestWalkDirWithEmptyPrefix(c *C) { } firstCall := s3API.EXPECT(). ListObjectsWithContext(ctx, gomock.Any()). - DoAndReturn(func(_ context.Context, input *s3.ListObjectsInput) (*s3.ListObjectsOutput, error) { + DoAndReturn(func(_ context.Context, input *s3.ListObjectsInput, opt ...request.Option) (*s3.ListObjectsOutput, error) { c.Assert(aws.StringValue(input.Bucket), Equals, "bucket") c.Assert(aws.StringValue(input.Prefix), Equals, "") c.Assert(aws.StringValue(input.Marker), Equals, "") @@ -982,7 +983,7 @@ func (s *s3SuiteCustom) TestWalkDirWithEmptyPrefix(c *C) { }) s3API.EXPECT(). ListObjectsWithContext(ctx, gomock.Any()). - DoAndReturn(func(_ context.Context, input *s3.ListObjectsInput) (*s3.ListObjectsOutput, error) { + DoAndReturn(func(_ context.Context, input *s3.ListObjectsInput, opt ...request.Option) (*s3.ListObjectsOutput, error) { c.Assert(aws.StringValue(input.Bucket), Equals, "bucket") c.Assert(aws.StringValue(input.Prefix), Equals, "sp/") c.Assert(aws.StringValue(input.Marker), Equals, "") diff --git a/br/tests/br_rawkv/client.go b/br/tests/br_rawkv/client.go index ff2ba51ecd1d9..a9eedcc606783 100644 --- a/br/tests/br_rawkv/client.go +++ b/br/tests/br_rawkv/client.go @@ -1,6 +1,7 @@ package main import ( + "context" "bytes" "encoding/hex" "flag" @@ -13,7 +14,7 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" "github.com/tikv/client-go/v2/config" - "github.com/tikv/client-go/v2/tikv" + "github.com/tikv/client-go/v2/rawkv" "go.uber.org/zap" ) @@ -32,8 +33,8 @@ var ( "kv pairs are separated by commas, key and value in a pair are separated by a colon") ) -func createClient(addr string) (*tikv.RawKVClient, error) { - cli, err := tikv.NewRawKVClient([]string{addr}, config.Security{ +func createClient(addr string) (*rawkv.Client, error) { + cli, err := rawkv.NewClient(context.TODO(),[]string{addr}, config.Security{ ClusterSSLCA: *ca, ClusterSSLCert: *cert, ClusterSSLKey: *key, @@ -85,7 +86,7 @@ func main() { } } -func randGenWithDuration(client *tikv.RawKVClient, startKey, endKey []byte, +func randGenWithDuration(client *rawkv.Client, startKey, endKey []byte, maxLen int, concurrency int, duration int) error { var err error ok := make(chan struct{}) @@ -100,7 +101,7 @@ func randGenWithDuration(client *tikv.RawKVClient, startKey, endKey []byte, return errors.Trace(err) } -func randGen(client *tikv.RawKVClient, startKey, endKey []byte, maxLen int, concurrency int) error { +func randGen(client *rawkv.Client, startKey, endKey []byte, maxLen int, concurrency int) error { log.Info("Start rand-gen", zap.Int("maxlen", maxLen), zap.String("startkey", hex.EncodeToString(startKey)), zap.String("endkey", hex.EncodeToString(endKey))) log.Info("Rand-gen will keep running. Please Ctrl+C to stop manually.") @@ -132,7 +133,7 @@ func randGen(client *tikv.RawKVClient, startKey, endKey []byte, maxLen int, conc values = append(values, value) } - err := client.BatchPut(keys, values) + err := client.BatchPut(context.TODO(), keys, values) if err != nil { errCh <- errors.Trace(err) } @@ -222,7 +223,7 @@ func randValue() []byte { return result } -func checksum(client *tikv.RawKVClient, startKey, endKey []byte) error { +func checksum(client *rawkv.Client, startKey, endKey []byte) error { log.Info("Start checkcum on range", zap.String("startkey", hex.EncodeToString(startKey)), zap.String("endkey", hex.EncodeToString(endKey))) @@ -249,13 +250,13 @@ func checksum(client *tikv.RawKVClient, startKey, endKey []byte) error { return nil } -func deleteRange(client *tikv.RawKVClient, startKey, endKey []byte) error { +func deleteRange(client *rawkv.Client, startKey, endKey []byte) error { log.Info("Start delete data in range", zap.String("startkey", hex.EncodeToString(startKey)), zap.String("endkey", hex.EncodeToString(endKey))) - return client.DeleteRange(startKey, endKey) + return client.DeleteRange(context.TODO(), startKey, endKey) } -func scan(client *tikv.RawKVClient, startKey, endKey []byte) error { +func scan(client *rawkv.Client, startKey, endKey []byte) error { log.Info("Start scanning data in range", zap.String("startkey", hex.EncodeToString(startKey)), zap.String("endkey", hex.EncodeToString(endKey))) @@ -281,7 +282,7 @@ func scan(client *tikv.RawKVClient, startKey, endKey []byte) error { return nil } -func put(client *tikv.RawKVClient, dataStr string) error { +func put(client *rawkv.Client, dataStr string) error { keys := make([][]byte, 0) values := make([][]byte, 0) @@ -306,14 +307,14 @@ func put(client *tikv.RawKVClient, dataStr string) error { log.Info("Put rawkv data", zap.ByteStrings("keys", keys), zap.ByteStrings("values", values)) - err := client.BatchPut(keys, values) + err := client.BatchPut(context.TODO(), keys, values) return errors.Trace(err) } const defaultScanBatchSize = 128 type rawKVScanner struct { - client *tikv.RawKVClient + client *rawkv.Client batchSize int currentKey []byte @@ -325,7 +326,7 @@ type rawKVScanner struct { noMore bool } -func newRawKVScanner(client *tikv.RawKVClient, startKey, endKey []byte) *rawKVScanner { +func newRawKVScanner(client *rawkv.Client, startKey, endKey []byte) *rawKVScanner { return &rawKVScanner{ client: client, batchSize: defaultScanBatchSize, @@ -347,7 +348,7 @@ func (s *rawKVScanner) Next() ([]byte, []byte, error) { batchSize := s.batchSize var err error - s.bufferKeys, s.bufferValues, err = s.client.Scan(s.currentKey, s.endKey, batchSize) + s.bufferKeys, s.bufferValues, err = s.client.Scan(context.TODO(), s.currentKey, s.endKey, batchSize) if err != nil { return nil, nil, errors.Trace(err) } diff --git a/go.mod b/go.mod index 79c8648f3cf6b..47544fc1a568a 100644 --- a/go.mod +++ b/go.mod @@ -70,8 +70,8 @@ require ( github.com/uber/jaeger-client-go v2.22.1+incompatible github.com/uber/jaeger-lib v2.4.1+incompatible // indirect github.com/wangjohn/quickselect v0.0.0-20161129230411-ed8402a42d5f - github.com/xitongsys/parquet-go v1.6.0 - github.com/xitongsys/parquet-go-source v0.0.0-20201108113611-f372b7d813be + github.com/xitongsys/parquet-go v1.5.5-0.20201110004701-b09c49d6d457 + github.com/xitongsys/parquet-go-source v0.0.0-20200817004010-026bad9b25d0 // Fix panic in unit test with go >= 1.14, ref: etcd-io/bbolt#201 https://github.com/etcd-io/bbolt/pull/201 go.etcd.io/bbolt v1.3.5 // indirect go.etcd.io/etcd v0.5.0-alpha.5.0.20200824191128-ae9734ed278b @@ -101,4 +101,4 @@ replace github.com/tikv/pd => github.com/tikv/pd v1.1.0-beta.0.20210609101029-3b replace google.golang.org/grpc => google.golang.org/grpc v1.27.1 -replace github.com/pingcap/kvproto => github.com/3pointer/kvproto v0.0.0-20210705083155-dd85fc377bc7 +replace github.com/pingcap/kvproto => github.com/pingcap/kvproto v0.0.0-20210721101353-c960b7d1ef56 diff --git a/go.sum b/go.sum index 8a26c4a3d00f1..ea2c94b54e003 100644 --- a/go.sum +++ b/go.sum @@ -29,22 +29,7 @@ cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIA dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/3pointer/google-cloud-go/storage v1.6.1-0.20210108125931-b59bfa0720b2 h1:Bnm+q0FAI1AXoPX3cPIi2/a4sg2J2f/D0yPr+7EMPg0= github.com/3pointer/google-cloud-go/storage v1.6.1-0.20210108125931-b59bfa0720b2/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= -github.com/3pointer/kvproto v0.0.0-20210705083155-dd85fc377bc7 h1:O35GhMOFQpexCinIku5n4xpDBsYAD2f9P5mVD5glVW0= -github.com/3pointer/kvproto v0.0.0-20210705083155-dd85fc377bc7/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI= github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= -github.com/Azure/azure-pipeline-go v0.2.2/go.mod h1:4rQ/NZncSvGqNkkOsNpOU1tgoNuIlp9AfUH5G1tvCHc= -github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k= -github.com/Azure/azure-storage-blob-go v0.10.0/go.mod h1:ep1edmW+kNQx4UfWM9heESNmQdijykocJ0YOxmMX8SE= -github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= -github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= -github.com/Azure/go-autorest/autorest/adal v0.8.3/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= -github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= -github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= -github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= -github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= -github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= @@ -263,7 +248,6 @@ github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/E github.com/goccy/go-graphviz v0.0.5/go.mod h1:wXVsXxmyMQU6TN3zGRttjNn3h+iCAS7xQFC6TlNvLhk= github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v0.0.0-20180717141946-636bf0302bc9/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= @@ -290,7 +274,6 @@ github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71 github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= -github.com/golang/protobuf v0.0.0-20180814211427-aa810b61a9c7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -477,8 +460,6 @@ github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVc github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= -github.com/mattn/go-ieproxy v0.0.1/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/gNWuh88E= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= @@ -518,7 +499,6 @@ github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/ncw/directio v1.0.4 h1:CojwI07mCEmRkajgx42Pf8jyCwTs1ji9/Ij9/PJG12k= github.com/ncw/directio v1.0.4/go.mod h1:CKGdcN7StAaqjT7Qack3lAXeX4pjnyc46YeqZH1yWVY= -github.com/ncw/swift v1.0.52/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= github.com/nfnt/resize v0.0.0-20160724205520-891127d8d1b5/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= github.com/ngaut/pools v0.0.0-20180318154953-b7bc8c42aac7 h1:7KAv7KMGTTqSmYZtNdcNTgsos+vFzULLwyElndwn+5c= github.com/ngaut/pools v0.0.0-20180318154953-b7bc8c42aac7/go.mod h1:iWMfgwqYW+e8n5lC/jjNEhwcjbRDpl5NT7n2h+4UNcI= @@ -579,11 +559,8 @@ github.com/pingcap/fn v0.0.0-20200306044125-d5540d389059 h1:Pe2LbxRmbTfAoKJ65bZL github.com/pingcap/fn v0.0.0-20200306044125-d5540d389059/go.mod h1:fMRU1BA1y+r89AxUoaAar4JjrhUkVDt0o0Np6V8XbDQ= github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989 h1:surzm05a8C9dN8dIUmo4Be2+pMRb6f55i+UIYrluu2E= github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989/go.mod h1:O17XtbryoCJhkKGbT62+L2OlrniwqiGLSqrmdHCMzZw= -github.com/pingcap/kvproto v0.0.0-20191211054548-3c6b38ea5107/go.mod h1:WWLmULLO7l8IOcQG+t+ItJ3fEcrL5FxF0Wu+HrMy26w= -github.com/pingcap/kvproto v0.0.0-20200411081810-b85805c9476c/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI= -github.com/pingcap/kvproto v0.0.0-20210527074428-73468940541b/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI= -github.com/pingcap/kvproto v0.0.0-20210712050333-b66fdbd6bfd5 h1:LN/ml4lm5+AYdn+N/CJ102wFUph2OIpo8hHqi8QxKiQ= -github.com/pingcap/kvproto v0.0.0-20210712050333-b66fdbd6bfd5/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI= +github.com/pingcap/kvproto v0.0.0-20210721101353-c960b7d1ef56 h1:TcruIx1ZOUjYvI4RtHm2HBAJiM3WyOgmp4jE5MSQRLU= +github.com/pingcap/kvproto v0.0.0-20210721101353-c960b7d1ef56/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI= github.com/pingcap/log v0.0.0-20191012051959-b742a5d432e9/go.mod h1:4rbK1p9ILyIfb6hU7OG2CiWSqMXnp3JMbiaVJ6mvoY8= github.com/pingcap/log v0.0.0-20191012051959-b742a5d432e9/go.mod h1:4rbK1p9ILyIfb6hU7OG2CiWSqMXnp3JMbiaVJ6mvoY8= github.com/pingcap/log v0.0.0-20200511115504-543df19646ad/go.mod h1:4rbK1p9ILyIfb6hU7OG2CiWSqMXnp3JMbiaVJ6mvoY8= @@ -763,12 +740,11 @@ github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xitongsys/parquet-go v1.5.1/go.mod h1:xUxwM8ELydxh4edHGegYq1pA8NnMKDx0K/GyB0o2bww= -github.com/xitongsys/parquet-go v1.6.0 h1:j6YrTVZdQx5yywJLIOklZcKVsCoSD1tqOVRXyTBFSjs= -github.com/xitongsys/parquet-go v1.6.0/go.mod h1:pheqtXeHQFzxJk45lRQ0UIGIivKnLXvialZSFWs81A8= +github.com/xitongsys/parquet-go v1.5.5-0.20201110004701-b09c49d6d457 h1:tBbuFCtyJNKT+BFAv6qjvTFpVdy97IYNaBwGUXifIUs= +github.com/xitongsys/parquet-go v1.5.5-0.20201110004701-b09c49d6d457/go.mod h1:pheqtXeHQFzxJk45lRQ0UIGIivKnLXvialZSFWs81A8= github.com/xitongsys/parquet-go-source v0.0.0-20190524061010-2b72cbee77d5/go.mod h1:xxCx7Wpym/3QCo6JhujJX51dzSXrwmb0oH6FQb39SEA= +github.com/xitongsys/parquet-go-source v0.0.0-20200817004010-026bad9b25d0 h1:a742S4V5A15F93smuVxA60LQWsrCnN8bKeWDBARU1/k= github.com/xitongsys/parquet-go-source v0.0.0-20200817004010-026bad9b25d0/go.mod h1:HYhIKsdns7xz80OgkbgJYrtQY7FjHWHKH6cvN7+czGE= -github.com/xitongsys/parquet-go-source v0.0.0-20201108113611-f372b7d813be h1:33jqDHcXK6vfgtLossgwZmTXyLCdPZU3/KZ3988bk3Q= -github.com/xitongsys/parquet-go-source v0.0.0-20201108113611-f372b7d813be/go.mod h1:SQSSW1CBj/egoUhnaTXihUlDayvpp01Fn8qwuEpK5bY= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI= github.com/yookoala/realpath v1.0.0/go.mod h1:gJJMA9wuX7AcqLy1+ffPatSCySA1FQ2S8Ya9AIoYBpE= @@ -837,7 +813,6 @@ golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a h1:vclmkQCjlDX5OydZ9wv8rBCcS0QyQY66Mpf/7BZbInM= @@ -905,7 +880,6 @@ golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -981,7 +955,6 @@ golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1133,7 +1106,6 @@ google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20181004005441-af9cb2a35e7f/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= From 1fbb39814bd0606a0589917e0a41b1ef7d843e48 Mon Sep 17 00:00:00 2001 From: 3pointer Date: Thu, 22 Jul 2021 19:34:09 +0800 Subject: [PATCH 7/7] update Makefile --- Makefile | 8 ++++---- Makefile.common | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index b1e4ad0f16ea7..bdaed57c3b38f 100644 --- a/Makefile +++ b/Makefile @@ -283,16 +283,16 @@ br_web: @cd br/web && npm install && npm run build build_br: - $(GOBUILD) $(RACE_FLAG) -o $(BR_BIN) br/cmd/br/*.go + CGO_ENABLED=1 $(GOBUILD) $(RACE_FLAG) -ldflags '$(TOOL_LDFLAGS) $(CHECK_FLAG)' -o $(BR_BIN) br/cmd/br/*.go build_lightning_for_web: - $(GOBUILD) $(RACE_FLAG) -tags dev -o $(LIGHTNING_BIN) br/cmd/tidb-lightning/main.go + CGO_ENABLED=1 $(GOBUILD) -tags dev $(RACE_FLAG) -ldflags '$(TOOL_LDFLAGS) $(CHECK_FLAG)' -o $(LIGHTNING_BIN) br/cmd/tidb-lightning/main.go build_lightning: - $(GOBUILD) $(RACE_FLAG) -o $(LIGHTNING_BIN) br/cmd/tidb-lightning/main.go + CGO_ENABLED=1 $(GOBUILD) $(RACE_FLAG) -ldflags '$(TOOL_LDFLAGS) $(CHECK_FLAG)' -o $(LIGHTNING_BIN) br/cmd/tidb-lightning/main.go build_lightning-ctl: - $(GOBUILD) $(RACE_FLAG) -o $(LIGHTNING_CTL_BIN) br/cmd/tidb-lightning-ctl/main.go + CGO_ENABLED=1 $(GOBUILD) $(RACE_FLAG) -ldflags '$(TOOL_LDFLAGS) $(CHECK_FLAG)' -o $(LIGHTNING_CTL_BIN) br/cmd/tidb-lightning-ctl/main.go build_for_br_integration_test: @make failpoint-enable diff --git a/Makefile.common b/Makefile.common index 2ae7791a52755..46414aeebb7ac 100644 --- a/Makefile.common +++ b/Makefile.common @@ -79,8 +79,30 @@ ifeq ("$(WITH_CHECK)", "1") CHECK_FLAG = $(TEST_LDFLAGS) endif +BR_PKG := github.com/pingcap/tidb/br BR_PACKAGES := go list ./...| grep "github.com\/pingcap\/tidb\/br" LIGHTNING_BIN := bin/tidb-lightning LIGHTNING_CTL_BIN := bin/tidb-lightning-ctl BR_BIN := bin/br TEST_DIR := /tmp/backup_restore_test + +TOOL_RELEASE_VERSION = +ifeq ($(TOOL_RELEASE_VERSION),) + TOOL_RELEASE_VERSION := v4.0.0-dev + release_version_regex := ^v4\..*$$ + release_branch_regex := "^release-[0-9]\.[0-9].*$$|^HEAD$$|^.*/*tags/v[0-9]\.[0-9]\..*$$" + ifneq ($(shell git rev-parse --abbrev-ref HEAD | egrep $(release_branch_regex)),) + # If we are in release branch, try to use tag version. + ifneq ($(shell git describe --tags --dirty | egrep $(release_version_regex)),) + TOOL_RELEASE_VERSION := $(shell git describe --tags --dirty) + endif + else ifneq ($(shell git status --porcelain),) + # Add -dirty if the working tree is dirty for non release branch. + TOOL_RELEASE_VERSION := $(TOOL_RELEASE_VERSION)-dirty + endif +endif + +TOOL_LDFLAGS += -X "$(BR_PKG)/pkg/version/build.ReleaseVersion=$(TOOL_RELEASE_VERSION)" +TOOL_LDFLAGS += -X "$(BR_PKG)/pkg/version/build.BuildTS=$(shell date -u '+%Y-%m-%d %I:%M:%S')" +TOOL_LDFLAGS += -X "$(BR_PKG)/pkg/version/build.GitHash=$(shell git rev-parse HEAD)" +TOOL_LDFLAGS += -X "$(BR_PKG)/pkg/version/build.GitBranch=$(shell git rev-parse --abbrev-ref HEAD)"