Skip to content

Commit

Permalink
vendor: update kvproto for coprocessor streaming API (pingcap#5214)
Browse files Browse the repository at this point in the history
  • Loading branch information
tiancaiamao authored and hanfei1991 committed Nov 25, 2017
1 parent af4e73c commit f283a65
Show file tree
Hide file tree
Showing 10 changed files with 1,299 additions and 1,063 deletions.
823 changes: 430 additions & 393 deletions _vendor/src/github.com/pingcap/kvproto/pkg/eraftpb/eraftpb.pb.go

Large diffs are not rendered by default.

341 changes: 149 additions & 192 deletions _vendor/src/github.com/pingcap/kvproto/pkg/errorpb/errorpb.pb.go

Large diffs are not rendered by default.

459 changes: 337 additions & 122 deletions _vendor/src/github.com/pingcap/kvproto/pkg/kvrpcpb/kvrpcpb.pb.go

Large diffs are not rendered by default.

301 changes: 144 additions & 157 deletions _vendor/src/github.com/pingcap/kvproto/pkg/metapb/metapb.pb.go

Large diffs are not rendered by default.

259 changes: 117 additions & 142 deletions _vendor/src/github.com/pingcap/kvproto/pkg/pdpb/pdpb.pb.go

Large diffs are not rendered by default.

143 changes: 102 additions & 41 deletions _vendor/src/github.com/pingcap/kvproto/pkg/tikvpb/tikvpb.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion glide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ import:
- go-tipb
- sharedbytes
- package: github.com/pingcap/kvproto
version: 3c5b40fb2000acb6b3441d5695cb470a23e8f1b5
version: e33073e1475021e04c795c3de5e1f4e28baa708a
- package: github.com/gogo/protobuf
version: ^0.3.0
subpackages:
Expand Down
22 changes: 11 additions & 11 deletions store/tikv/mock-tikv/rpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,17 +109,17 @@ func (h *rpcHandler) checkRequestContext(ctx *kvrpcpb.Context) *errorpb.Error {
ctxPeer := ctx.GetPeer()
if ctxPeer != nil && ctxPeer.GetStoreId() != h.storeID {
return &errorpb.Error{
Message: proto.String("store not match"),
Message: *proto.String("store not match"),
StoreNotMatch: &errorpb.StoreNotMatch{},
}
}
region, leaderID := h.cluster.GetRegion(ctx.GetRegionId())
// No region found.
if region == nil {
return &errorpb.Error{
Message: proto.String("region not found"),
Message: *proto.String("region not found"),
RegionNotFound: &errorpb.RegionNotFound{
RegionId: proto.Uint64(ctx.GetRegionId()),
RegionId: *proto.Uint64(ctx.GetRegionId()),
},
}
}
Expand All @@ -135,27 +135,27 @@ func (h *rpcHandler) checkRequestContext(ctx *kvrpcpb.Context) *errorpb.Error {
// The Store does not contain a Peer of the Region.
if storePeer == nil {
return &errorpb.Error{
Message: proto.String("region not found"),
Message: *proto.String("region not found"),
RegionNotFound: &errorpb.RegionNotFound{
RegionId: proto.Uint64(ctx.GetRegionId()),
RegionId: *proto.Uint64(ctx.GetRegionId()),
},
}
}
// No leader.
if leaderPeer == nil {
return &errorpb.Error{
Message: proto.String("no leader"),
Message: *proto.String("no leader"),
NotLeader: &errorpb.NotLeader{
RegionId: proto.Uint64(ctx.GetRegionId()),
RegionId: *proto.Uint64(ctx.GetRegionId()),
},
}
}
// The Peer on the Store is not leader.
if storePeer.GetId() != leaderPeer.GetId() {
return &errorpb.Error{
Message: proto.String("not leader"),
Message: *proto.String("not leader"),
NotLeader: &errorpb.NotLeader{
RegionId: proto.Uint64(ctx.GetRegionId()),
RegionId: *proto.Uint64(ctx.GetRegionId()),
Leader: leaderPeer,
},
}
Expand All @@ -168,7 +168,7 @@ func (h *rpcHandler) checkRequestContext(ctx *kvrpcpb.Context) *errorpb.Error {
newRegions = append(newRegions, nextRegion)
}
return &errorpb.Error{
Message: proto.String("stale epoch"),
Message: *proto.String("stale epoch"),
StaleEpoch: &errorpb.StaleEpoch{
NewRegions: newRegions,
},
Expand Down Expand Up @@ -387,7 +387,7 @@ func (h *rpcHandler) handleKvRawScan(req *kvrpcpb.RawScanRequest) *kvrpcpb.RawSc
errStr := "not implemented"
return &kvrpcpb.RawScanResponse{
RegionError: &errorpb.Error{
Message: &errStr,
Message: errStr,
},
}
}
Expand Down
4 changes: 4 additions & 0 deletions store/tikv/region_request_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,10 @@ func (s *mockTikvGrpcServer) SplitRegion(goctx.Context, *kvrpcpb.SplitRegionRequ
return nil, errors.New("unreachable")
}

func (s *mockTikvGrpcServer) CoprocessorStream(*coprocessor.Request, tikvpb.Tikv_CoprocessorStreamServer) error {
return errors.New("unreachable")
}

func (s *testRegionRequestSuite) TestNoReloadRegionForGrpcWhenCtxCanceled(c *C) {
// prepare a mock tikv grpc server
addr := "localhost:56341"
Expand Down

0 comments on commit f283a65

Please sign in to comment.