*: udpate pd client vendor (pingcap#7898)

tianjiqx · Oct 15, 2018 · 1730798 · 1730798
1 parent a8f2909
commit 1730798
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 19 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/store/mockstore/mocktikv/mock.go b/store/mockstore/mocktikv/mock.go
@@ -14,7 +14,7 @@
 package mocktikv
 
 import (
- "github.com/pingcap/pd/pd-client"
+ "github.com/pingcap/pd/client"
  "github.com/pkg/errors"
 )
 

diff --git a/store/mockstore/mocktikv/pd.go b/store/mockstore/mocktikv/pd.go
@@ -18,7 +18,7 @@ import (
  "time"
 
  "github.com/pingcap/kvproto/pkg/metapb"
- "github.com/pingcap/pd/pd-client"
+ "github.com/pingcap/pd/client"
  "golang.org/x/net/context"
 )
 

diff --git a/store/mockstore/tikv.go b/store/mockstore/tikv.go
@@ -17,7 +17,7 @@ import (
  "net/url"
  "strings"
 
- "github.com/pingcap/pd/pd-client"
+ "github.com/pingcap/pd/client"
  "github.com/pingcap/tidb/config"
  "github.com/pingcap/tidb/kv"
  "github.com/pingcap/tidb/store/mockstore/mocktikv"

diff --git a/store/tikv/gcworker/gc_worker.go b/store/tikv/gcworker/gc_worker.go
@@ -25,7 +25,7 @@ import (
  "github.com/pingcap/kvproto/pkg/errorpb"
  "github.com/pingcap/kvproto/pkg/kvrpcpb"
  "github.com/pingcap/kvproto/pkg/metapb"
- "github.com/pingcap/pd/pd-client"
+ "github.com/pingcap/pd/client"
  "github.com/pingcap/tidb/ddl/util"
  "github.com/pingcap/tidb/kv"
  "github.com/pingcap/tidb/meta"

diff --git a/store/tikv/interface.go b/store/tikv/interface.go
@@ -16,7 +16,7 @@ package tikv
 import (
  "time"
 
- "github.com/pingcap/pd/pd-client"
+ "github.com/pingcap/pd/client"
  "github.com/pingcap/tidb/kv"
  "github.com/pingcap/tidb/store/tikv/oracle"
  "github.com/pingcap/tidb/store/tikv/tikvrpc"

diff --git a/store/tikv/kv.go b/store/tikv/kv.go
@@ -24,7 +24,7 @@ import (
 
  "github.com/coreos/etcd/clientv3"
  "github.com/grpc-ecosystem/go-grpc-prometheus"
- "github.com/pingcap/pd/pd-client"
+ "github.com/pingcap/pd/client"
  "github.com/pingcap/tidb/config"
  "github.com/pingcap/tidb/kv"
  "github.com/pingcap/tidb/metrics"

diff --git a/store/tikv/lock_resolver.go b/store/tikv/lock_resolver.go
@@ -20,7 +20,7 @@ import (
  "time"
 
  "github.com/pingcap/kvproto/pkg/kvrpcpb"
- "github.com/pingcap/pd/pd-client"
+ "github.com/pingcap/pd/client"
  "github.com/pingcap/tidb/config"
  "github.com/pingcap/tidb/metrics"
  "github.com/pingcap/tidb/store/tikv/tikvrpc"

diff --git a/store/tikv/oracle/oracles/pd.go b/store/tikv/oracle/oracles/pd.go
@@ -17,7 +17,7 @@ import (
  "sync/atomic"
  "time"
 
- "github.com/pingcap/pd/pd-client"
+ "github.com/pingcap/pd/client"
  "github.com/pingcap/tidb/metrics"
  "github.com/pingcap/tidb/store/tikv/oracle"
  "github.com/pkg/errors"
@@ -37,7 +37,7 @@ type pdOracle struct {
 }
 
 // NewPdOracle create an Oracle that uses a pd client source.
-// Refer https://github.com/pingcap/pd/blob/master/pd-client/client.go for more details.
+// Refer https://github.com/pingcap/pd/blob/master/client/client.go for more details.
 // PdOracle mantains `lastTS` to store the last timestamp got from PD server. If
 // `GetTimestamp()` is not called after `updateInterval`, it will be called by
 // itself to keep up with the timestamp on PD server.

diff --git a/store/tikv/pd_codec.go b/store/tikv/pd_codec.go
@@ -15,7 +15,7 @@ package tikv
 
 import (
  "github.com/pingcap/kvproto/pkg/metapb"
- "github.com/pingcap/pd/pd-client"
+ "github.com/pingcap/pd/client"
  "github.com/pingcap/tidb/util/codec"
  "github.com/pkg/errors"
  "golang.org/x/net/context"

diff --git a/store/tikv/rawkv.go b/store/tikv/rawkv.go
@@ -18,7 +18,7 @@ import (
  "time"
 
  "github.com/pingcap/kvproto/pkg/kvrpcpb"
- "github.com/pingcap/pd/pd-client"
+ "github.com/pingcap/pd/client"
  "github.com/pingcap/tidb/config"
  "github.com/pingcap/tidb/metrics"
  "github.com/pingcap/tidb/store/tikv/tikvrpc"

diff --git a/store/tikv/region_cache.go b/store/tikv/region_cache.go
@@ -22,7 +22,7 @@ import (
  "github.com/google/btree"
  "github.com/pingcap/kvproto/pkg/kvrpcpb"
  "github.com/pingcap/kvproto/pkg/metapb"
- "github.com/pingcap/pd/pd-client"
+ "github.com/pingcap/pd/client"
  "github.com/pingcap/tidb/metrics"
  "github.com/pkg/errors"
  log "github.com/sirupsen/logrus"

diff --git a/store/tikv/store_test.go b/store/tikv/store_test.go
@@ -20,7 +20,7 @@ import (
  . "github.com/pingcap/check"
  pb "github.com/pingcap/kvproto/pkg/kvrpcpb"
  "github.com/pingcap/kvproto/pkg/metapb"
- "github.com/pingcap/pd/pd-client"
+ "github.com/pingcap/pd/client"
  "github.com/pingcap/tidb/kv"
  "github.com/pingcap/tidb/store/mockoracle"
  "github.com/pingcap/tidb/store/tikv/tikvrpc"

diff --git a/store/tikv/test_util.go b/store/tikv/test_util.go
@@ -14,7 +14,7 @@
 package tikv
 
 import (
- "github.com/pingcap/pd/pd-client"
+ "github.com/pingcap/pd/client"
  "github.com/pingcap/tidb/kv"
  "github.com/pkg/errors"
  "github.com/twinj/uuid"

diff --git a/...github.com/pingcap/pd/pd-client/client.go → ...or/github.com/pingcap/pd/client/client.go b/...github.com/pingcap/pd/pd-client/client.go → ...or/github.com/pingcap/pd/client/client.go
diff --git a/...ithub.com/pingcap/pd/pd-client/metrics.go → ...r/github.com/pingcap/pd/client/metrics.go b/...ithub.com/pingcap/pd/pd-client/metrics.go → ...r/github.com/pingcap/pd/client/metrics.go