diff --git a/cmd/diff/main.go b/cmd/diff/main.go index f0fdc4acb..4ea997765 100644 --- a/cmd/diff/main.go +++ b/cmd/diff/main.go @@ -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" ) diff --git a/cmd/drainer/main.go b/cmd/drainer/main.go index a3597508c..251079986 100644 --- a/cmd/drainer/main.go +++ b/cmd/drainer/main.go @@ -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" diff --git a/cmd/pump/main.go b/cmd/pump/main.go index bf3b6326d..94b781f8b 100644 --- a/cmd/pump/main.go +++ b/cmd/pump/main.go @@ -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" diff --git a/cmd/reparo/main.go b/cmd/reparo/main.go index cb498df14..85328bbe1 100644 --- a/cmd/reparo/main.go +++ b/cmd/reparo/main.go @@ -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" ) diff --git a/diff/diff.go b/diff/diff.go index 35cfb36ec..efa916a23 100644 --- a/diff/diff.go +++ b/diff/diff.go @@ -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. @@ -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 { @@ -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 { diff --git a/drainer/checkpoint/checkpoint.go b/drainer/checkpoint/checkpoint.go index ef4bab8c9..b4e0245f3 100644 --- a/drainer/checkpoint/checkpoint.go +++ b/drainer/checkpoint/checkpoint.go @@ -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. diff --git a/drainer/checkpoint/flash.go b/drainer/checkpoint/flash.go index 72de6305e..7deeafc52 100644 --- a/drainer/checkpoint/flash.go +++ b/drainer/checkpoint/flash.go @@ -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" ) diff --git a/drainer/checkpoint/kafka.go b/drainer/checkpoint/kafka.go index c80f07533..2e9f587d2 100644 --- a/drainer/checkpoint/kafka.go +++ b/drainer/checkpoint/kafka.go @@ -4,8 +4,8 @@ import ( "math" "sync" - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" ) // KafkaCheckpoint is local CheckPoint struct. diff --git a/drainer/checkpoint/mysql.go b/drainer/checkpoint/mysql.go index 5d4526f48..cf486df25 100644 --- a/drainer/checkpoint/mysql.go +++ b/drainer/checkpoint/mysql.go @@ -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" diff --git a/drainer/checkpoint/pb.go b/drainer/checkpoint/pb.go index 442841e1f..3a0460390 100644 --- a/drainer/checkpoint/pb.go +++ b/drainer/checkpoint/pb.go @@ -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" ) diff --git a/drainer/collector.go b/drainer/collector.go index e9f9891ed..a4281e9df 100644 --- a/drainer/collector.go +++ b/drainer/collector.go @@ -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" diff --git a/drainer/config.go b/drainer/config.go index 732b81b99..a97d1297a 100644 --- a/drainer/config.go +++ b/drainer/config.go @@ -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" diff --git a/drainer/executor/executor.go b/drainer/executor/executor.go index 21444fceb..986636909 100644 --- a/drainer/executor/executor.go +++ b/drainer/executor/executor.go @@ -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 diff --git a/drainer/executor/flash.go b/drainer/executor/flash.go index 8bbf0d63b..8adf26fbb 100644 --- a/drainer/executor/flash.go +++ b/drainer/executor/flash.go @@ -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" diff --git a/drainer/executor/kafka.go b/drainer/executor/kafka.go index fe5159c1f..e4daa47e9 100644 --- a/drainer/executor/kafka.go +++ b/drainer/executor/kafka.go @@ -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" diff --git a/drainer/executor/mysql.go b/drainer/executor/mysql.go index 7810c72db..e8316b5d0 100644 --- a/drainer/executor/mysql.go +++ b/drainer/executor/mysql.go @@ -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" ) diff --git a/drainer/executor/pb.go b/drainer/executor/pb.go index e115ce640..c53007f96 100644 --- a/drainer/executor/pb.go +++ b/drainer/executor/pb.go @@ -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" diff --git a/drainer/executor/util_test.go b/drainer/executor/util_test.go index c72de0fb2..cf9865951 100644 --- a/drainer/executor/util_test.go +++ b/drainer/executor/util_test.go @@ -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" ) diff --git a/drainer/pump.go b/drainer/pump.go index be4c69929..45a925998 100644 --- a/drainer/pump.go +++ b/drainer/pump.go @@ -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" diff --git a/drainer/schema.go b/drainer/schema.go index 09a985ea5..351e19142 100644 --- a/drainer/schema.go +++ b/drainer/schema.go @@ -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" ) diff --git a/drainer/schema_test.go b/drainer/schema_test.go index 9fdd9ca6b..ddae9874e 100644 --- a/drainer/schema_test.go +++ b/drainer/schema_test.go @@ -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" diff --git a/drainer/server.go b/drainer/server.go index 9de9971c9..78f938349 100644 --- a/drainer/server.go +++ b/drainer/server.go @@ -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" diff --git a/drainer/syncer.go b/drainer/syncer.go index 62490c1f6..a12357658 100644 --- a/drainer/syncer.go +++ b/drainer/syncer.go @@ -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" diff --git a/drainer/translator/flash.go b/drainer/translator/flash.go index d566373ac..05c0a0c3a 100644 --- a/drainer/translator/flash.go +++ b/drainer/translator/flash.go @@ -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" diff --git a/drainer/translator/flash_util.go b/drainer/translator/flash_util.go index ba8202a2a..0ffed3e8a 100644 --- a/drainer/translator/flash_util.go +++ b/drainer/translator/flash_util.go @@ -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" diff --git a/drainer/translator/kafka.go b/drainer/translator/kafka.go index 92bde0d8f..1795162f4 100644 --- a/drainer/translator/kafka.go +++ b/drainer/translator/kafka.go @@ -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" diff --git a/drainer/translator/mysql.go b/drainer/translator/mysql.go index eef87b250..62b52f7a7 100644 --- a/drainer/translator/mysql.go +++ b/drainer/translator/mysql.go @@ -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" diff --git a/drainer/translator/pb.go b/drainer/translator/pb.go index bb0a65abf..86f51ac4b 100644 --- a/drainer/translator/pb.go +++ b/drainer/translator/pb.go @@ -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" diff --git a/drainer/translator/translator.go b/drainer/translator/translator.go index 595df02cf..24d0f7248 100644 --- a/drainer/translator/translator.go +++ b/drainer/translator/translator.go @@ -1,8 +1,8 @@ package translator import ( - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" "github.com/pingcap/tidb/model" ) diff --git a/drainer/util.go b/drainer/util.go index e3090ed3d..2ce43b97a 100644 --- a/drainer/util.go +++ b/drainer/util.go @@ -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" diff --git a/go.mod b/go.mod index 2b728bd2a..25ca5b320 100644 --- a/go.mod +++ b/go.mod @@ -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 @@ -63,7 +64,7 @@ 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 @@ -71,7 +72,7 @@ require ( 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 @@ -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 diff --git a/pkg/assemble/assemble.go b/pkg/assemble/assemble.go index 00922ecb2..cff87bfab 100644 --- a/pkg/assemble/assemble.go +++ b/pkg/assemble/assemble.go @@ -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" diff --git a/pkg/binlogfile/file.go b/pkg/binlogfile/file.go index 11c199026..722b1b6a2 100644 --- a/pkg/binlogfile/file.go +++ b/pkg/binlogfile/file.go @@ -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" ) diff --git a/pkg/compress/compress.go b/pkg/compress/compress.go index 91418d9ab..7fd93ab39 100644 --- a/pkg/compress/compress.go +++ b/pkg/compress/compress.go @@ -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. diff --git a/pkg/etcd/etcd.go b/pkg/etcd/etcd.go index 2ae84e7be..e10e50590 100644 --- a/pkg/etcd/etcd.go +++ b/pkg/etcd/etcd.go @@ -7,7 +7,7 @@ import ( "time" "github.com/coreos/etcd/clientv3" - "github.com/juju/errors" + "github.com/pingcap/errors" "golang.org/x/net/context" ) diff --git a/pkg/etcd/etcd_test.go b/pkg/etcd/etcd_test.go index c6b7d9bda..048e1f728 100644 --- a/pkg/etcd/etcd_test.go +++ b/pkg/etcd/etcd_test.go @@ -6,8 +6,8 @@ import ( "github.com/coreos/etcd/clientv3" "github.com/coreos/etcd/integration" - "github.com/juju/errors" . "github.com/pingcap/check" + "github.com/pingcap/errors" "golang.org/x/net/context" ) diff --git a/pkg/flags/flag.go b/pkg/flags/flag.go index 3e962d81f..b91b50c1e 100644 --- a/pkg/flags/flag.go +++ b/pkg/flags/flag.go @@ -6,8 +6,8 @@ import ( "os" "strings" - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" ) func flagToEnv(prefix, name string) string { diff --git a/pkg/flags/urls.go b/pkg/flags/urls.go index 3e8f3c5c8..748f66760 100644 --- a/pkg/flags/urls.go +++ b/pkg/flags/urls.go @@ -5,7 +5,7 @@ import ( "net/url" "strings" - "github.com/juju/errors" + "github.com/pingcap/errors" "github.com/pingcap/tidb-binlog/pkg/types" ) diff --git a/pkg/loader/bench_test.go b/pkg/loader/bench_test.go index 144688cc1..19eaa9ee9 100644 --- a/pkg/loader/bench_test.go +++ b/pkg/loader/bench_test.go @@ -7,8 +7,8 @@ import ( "testing" _ "github.com/go-sql-driver/mysql" - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" ) func getTestDB() (db *sql.DB, err error) { diff --git a/pkg/loader/causality.go b/pkg/loader/causality.go index aacae9145..8c98d15e1 100644 --- a/pkg/loader/causality.go +++ b/pkg/loader/causality.go @@ -13,7 +13,7 @@ package loader -import "github.com/juju/errors" +import "github.com/pingcap/errors" // Causality provides a simple mechanism to improve the concurrency of SQLs execution under the premise of ensuring correctness. // causality groups sqls that maybe contain causal relationships, and syncer executes them linearly. diff --git a/pkg/loader/executor.go b/pkg/loader/executor.go index c20992d9d..eab232669 100644 --- a/pkg/loader/executor.go +++ b/pkg/loader/executor.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" "github.com/prometheus/client_golang/prometheus" "golang.org/x/sync/errgroup" ) diff --git a/pkg/loader/load.go b/pkg/loader/load.go index 4653e64fe..29278414c 100644 --- a/pkg/loader/load.go +++ b/pkg/loader/load.go @@ -8,8 +8,8 @@ import ( "sync/atomic" "time" - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" "github.com/prometheus/client_golang/prometheus" "golang.org/x/sync/errgroup" diff --git a/pkg/loader/merge.go b/pkg/loader/merge.go index 6a8c946a2..ac4731f1b 100644 --- a/pkg/loader/merge.go +++ b/pkg/loader/merge.go @@ -2,7 +2,7 @@ package loader import ( "github.com/ngaut/log" - "github.com/pkg/errors" + "github.com/pingcap/errors" ) // all DML must be the same table diff --git a/pkg/loader/util.go b/pkg/loader/util.go index cd16bf8c6..765d6a449 100644 --- a/pkg/loader/util.go +++ b/pkg/loader/util.go @@ -6,7 +6,7 @@ import ( "hash/crc32" "strings" - "github.com/juju/errors" + "github.com/pingcap/errors" ) type tableInfo struct { diff --git a/pkg/node/registry.go b/pkg/node/registry.go index 51ce4c894..a259a2774 100644 --- a/pkg/node/registry.go +++ b/pkg/node/registry.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" "github.com/pingcap/tidb-binlog/pkg/etcd" "golang.org/x/net/context" ) diff --git a/pkg/offsets/offset.go b/pkg/offsets/offset.go index b0347f693..09eb3e2ca 100644 --- a/pkg/offsets/offset.go +++ b/pkg/offsets/offset.go @@ -2,8 +2,8 @@ package offsets import ( "github.com/Shopify/sarama" - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" "golang.org/x/net/context" ) diff --git a/pkg/offsets/offset_test.go b/pkg/offsets/offset_test.go index 12ca8f11b..4efb802fb 100644 --- a/pkg/offsets/offset_test.go +++ b/pkg/offsets/offset_test.go @@ -11,8 +11,8 @@ import ( "math/rand" "github.com/Shopify/sarama" - "github.com/juju/errors" . "github.com/pingcap/check" + "github.com/pingcap/errors" "github.com/pingcap/tidb-binlog/pkg/assemble" "github.com/pingcap/tidb-binlog/pump" "github.com/pingcap/tipb/go-binlog" diff --git a/pkg/security/security.go b/pkg/security/security.go index e04b0922e..98c2cfec7 100644 --- a/pkg/security/security.go +++ b/pkg/security/security.go @@ -5,7 +5,7 @@ import ( "crypto/x509" "io/ioutil" - "github.com/juju/errors" + "github.com/pingcap/errors" "github.com/pingcap/tidb/config" ) diff --git a/pkg/sql/sql.go b/pkg/sql/sql.go index 777dcd3c3..4e0f23803 100644 --- a/pkg/sql/sql.go +++ b/pkg/sql/sql.go @@ -11,8 +11,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/go-sql-driver/mysql" - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" tddl "github.com/pingcap/tidb/ddl" "github.com/pingcap/tidb/infoschema" tmysql "github.com/pingcap/tidb/mysql" diff --git a/pkg/types/urls.go b/pkg/types/urls.go index e2685f2e2..0eda69049 100644 --- a/pkg/types/urls.go +++ b/pkg/types/urls.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "github.com/juju/errors" + "github.com/pingcap/errors" ) // URLs defines a slice of URLs as a type diff --git a/pkg/util/kafka.go b/pkg/util/kafka.go index 7b3ef2540..b8cece171 100644 --- a/pkg/util/kafka.go +++ b/pkg/util/kafka.go @@ -5,8 +5,8 @@ import ( "time" "github.com/Shopify/sarama" - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" metrics "github.com/rcrowley/go-metrics" "github.com/rcrowley/go-metrics/exp" ) diff --git a/pkg/util/ts.go b/pkg/util/ts.go index 3c0826ca0..cca400da5 100644 --- a/pkg/util/ts.go +++ b/pkg/util/ts.go @@ -3,8 +3,8 @@ package util import ( "time" - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" "github.com/pingcap/pd/pd-client" "github.com/pingcap/tidb/store/tikv/oracle" "golang.org/x/net/context" diff --git a/pkg/util/util.go b/pkg/util/util.go index 0bc81f930..9d7c36600 100644 --- a/pkg/util/util.go +++ b/pkg/util/util.go @@ -5,8 +5,8 @@ import ( "net" "time" - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" "github.com/pingcap/tidb/kv" "github.com/pingcap/tidb/model" "github.com/pingcap/tidb/types" diff --git a/pkg/zk/zk.go b/pkg/zk/zk.go index 7a32eafd9..5d4bde1ab 100644 --- a/pkg/zk/zk.go +++ b/pkg/zk/zk.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/juju/errors" + "github.com/pingcap/errors" "github.com/samuel/go-zookeeper/zk" ) diff --git a/pump/binlogger.go b/pump/binlogger.go index 121970438..7cc06a663 100644 --- a/pump/binlogger.go +++ b/pump/binlogger.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" bf "github.com/pingcap/tidb-binlog/pkg/binlogfile" "github.com/pingcap/tidb-binlog/pkg/compress" "github.com/pingcap/tidb-binlog/pkg/file" diff --git a/pump/binlogger_test.go b/pump/binlogger_test.go index 5c95b2d54..184dd5c80 100644 --- a/pump/binlogger_test.go +++ b/pump/binlogger_test.go @@ -7,8 +7,8 @@ import ( "path" "time" - "github.com/juju/errors" . "github.com/pingcap/check" + "github.com/pingcap/errors" bf "github.com/pingcap/tidb-binlog/pkg/binlogfile" "github.com/pingcap/tidb-binlog/pkg/compress" "github.com/pingcap/tipb/go-binlog" diff --git a/pump/config.go b/pump/config.go index 68d3810b0..ed30ad465 100644 --- a/pump/config.go +++ b/pump/config.go @@ -11,7 +11,7 @@ import ( "time" "github.com/BurntSushi/toml" - "github.com/juju/errors" + "github.com/pingcap/errors" "github.com/pingcap/tidb-binlog/pkg/flags" "github.com/pingcap/tidb-binlog/pkg/security" "github.com/pingcap/tidb-binlog/pkg/util" diff --git a/pump/encoder.go b/pump/encoder.go index 5a485537d..89457e271 100644 --- a/pump/encoder.go +++ b/pump/encoder.go @@ -5,8 +5,8 @@ import ( "hash/crc32" "io" - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" "github.com/pingcap/tidb-binlog/pkg/compress" pkgfile "github.com/pingcap/tidb-binlog/pkg/file" "github.com/pingcap/tipb/go-binlog" diff --git a/pump/node.go b/pump/node.go index 09d5a27f1..fec69f9ae 100644 --- a/pump/node.go +++ b/pump/node.go @@ -11,8 +11,8 @@ import ( "sync" "time" - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" "github.com/pingcap/tidb-binlog/pkg/etcd" "github.com/pingcap/tidb-binlog/pkg/file" "github.com/pingcap/tidb-binlog/pkg/flags" @@ -210,7 +210,7 @@ func (p *pumpNode) Quit() error { func readLocalNodeID(dataDir string) (string, error) { nodeIDPath := filepath.Join(dataDir, nodeIDFile) if _, err := CheckFileExist(nodeIDPath); err != nil { - return "", errors.NewNotFound(err, "local nodeID file not exist") + return "", errors.NotFoundf("local nodeID file not exist: %v", err) } data, err := ioutil.ReadFile(nodeIDPath) if err != nil { diff --git a/pump/server.go b/pump/server.go index 98c48c69a..c55c41636 100644 --- a/pump/server.go +++ b/pump/server.go @@ -14,8 +14,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/pkg/flags" "github.com/pingcap/tidb-binlog/pkg/node" diff --git a/pump/storage/errors.go b/pump/storage/errors.go index d52a1010d..fce0c3756 100644 --- a/pump/storage/errors.go +++ b/pump/storage/errors.go @@ -1,6 +1,6 @@ package storage -import "github.com/juju/errors" +import "github.com/pingcap/errors" var ( // ErrWrongMagic means the magic number mismatch diff --git a/pump/storage/log.go b/pump/storage/log.go index 5e476ecd1..4c191bd66 100644 --- a/pump/storage/log.go +++ b/pump/storage/log.go @@ -9,8 +9,8 @@ import ( "os" "sync" - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" pb "github.com/pingcap/tipb/go-binlog" ) diff --git a/pump/storage/log_test.go b/pump/storage/log_test.go index 7ab02a3f3..8ff946011 100644 --- a/pump/storage/log_test.go +++ b/pump/storage/log_test.go @@ -12,9 +12,9 @@ import ( "strconv" fuzz "github.com/google/gofuzz" - "github.com/juju/errors" "github.com/ngaut/log" "github.com/pingcap/check" + "github.com/pingcap/errors" pb "github.com/pingcap/tipb/go-binlog" ) diff --git a/pump/storage/storage.go b/pump/storage/storage.go index c03ee685d..074b5f957 100644 --- a/pump/storage/storage.go +++ b/pump/storage/storage.go @@ -11,8 +11,8 @@ import ( "sync/atomic" "time" - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" pkgutil "github.com/pingcap/tidb-binlog/pkg/util" "github.com/pingcap/tidb/kv" "github.com/pingcap/tidb/store/tikv" diff --git a/pump/storage/vlog.go b/pump/storage/vlog.go index 7030a4f9d..7888df11d 100644 --- a/pump/storage/vlog.go +++ b/pump/storage/vlog.go @@ -12,8 +12,8 @@ import ( "sync" "sync/atomic" - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" pb "github.com/pingcap/tipb/go-binlog" ) diff --git a/pump/util.go b/pump/util.go index 7339815d2..fc5b03267 100644 --- a/pump/util.go +++ b/pump/util.go @@ -10,7 +10,7 @@ import ( "sync/atomic" "github.com/Shopify/sarama" - "github.com/juju/errors" + "github.com/pingcap/errors" bf "github.com/pingcap/tidb-binlog/pkg/binlogfile" binlog "github.com/pingcap/tipb/go-binlog" ) diff --git a/reparo/config.go b/reparo/config.go index fea86c4de..b09d3780c 100644 --- a/reparo/config.go +++ b/reparo/config.go @@ -8,8 +8,8 @@ import ( "time" "github.com/BurntSushi/toml" - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" "github.com/pingcap/tidb-binlog/pkg/flags" "github.com/pingcap/tidb-binlog/pkg/version" "github.com/pingcap/tidb-binlog/reparo/executor" diff --git a/reparo/ddl.go b/reparo/ddl.go index f91b26aa1..51a5b3ca7 100644 --- a/reparo/ddl.go +++ b/reparo/ddl.go @@ -1,8 +1,8 @@ package repora import ( - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" "github.com/pingcap/tidb/ast" "github.com/pingcap/tidb/parser" ) diff --git a/reparo/decode.go b/reparo/decode.go index 01614c41e..856bc7f1d 100644 --- a/reparo/decode.go +++ b/reparo/decode.go @@ -5,7 +5,7 @@ import ( "hash/crc32" "io" - "github.com/juju/errors" + "github.com/pingcap/errors" pb "github.com/pingcap/tidb-binlog/proto/binlog" ) diff --git a/reparo/executor/mysql.go b/reparo/executor/mysql.go index 82548e4d3..30df87091 100644 --- a/reparo/executor/mysql.go +++ b/reparo/executor/mysql.go @@ -5,7 +5,7 @@ package executor import ( "database/sql" - "github.com/juju/errors" + "github.com/pingcap/errors" pkgsql "github.com/pingcap/tidb-binlog/pkg/sql" ) diff --git a/reparo/file.go b/reparo/file.go index 034628430..b40f8f208 100644 --- a/reparo/file.go +++ b/reparo/file.go @@ -3,8 +3,8 @@ package repora import ( "path" - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" bf "github.com/pingcap/tidb-binlog/pkg/binlogfile" ) diff --git a/reparo/reparo.go b/reparo/reparo.go index 4be520ac9..2058fd602 100644 --- a/reparo/reparo.go +++ b/reparo/reparo.go @@ -7,8 +7,8 @@ import ( "regexp" "time" - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" pkgsql "github.com/pingcap/tidb-binlog/pkg/sql" "github.com/pingcap/tidb-binlog/reparo/executor" "github.com/pingcap/tidb-binlog/reparo/translator" diff --git a/reparo/savepoint/file.go b/reparo/savepoint/file.go index 2e880eaec..b5236b33e 100644 --- a/reparo/savepoint/file.go +++ b/reparo/savepoint/file.go @@ -7,8 +7,8 @@ import ( "time" "github.com/BurntSushi/toml" - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" "github.com/pingcap/tidb-binlog/pkg/file" ) diff --git a/reparo/translate.go b/reparo/translate.go index 82d126e73..bd4512152 100644 --- a/reparo/translate.go +++ b/reparo/translate.go @@ -1,7 +1,7 @@ package repora import ( - "github.com/juju/errors" + "github.com/pingcap/errors" pb "github.com/pingcap/tidb-binlog/proto/binlog" ) diff --git a/reparo/translator/mysql.go b/reparo/translator/mysql.go index 4c9c30fe9..d22a7f9c4 100644 --- a/reparo/translator/mysql.go +++ b/reparo/translator/mysql.go @@ -6,8 +6,8 @@ import ( "reflect" "strings" - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" "github.com/pingcap/tidb-binlog/pkg/dml" pb "github.com/pingcap/tidb-binlog/proto/binlog" "github.com/pingcap/tidb/util/codec" diff --git a/tests/binlog/binlog.go b/tests/binlog/binlog.go index e8700a6d4..0eeb3078f 100644 --- a/tests/binlog/binlog.go +++ b/tests/binlog/binlog.go @@ -5,8 +5,8 @@ import ( "os" _ "github.com/go-sql-driver/mysql" - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" "github.com/pingcap/tidb-binlog/tests/dailytest" "github.com/pingcap/tidb-binlog/tests/util" ) diff --git a/tests/dailytest/case.go b/tests/dailytest/case.go index 355155a29..f23b9c55f 100644 --- a/tests/dailytest/case.go +++ b/tests/dailytest/case.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" "github.com/pingcap/tidb-binlog/diff" ) diff --git a/tests/dailytest/db.go b/tests/dailytest/db.go index 7b3ac9233..ff576dfa5 100644 --- a/tests/dailytest/db.go +++ b/tests/dailytest/db.go @@ -8,8 +8,8 @@ import ( "strconv" "time" - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" "github.com/pingcap/tidb-binlog/diff" "github.com/pingcap/tidb-binlog/tests/util" "github.com/pingcap/tidb/mysql" diff --git a/tests/dailytest/job.go b/tests/dailytest/job.go index fb553006d..4350a53ca 100644 --- a/tests/dailytest/job.go +++ b/tests/dailytest/job.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" "github.com/pingcap/tidb/mysql" "github.com/pingcap/tidb/types" ) diff --git a/tests/dailytest/parser.go b/tests/dailytest/parser.go index 88b388631..8562206ff 100644 --- a/tests/dailytest/parser.go +++ b/tests/dailytest/parser.go @@ -5,8 +5,8 @@ import ( "strconv" "strings" - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" "github.com/pingcap/tidb/ast" "github.com/pingcap/tidb/parser" "github.com/pingcap/tidb/types" diff --git a/tests/flash/flash.go b/tests/flash/flash.go index b83b3081d..634f4f861 100644 --- a/tests/flash/flash.go +++ b/tests/flash/flash.go @@ -6,8 +6,8 @@ import ( "os" _ "github.com/go-sql-driver/mysql" - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" pkgsql "github.com/pingcap/tidb-binlog/pkg/sql" "github.com/pingcap/tidb-binlog/tests/dailytest" "github.com/pingcap/tidb-binlog/tests/util" diff --git a/tests/kafka/kafka.go b/tests/kafka/kafka.go index 62580a869..e6a077470 100644 --- a/tests/kafka/kafka.go +++ b/tests/kafka/kafka.go @@ -7,8 +7,8 @@ import ( "github.com/Shopify/sarama" _ "github.com/go-sql-driver/mysql" - "github.com/juju/errors" "github.com/ngaut/log" + "github.com/pingcap/errors" "github.com/pingcap/tidb-binlog/diff" "github.com/pingcap/tidb-binlog/pkg/loader" "github.com/pingcap/tidb-binlog/tests/dailytest" diff --git a/tests/util/config.go b/tests/util/config.go index e619f942e..b98003c22 100644 --- a/tests/util/config.go +++ b/tests/util/config.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/BurntSushi/toml" - "github.com/juju/errors" + "github.com/pingcap/errors" "github.com/pingcap/tidb-binlog/diff" ) diff --git a/tests/util/db.go b/tests/util/db.go index 707626325..e393e7efe 100644 --- a/tests/util/db.go +++ b/tests/util/db.go @@ -7,7 +7,7 @@ import ( "net/url" "time" - "github.com/juju/errors" + "github.com/pingcap/errors" "github.com/pingcap/tidb-binlog/diff" ) diff --git a/vendor/github.com/zanmato1984/clickhouse/lib/column/decimal.go b/vendor/github.com/zanmato1984/clickhouse/lib/column/decimal.go index 8156708d4..631427800 100644 --- a/vendor/github.com/zanmato1984/clickhouse/lib/column/decimal.go +++ b/vendor/github.com/zanmato1984/clickhouse/lib/column/decimal.go @@ -1,12 +1,12 @@ package column import ( + "errors" "fmt" "reflect" "strconv" "strings" - "github.com/juju/errors" "github.com/zanmato1984/clickhouse/lib/binary" ) @@ -26,7 +26,7 @@ func (d *Decimal) Write(encoder *binary.Encoder, v interface{}) error { case []byte: _, err := encoder.Write(value) if err != nil { - return errors.Trace(err) + return err } return nil default: @@ -45,11 +45,11 @@ func parseDecimal(name, chType string) (*Decimal, error) { splits := strings.Split(s, ",") precision, err := strconv.Atoi(splits[0]) if err != nil { - return nil, errors.Trace(err) + return nil, err } scale, err := strconv.Atoi(splits[1]) if err != nil { - return nil, errors.Trace(err) + return nil, err } return &Decimal{ base: base{