Skip to content
This repository has been archived by the owner on Aug 21, 2023. It is now read-only.

remove dependency for pingcap/br (#343) #369

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ static: tools
@# gosec - too many false positive
@# errorlint - can't detect errors.Cause
@# sqlclosecheck - the rows in dumpling is created in one function but closed in other functions
CGO_ENABLED=0 tools/bin/golangci-lint run --enable-all --deadline 120s \
CGO_ENABLED=0 tools/bin/golangci-lint run --enable-all --deadline 180s \
--disable gochecknoglobals \
--disable goimports \
--disable gofmt \
Expand Down
20 changes: 8 additions & 12 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,21 @@ require (
github.com/DATA-DOG/go-sqlmock v1.5.0
github.com/coreos/go-semver v0.3.0
github.com/docker/go-units v0.4.0
github.com/fsouza/fake-gcs-server v1.19.0 // indirect
github.com/go-sql-driver/mysql v1.5.0
github.com/golang/mock v1.4.4 // indirect
github.com/joho/sqltocsv v0.0.0-20210428211105-a6d6801d59df // indirect
github.com/pingcap/br v5.1.0-alpha.0.20210601094737-6cb0c4abc210+incompatible
github.com/go-sql-driver/mysql v1.6.0
github.com/pingcap/check v0.0.0-20200212061837-5e12011dc712
github.com/pingcap/errors v0.11.5-0.20201126102027-b0a155152ca3
github.com/pingcap/errors v0.11.5-0.20210425183316-da1aaba5fb63
github.com/pingcap/failpoint v0.0.0-20210316064728-7acb0f0a3dfd
github.com/pingcap/log v0.0.0-20210317133921-96f4fcab92a4
github.com/pingcap/parser v0.0.0-20210513020953-ae2c4497c07b
github.com/pingcap/tidb v1.1.0-beta.0.20210517044538-8ad868f801fc
github.com/pingcap/log v0.0.0-20210818144256-6455d4a4c6f9
github.com/pingcap/parser v0.0.0-20210823033705-7a7940986a30
github.com/pingcap/tidb v1.1.0-beta.0.20210827045605-d4cadb53ef12
github.com/pingcap/tidb-tools v5.2.0-alpha.0.20210727084616-915b22e4d42c+incompatible
github.com/prometheus/client_golang v1.5.1
github.com/prometheus/client_model v0.2.0
github.com/soheilhy/cmux v0.1.4
github.com/spf13/pflag v1.0.5
github.com/tikv/pd v1.1.0-beta.0.20210323121136-78679e5e209d
github.com/tikv/pd v1.1.0-beta.0.20210818082359-acba1da0018d
github.com/xitongsys/parquet-go v1.6.0 // indirect
go.etcd.io/etcd v0.5.0-alpha.5.0.20200824191128-ae9734ed278b
go.uber.org/zap v1.16.0
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
go.uber.org/zap v1.19.0
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
)
359 changes: 287 additions & 72 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion v4/export/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import (
"github.com/coreos/go-semver/semver"
"github.com/docker/go-units"
"github.com/go-sql-driver/mysql"
"github.com/pingcap/br/pkg/storage"
"github.com/pingcap/errors"
filter "github.com/pingcap/tidb-tools/pkg/table-filter"
"github.com/pingcap/tidb-tools/pkg/utils"
"github.com/pingcap/tidb/br/pkg/storage"
"github.com/prometheus/client_golang/prometheus"
"github.com/spf13/pflag"
"go.uber.org/zap"
Expand Down
2 changes: 1 addition & 1 deletion v4/export/consistency.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (

tcontext "github.com/pingcap/dumpling/v4/context"

"github.com/pingcap/br/pkg/utils"
"github.com/pingcap/errors"
"github.com/pingcap/tidb/br/pkg/utils"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions v4/export/dump.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ import (

// import mysql driver
_ "github.com/go-sql-driver/mysql"
"github.com/pingcap/br/pkg/storage"
"github.com/pingcap/br/pkg/summary"
"github.com/pingcap/errors"
"github.com/pingcap/failpoint"
pclog "github.com/pingcap/log"
"github.com/pingcap/tidb/br/pkg/storage"
"github.com/pingcap/tidb/br/pkg/summary"
"github.com/pingcap/tidb/store/helper"
"github.com/pingcap/tidb/tablecodec"
"github.com/pingcap/tidb/util/codec"
Expand Down
2 changes: 1 addition & 1 deletion v4/export/metadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (

tcontext "github.com/pingcap/dumpling/v4/context"

"github.com/pingcap/br/pkg/storage"
"github.com/pingcap/errors"
"github.com/pingcap/tidb/br/pkg/storage"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion v4/export/metadata_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
tcontext "github.com/pingcap/dumpling/v4/context"

"github.com/DATA-DOG/go-sqlmock"
"github.com/pingcap/br/pkg/storage"
. "github.com/pingcap/check"
"github.com/pingcap/tidb/br/pkg/storage"
)

var _ = Suite(&testMetaDataSuite{})
Expand Down
4 changes: 2 additions & 2 deletions v4/export/writer.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (

tcontext "github.com/pingcap/dumpling/v4/context"

"github.com/pingcap/br/pkg/storage"
"github.com/pingcap/br/pkg/utils"
"github.com/pingcap/errors"
"github.com/pingcap/tidb/br/pkg/storage"
"github.com/pingcap/tidb/br/pkg/utils"
"go.uber.org/zap"
)

Expand Down
4 changes: 2 additions & 2 deletions v4/export/writer_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import (

tcontext "github.com/pingcap/dumpling/v4/context"

"github.com/pingcap/br/pkg/storage"
"github.com/pingcap/br/pkg/summary"
"github.com/pingcap/errors"
"github.com/pingcap/failpoint"
"github.com/pingcap/tidb/br/pkg/storage"
"github.com/pingcap/tidb/br/pkg/summary"
"github.com/prometheus/client_golang/prometheus"
"go.uber.org/zap"
)
Expand Down
2 changes: 1 addition & 1 deletion v4/export/writer_util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
tcontext "github.com/pingcap/dumpling/v4/context"
"github.com/pingcap/dumpling/v4/log"

"github.com/pingcap/br/pkg/storage"
. "github.com/pingcap/check"
"github.com/pingcap/errors"
"github.com/pingcap/tidb/br/pkg/storage"
"github.com/prometheus/client_golang/prometheus"
)

Expand Down