switch juju/errors to pingcap/error (#464) (#473)

* switch juju/errors to pingcap/error

run:
find . | grep "\.go$" | grep -v "vendor" | xargs \
gsed -i 's/github.com\/juju\/errors/github.com\/pingcap\/errors/g' $*

and update github.com/zanmato1984/clickhouse

* go fmt all files

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"
 )
 

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/version"
 )

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/version"
 	"github.com/pingcap/tidb-binlog/pump"
 )

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/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 {

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.

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"
 )

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.

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"

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"
 )
 

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"

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"

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

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"

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"

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"
 )
 

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"

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"
 )
 

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"

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"
 )

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"

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"

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"

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"

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"

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"

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"

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"

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"
 )
 

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-binlog/pkg/util"

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
@@ -71,7 +72,7 @@ require (
 	github.com/pingcap/tidb v2.1.0-beta.0.20180823032518-ef6590e1899a+incompatible
 	github.com/pingcap/tidb-tools v2.1.3-0.20190215110732-23405d82dbe6+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

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"

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"
 )
 

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.

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"
 )
 

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"
 )