Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

switch juju/errors to pingcap/error #464

Merged
merged 2 commits into from
Feb 15, 2019
Merged

switch juju/errors to pingcap/error #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81320eb
switch juju/errors to pingcap/error
july2993 Feb 14, 2019
97c8527
go fmt all files
july2993 Feb 15, 2019
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 cmd/diff/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

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

"github.com/juju/errors"
"github.com/ngaut/log"
"github.com/pingcap/errors"
"github.com/pingcap/tidb-binlog/diff"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/drainer/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"syscall"
"time"

"github.com/juju/errors"
"github.com/ngaut/log"
"github.com/pingcap/errors"
"github.com/pingcap/tidb-binlog/drainer"
"github.com/pingcap/tidb-binlog/pkg/util"
"github.com/pingcap/tidb-binlog/pkg/version"
Expand Down
2 changes: 1 addition & 1 deletion cmd/pump/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (

_ "net/http/pprof"

"github.com/juju/errors"
"github.com/ngaut/log"
"github.com/pingcap/errors"
"github.com/pingcap/tidb-binlog/pkg/util"
"github.com/pingcap/tidb-binlog/pkg/version"
"github.com/pingcap/tidb-binlog/pump"
Expand Down
2 changes: 1 addition & 1 deletion cmd/reparo/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

_ "net/http/pprof"

"github.com/juju/errors"
"github.com/ngaut/log"
"github.com/pingcap/errors"
"github.com/pingcap/tidb-binlog/pkg/version"
reparo "github.com/pingcap/tidb-binlog/reparo"
)
Expand Down
6 changes: 3 additions & 3 deletions diff/diff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"database/sql"
"fmt"

"github.com/juju/errors"
"github.com/ngaut/log"
"github.com/onsi/gomega"
"github.com/pingcap/errors"
)

// Diff contains two sql DB, used for comparing.
Expand Down Expand Up @@ -132,7 +132,7 @@ func (df *Diff) equalCreateTable(tblName string) (bool, error) {
_, err1 := getCreateTable(df.db1, tblName)
_, err2 := getCreateTable(df.db2, tblName)

if errors.IsNotFound(err1) && errors.IsNotFound(err2) {
if err1 != nil && errors.IsNotFound(err1) && err2 != nil && errors.IsNotFound(err2) {
return true, nil
}
if err1 != nil {
Expand Down Expand Up @@ -308,7 +308,7 @@ func getCreateTable(db *sql.DB, tn string) (string, error) {
err := rs.Scan(&name, &cs)
return cs, errors.Trace(err)
}
return "", errors.NewNotFound(nil, "table not exist")
return "", errors.NotFoundf("table not exist")
}

type comparableSQLRow interface {
Expand Down
2 changes: 1 addition & 1 deletion drainer/checkpoint/checkpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package checkpoint

import (
"github.com/juju/errors"
"github.com/ngaut/log"
"github.com/pingcap/errors"
)

// CheckPoint is the binlog sync pos meta.
Expand Down
2 changes: 1 addition & 1 deletion drainer/checkpoint/flash.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"sync"
"time"

"github.com/juju/errors"
"github.com/ngaut/log"
"github.com/pingcap/errors"
"github.com/pingcap/tidb-binlog/pkg/flash"
pkgsql "github.com/pingcap/tidb-binlog/pkg/sql"
)
Expand Down
2 changes: 1 addition & 1 deletion drainer/checkpoint/kafka.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"math"
"sync"

"github.com/juju/errors"
"github.com/ngaut/log"
"github.com/pingcap/errors"
)

// KafkaCheckpoint is local CheckPoint struct.
Expand Down
2 changes: 1 addition & 1 deletion drainer/checkpoint/mysql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"sync"
"time"

"github.com/juju/errors"
"github.com/ngaut/log"
"github.com/pingcap/errors"

// mysql driver
_ "github.com/go-sql-driver/mysql"
Expand Down
2 changes: 1 addition & 1 deletion drainer/checkpoint/pb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"time"

"github.com/BurntSushi/toml"
"github.com/juju/errors"
"github.com/ngaut/log"
"github.com/pingcap/errors"
"github.com/siddontang/go/ioutil2"
)

Expand Down
2 changes: 1 addition & 1 deletion drainer/collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"sync"
"time"

"github.com/juju/errors"
"github.com/ngaut/log"
"github.com/pingcap/errors"
"github.com/pingcap/tidb-binlog/drainer/checkpoint"
"github.com/pingcap/tidb-binlog/pkg/etcd"
"github.com/pingcap/tidb-binlog/pkg/flags"
Expand Down
2 changes: 1 addition & 1 deletion drainer/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"time"

"github.com/BurntSushi/toml"
"github.com/juju/errors"
"github.com/ngaut/log"
"github.com/pingcap/errors"
"github.com/pingcap/tidb-binlog/drainer/executor"
"github.com/pingcap/tidb-binlog/pkg/flags"
"github.com/pingcap/tidb-binlog/pkg/security"
Expand Down
2 changes: 1 addition & 1 deletion drainer/executor/executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package executor

import (
"github.com/juju/errors"
"github.com/pingcap/errors"
)

// Executor is the interface for execute TiDB binlog's sql
Expand Down
2 changes: 1 addition & 1 deletion drainer/executor/flash.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"sync"
"time"

"github.com/juju/errors"
"github.com/ngaut/log"
"github.com/pingcap/errors"
"github.com/pingcap/tidb-binlog/pkg/flash"
pkgsql "github.com/pingcap/tidb-binlog/pkg/sql"
"github.com/zanmato1984/clickhouse"
Expand Down
2 changes: 1 addition & 1 deletion drainer/executor/kafka.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (

"github.com/Shopify/sarama"
"github.com/gogo/protobuf/proto"
"github.com/juju/errors"
"github.com/ngaut/log"
"github.com/pingcap/errors"
"github.com/pingcap/tidb-binlog/drainer/checkpoint"
"github.com/pingcap/tidb-binlog/pkg/util"
obinlog "github.com/pingcap/tidb-tools/tidb-binlog/slave_binlog_proto/go-binlog"
Expand Down
2 changes: 1 addition & 1 deletion drainer/executor/mysql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/prometheus/client_golang/prometheus"

"github.com/juju/errors"
"github.com/pingcap/errors"
pkgsql "github.com/pingcap/tidb-binlog/pkg/sql"
)

Expand Down
2 changes: 1 addition & 1 deletion drainer/executor/pb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package executor

import (
"github.com/juju/errors"
"github.com/pingcap/errors"
"github.com/pingcap/tidb-binlog/pkg/compress"
pb "github.com/pingcap/tidb-binlog/proto/binlog"
"github.com/pingcap/tidb-binlog/pump"
Expand Down
2 changes: 1 addition & 1 deletion drainer/executor/util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"database/sql/driver"
"testing"

"github.com/juju/errors"
. "github.com/pingcap/check"
"github.com/pingcap/errors"
pkgsql "github.com/pingcap/tidb-binlog/pkg/sql"
)

Expand Down
2 changes: 1 addition & 1 deletion drainer/pump.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"sync/atomic"
"time"

"github.com/juju/errors"
"github.com/ngaut/log"
"github.com/pingcap/errors"
"github.com/pingcap/tidb-binlog/pkg/util"
"github.com/pingcap/tidb-binlog/pump"
"github.com/pingcap/tidb/store/tikv/oracle"
Expand Down
2 changes: 1 addition & 1 deletion drainer/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package drainer
import (
"encoding/json"

"github.com/juju/errors"
"github.com/ngaut/log"
"github.com/pingcap/errors"
"github.com/pingcap/tidb/model"
"github.com/pingcap/tidb/mysql"
)
Expand Down
2 changes: 1 addition & 1 deletion drainer/schema_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package drainer
import (
"fmt"

"github.com/juju/errors"
. "github.com/pingcap/check"
"github.com/pingcap/errors"
"github.com/pingcap/tidb/model"
"github.com/pingcap/tidb/mysql"
"github.com/pingcap/tidb/types"
Expand Down
2 changes: 1 addition & 1 deletion drainer/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"time"

"github.com/gorilla/mux"
"github.com/juju/errors"
"github.com/ngaut/log"
"github.com/pingcap/errors"
"github.com/pingcap/pd/pd-client"
"github.com/pingcap/tidb-binlog/drainer/checkpoint"
"github.com/pingcap/tidb-binlog/pkg/flags"
Expand Down
2 changes: 1 addition & 1 deletion drainer/syncer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (

"golang.org/x/net/context"

"github.com/juju/errors"
"github.com/ngaut/log"
"github.com/pingcap/errors"
"github.com/pingcap/tidb-binlog/drainer/checkpoint"
"github.com/pingcap/tidb-binlog/drainer/executor"
"github.com/pingcap/tidb-binlog/drainer/translator"
Expand Down
2 changes: 1 addition & 1 deletion drainer/translator/flash.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"strings"
gotime "time"

"github.com/juju/errors"
"github.com/ngaut/log"
"github.com/pingcap/errors"
"github.com/pingcap/tidb-binlog/pkg/dml"
"github.com/pingcap/tidb-binlog/pkg/util"
"github.com/pingcap/tidb/ast"
Expand Down
2 changes: 1 addition & 1 deletion drainer/translator/flash_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"math/big"
gotime "time"

"github.com/juju/errors"
"github.com/ngaut/log"
"github.com/pingcap/errors"
"github.com/pingcap/tidb/ast"
"github.com/pingcap/tidb/model"
"github.com/pingcap/tidb/mysql"
Expand Down
2 changes: 1 addition & 1 deletion drainer/translator/kafka.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"time"

"github.com/golang/protobuf/proto"
"github.com/juju/errors"
"github.com/ngaut/log"
"github.com/pingcap/errors"
"github.com/pingcap/tidb-binlog/pkg/util"
obinlog "github.com/pingcap/tidb-tools/tidb-binlog/slave_binlog_proto/go-binlog"
"github.com/pingcap/tidb/model"
Expand Down
2 changes: 1 addition & 1 deletion drainer/translator/mysql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"sync/atomic"
"time"

"github.com/juju/errors"
"github.com/pingcap/errors"
"github.com/pingcap/tidb-binlog/pkg/dml"
"github.com/pingcap/tidb-binlog/pkg/util"
"github.com/pingcap/tidb/ast"
Expand Down
2 changes: 1 addition & 1 deletion drainer/translator/pb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"time"

"github.com/golang/protobuf/proto"
"github.com/juju/errors"
"github.com/pingcap/errors"
"github.com/pingcap/tidb-binlog/pkg/util"
pb "github.com/pingcap/tidb-binlog/proto/binlog"
"github.com/pingcap/tidb/ast"
Expand Down
2 changes: 1 addition & 1 deletion drainer/translator/translator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package translator

import (
"github.com/juju/errors"
"github.com/ngaut/log"
"github.com/pingcap/errors"
"github.com/pingcap/tidb/model"
)

Expand Down
2 changes: 1 addition & 1 deletion drainer/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"time"

"github.com/Shopify/sarama"
"github.com/juju/errors"
"github.com/ngaut/log"
"github.com/pingcap/errors"
"github.com/pingcap/tidb-binlog/drainer/checkpoint"
"github.com/pingcap/tidb-binlog/drainer/executor"
"github.com/pingcap/tidb/kv"
Expand Down
9 changes: 5 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,11 @@ require (
github.com/grpc-ecosystem/grpc-gateway v1.3.1 // indirect
github.com/hpcloud/tail v1.0.0 // indirect
github.com/jonboulle/clockwork v0.1.0 // indirect
github.com/juju/errors v0.0.0-20160809030848-6f54ff631840
github.com/juju/errors v0.0.0-20160809030848-6f54ff631840 // indirect
github.com/juju/loggo v0.0.0-20180524022052-584905176618 // indirect
github.com/juju/testing v0.0.0-20180920084828-472a3e8b2073 // indirect
github.com/kr/pretty v0.1.0 // indirect
github.com/kshvakov/clickhouse v1.3.5 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/montanaflynn/stats v0.0.0-20180911141734-db72e6cae808 // indirect
github.com/ngaut/deadline v0.0.0-20150302045450-fae8f9dfd704 // indirect
Expand All @@ -63,15 +64,15 @@ require (
github.com/petar/GoLLRB v0.0.0-20130427215148-53be0d36a84c // indirect
github.com/pierrec/lz4 v2.0.5+incompatible // indirect
github.com/pingcap/check v0.0.0-20171206051426-1c287c953996
github.com/pingcap/errors v0.11.0 // indirect
github.com/pingcap/errors v0.11.0
github.com/pingcap/goleveldb v0.0.0-20161010101021-158edde5a354 // indirect
github.com/pingcap/kvproto v0.0.0-20181010074705-0ba3ca8a6e37 // indirect
github.com/pingcap/parser v0.0.0-20181210061630-27e9d3e251d4 // indirect
github.com/pingcap/pd v2.0.5+incompatible
github.com/pingcap/tidb v2.1.0-beta.0.20180823032518-ef6590e1899a+incompatible
github.com/pingcap/tidb-tools v2.1.1-0.20181130053235-0206fdab9ef8+incompatible
github.com/pingcap/tipb v0.0.0-20180711115030-4141907f6909
github.com/pkg/errors v0.8.0
github.com/pkg/errors v0.8.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v0.8.0
github.com/prometheus/client_model v0.0.0-20150212101744-fa8ad6fec335 // indirect
Expand All @@ -93,7 +94,7 @@ require (
github.com/unrolled/render v0.0.0-20180807193321-4206df6ff701
github.com/urfave/negroni v1.0.0 // indirect
github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18 // indirect
github.com/zanmato1984/clickhouse v0.0.0-20180829183406-6c32f7b4cd79
github.com/zanmato1984/clickhouse v1.3.4-0.20181106115746-3e9a6b9beb12
go.uber.org/atomic v1.3.2 // indirect
golang.org/x/crypto v0.0.0-20150218234220-1351f936d976 // indirect
golang.org/x/lint v0.0.0-20181011164241-5906bd5c48cd // indirect
Expand Down
2 changes: 1 addition & 1 deletion pkg/assemble/assemble.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"sync"

"github.com/Shopify/sarama"
"github.com/juju/errors"
"github.com/ngaut/log"
"github.com/pingcap/errors"
"github.com/pingcap/tidb-binlog/pkg/bitmap"
"github.com/pingcap/tidb-binlog/pkg/slicer"
"github.com/pingcap/tidb-binlog/pump"
Expand Down
2 changes: 1 addition & 1 deletion pkg/binlogfile/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"strings"
"time"

"github.com/juju/errors"
"github.com/ngaut/log"
"github.com/pingcap/errors"
"github.com/pingcap/tidb-binlog/pkg/file"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/compress/compress.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"compress/gzip"
"strings"

"github.com/juju/errors"
"github.com/ngaut/log"
"github.com/pingcap/errors"
)

// CompressionCodec defines type of compression.
Expand Down
2 changes: 1 addition & 1 deletion pkg/etcd/etcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"time"

"github.com/coreos/etcd/clientv3"
"github.com/juju/errors"
"github.com/pingcap/errors"
"golang.org/x/net/context"
)

Expand Down
Loading