Skip to content

Commit

Permalink
modify module
Browse files Browse the repository at this point in the history
  • Loading branch information
dbakit committed Jan 18, 2024
1 parent 05b0b48 commit 9bae13b
Show file tree
Hide file tree
Showing 30 changed files with 116 additions and 38 deletions.
4 changes: 2 additions & 2 deletions cmd/dumpling/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"github.com/spf13/pflag"
"go.uber.org/zap"

"github.com/pingcap/dumpling/v4/cli"
"github.com/pingcap/dumpling/v4/export"
"github.com/dbakit/dumpling/v4/cli"
"github.com/dbakit/dumpling/v4/export"
)

func main() {
Expand Down
84 changes: 81 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/pingcap/dumpling
module github.com/dbakit/dumpling

go 1.16
go 1.21.6

require (
github.com/DATA-DOG/go-sqlmock v1.5.0
Expand All @@ -19,11 +19,89 @@ require (
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.0
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.20210512015243-d19fbe541bf9
go.uber.org/goleak v1.1.11-0.20210813005559-691160354723
go.uber.org/zap v1.19.1
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
)

require (
cloud.google.com/go v0.93.3 // indirect
cloud.google.com/go/storage v1.16.1 // indirect
github.com/BurntSushi/toml v0.3.1 // indirect
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
github.com/VividCortex/ewma v1.1.1 // indirect
github.com/aws/aws-sdk-go v1.35.3 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/cheggaaa/pb/v3 v3.0.8 // indirect
github.com/coocood/freecache v1.1.1 // indirect
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e // indirect
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 // indirect
github.com/cznic/sortutil v0.0.0-20181122101858-f5f958428db8 // indirect
github.com/danjacques/gofslock v0.0.0-20191023191349-0a45f885bc37 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dgraph-io/ristretto v0.0.1 // indirect
github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 // indirect
github.com/fatih/color v1.10.0 // indirect
github.com/go-ole/go-ole v1.2.4 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.3 // indirect
github.com/google/btree v1.0.0 // indirect
github.com/google/go-cmp v0.5.6 // indirect
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
github.com/google/uuid v1.1.2 // indirect
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect
github.com/iancoleman/strcase v0.0.0-20191112232945-16388991a334 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/json-iterator/go v1.1.9 // indirect
github.com/mattn/go-colorable v0.1.8 // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/mattn/go-runewidth v0.0.12 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/ngaut/pools v0.0.0-20180318154953-b7bc8c42aac7 // indirect
github.com/ngaut/sync2 v0.0.0-20141008032647-7a24ed77b2ef // indirect
github.com/opentracing/opentracing-go v1.1.0 // indirect
github.com/pingcap/kvproto v0.0.0-20211011042309-a4518fcacbc8 // indirect
github.com/pingcap/tipb v0.0.0-20211008080435-3fd327dfce0e // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/common v0.9.1 // indirect
github.com/prometheus/procfs v0.0.8 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/shirou/gopsutil v3.21.2+incompatible // indirect
github.com/tikv/client-go/v2 v2.0.0-alpha.0.20211011083157-49c8dd23f1f0 // indirect
github.com/tklauser/go-sysconf v0.3.4 // indirect
github.com/tklauser/numcpus v0.2.1 // indirect
github.com/twmb/murmur3 v1.1.3 // indirect
github.com/uber/jaeger-client-go v2.22.1+incompatible // indirect
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
github.com/wangjohn/quickselect v0.0.0-20161129230411-ed8402a42d5f // indirect
github.com/xitongsys/parquet-go v1.6.0 // indirect
go.opencensus.io v0.23.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.7.0 // indirect
golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420 // indirect
golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a // indirect
golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/tools v0.1.5 // indirect
google.golang.org/api v0.54.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20210825212027-de86158e7fda // indirect
google.golang.org/grpc v1.40.0 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
)

replace google.golang.org/grpc => google.golang.org/grpc v1.29.1
2 changes: 1 addition & 1 deletion v4/cli/versions.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (

"go.uber.org/zap"

"github.com/pingcap/dumpling/v4/log"
"github.com/dbakit/dumpling/v4/log"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion v4/context/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package context
import (
gcontext "context"

"github.com/pingcap/dumpling/v4/log"
"github.com/dbakit/dumpling/v4/log"
)

// Context is used to in dm to record some context field like
Expand Down
2 changes: 1 addition & 1 deletion v4/export/block_allow_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package export
import (
"go.uber.org/zap"

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

func filterDatabases(tctx *tcontext.Context, conf *Config, databases []string) []string {
Expand Down
2 changes: 1 addition & 1 deletion v4/export/block_allow_list_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"testing"

tcontext "github.com/pingcap/dumpling/v4/context"
tcontext "github.com/dbakit/dumpling/v4/context"
"github.com/pingcap/tidb-tools/pkg/filter"
tf "github.com/pingcap/tidb-tools/pkg/table-filter"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion v4/export/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"text/template"
"time"

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

"github.com/coreos/go-semver/semver"
"github.com/docker/go-units"
Expand Down
2 changes: 1 addition & 1 deletion v4/export/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package export
import (
"testing"

tcontext "github.com/pingcap/dumpling/v4/context"
tcontext "github.com/dbakit/dumpling/v4/context"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion v4/export/consistency.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"context"
"database/sql"

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

"github.com/pingcap/errors"
"github.com/pingcap/tidb/br/pkg/utils"
Expand Down
2 changes: 1 addition & 1 deletion v4/export/consistency_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"errors"
"testing"

tcontext "github.com/pingcap/dumpling/v4/context"
tcontext "github.com/dbakit/dumpling/v4/context"
"github.com/stretchr/testify/require"

"github.com/DATA-DOG/go-sqlmock"
Expand Down
6 changes: 3 additions & 3 deletions v4/export/dump.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"strings"
"time"

"github.com/pingcap/dumpling/v4/cli"
tcontext "github.com/pingcap/dumpling/v4/context"
"github.com/pingcap/dumpling/v4/log"
"github.com/dbakit/dumpling/v4/cli"
tcontext "github.com/dbakit/dumpling/v4/context"
"github.com/dbakit/dumpling/v4/log"

// import mysql driver
_ "github.com/go-sql-driver/mysql"
Expand Down
2 changes: 1 addition & 1 deletion v4/export/dump_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"
"time"

tcontext "github.com/pingcap/dumpling/v4/context"
tcontext "github.com/dbakit/dumpling/v4/context"
"github.com/stretchr/testify/require"

"github.com/DATA-DOG/go-sqlmock"
Expand Down
4 changes: 2 additions & 2 deletions v4/export/http_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"strings"
"time"

"github.com/pingcap/dumpling/v4/log"
"github.com/dbakit/dumpling/v4/log"

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

"github.com/pingcap/errors"
"github.com/prometheus/client_golang/prometheus/promhttp"
Expand Down
2 changes: 1 addition & 1 deletion v4/export/ir.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/pingcap/errors"

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

// TableDataIR is table data intermediate representation.
Expand Down
2 changes: 1 addition & 1 deletion v4/export/ir_impl.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/pingcap/errors"
"go.uber.org/zap"

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

// rowIter implements the SQLRowIter interface.
Expand Down
2 changes: 1 addition & 1 deletion v4/export/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"os"
"testing"

"github.com/pingcap/dumpling/v4/log"
"github.com/dbakit/dumpling/v4/log"
"github.com/prometheus/client_golang/prometheus"
"github.com/stretchr/testify/require"
"go.uber.org/goleak"
Expand Down
2 changes: 1 addition & 1 deletion v4/export/metadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strings"
"time"

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

"github.com/pingcap/errors"
"github.com/pingcap/tidb/br/pkg/storage"
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 @@ -9,7 +9,7 @@ import (
"os"
"testing"

tcontext "github.com/pingcap/dumpling/v4/context"
tcontext "github.com/dbakit/dumpling/v4/context"
"github.com/stretchr/testify/require"

"github.com/DATA-DOG/go-sqlmock"
Expand Down
2 changes: 1 addition & 1 deletion v4/export/prepare.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"github.com/pingcap/errors"

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

const (
Expand Down
2 changes: 1 addition & 1 deletion v4/export/prepare_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"
"testing"

tcontext "github.com/pingcap/dumpling/v4/context"
tcontext "github.com/dbakit/dumpling/v4/context"
"github.com/stretchr/testify/require"

"github.com/DATA-DOG/go-sqlmock"
Expand Down
2 changes: 1 addition & 1 deletion v4/export/retry.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"time"

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

"github.com/go-sql-driver/mysql"
"github.com/pingcap/errors"
Expand Down
4 changes: 2 additions & 2 deletions v4/export/sql.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import (
"strconv"
"strings"

"github.com/pingcap/dumpling/v4/log"
"github.com/dbakit/dumpling/v4/log"

"github.com/go-sql-driver/mysql"

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

"github.com/pingcap/errors"
"github.com/pingcap/tidb/parser/model"
Expand Down
2 changes: 1 addition & 1 deletion v4/export/sql_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"strings"
"testing"

tcontext "github.com/pingcap/dumpling/v4/context"
tcontext "github.com/dbakit/dumpling/v4/context"
"github.com/stretchr/testify/require"

"github.com/DATA-DOG/go-sqlmock"
Expand Down
2 changes: 1 addition & 1 deletion v4/export/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"time"

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

"github.com/docker/go-units"
"go.uber.org/zap"
Expand Down
2 changes: 1 addition & 1 deletion v4/export/test_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"database/sql/driver"
"fmt"

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

"github.com/DATA-DOG/go-sqlmock"
)
Expand Down
2 changes: 1 addition & 1 deletion v4/export/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strings"
"time"

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

"github.com/pingcap/errors"
"go.etcd.io/etcd/clientv3"
Expand Down
2 changes: 1 addition & 1 deletion v4/export/writer.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strings"
"text/template"

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

"github.com/pingcap/errors"
"github.com/pingcap/tidb/br/pkg/storage"
Expand Down
2 changes: 1 addition & 1 deletion v4/export/writer_serial_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"
"testing"

tcontext "github.com/pingcap/dumpling/v4/context"
tcontext "github.com/dbakit/dumpling/v4/context"
"github.com/stretchr/testify/require"

"github.com/pingcap/errors"
Expand Down
2 changes: 1 addition & 1 deletion v4/export/writer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"testing"

"github.com/DATA-DOG/go-sqlmock"
tcontext "github.com/pingcap/dumpling/v4/context"
tcontext "github.com/dbakit/dumpling/v4/context"
"github.com/stretchr/testify/require"
)

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 @@ -12,8 +12,8 @@ import (
"sync"
"time"

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

"github.com/pingcap/errors"
"github.com/pingcap/failpoint"
Expand Down

0 comments on commit 9bae13b

Please sign in to comment.