From f283a65f6b29db3a4fd9888556fa6b3f97dd14ed Mon Sep 17 00:00:00 2001 From: tiancaiamao Date: Fri, 24 Nov 2017 21:00:08 -0600 Subject: [PATCH] vendor: update kvproto for coprocessor streaming API (#5214) --- .../pingcap/kvproto/pkg/eraftpb/eraftpb.pb.go | 823 +++++++++--------- .../pingcap/kvproto/pkg/errorpb/errorpb.pb.go | 341 ++++---- .../pingcap/kvproto/pkg/kvrpcpb/kvrpcpb.pb.go | 459 +++++++--- .../pingcap/kvproto/pkg/metapb/metapb.pb.go | 301 +++---- .../pingcap/kvproto/pkg/pdpb/pdpb.pb.go | 259 +++--- .../pingcap/kvproto/pkg/tikvpb/tikvpb.pb.go | 143 ++- glide.lock | 8 +- glide.yaml | 2 +- store/tikv/mock-tikv/rpc.go | 22 +- store/tikv/region_request_test.go | 4 + 10 files changed, 1299 insertions(+), 1063 deletions(-) diff --git a/_vendor/src/github.com/pingcap/kvproto/pkg/eraftpb/eraftpb.pb.go b/_vendor/src/github.com/pingcap/kvproto/pkg/eraftpb/eraftpb.pb.go index 1efead05cba9d..552a90502228e 100644 --- a/_vendor/src/github.com/pingcap/kvproto/pkg/eraftpb/eraftpb.pb.go +++ b/_vendor/src/github.com/pingcap/kvproto/pkg/eraftpb/eraftpb.pb.go @@ -54,22 +54,9 @@ var EntryType_value = map[string]int32{ "EntryConfChange": 1, } -func (x EntryType) Enum() *EntryType { - p := new(EntryType) - *p = x - return p -} func (x EntryType) String() string { return proto.EnumName(EntryType_name, int32(x)) } -func (x *EntryType) UnmarshalJSON(data []byte) error { - value, err := proto.UnmarshalJSONEnum(EntryType_value, data, "EntryType") - if err != nil { - return err - } - *x = EntryType(value) - return nil -} func (EntryType) EnumDescriptor() ([]byte, []int) { return fileDescriptorEraftpb, []int{0} } type MessageType int32 @@ -139,65 +126,41 @@ var MessageType_value = map[string]int32{ "MsgRequestPreVoteResponse": 18, } -func (x MessageType) Enum() *MessageType { - p := new(MessageType) - *p = x - return p -} func (x MessageType) String() string { return proto.EnumName(MessageType_name, int32(x)) } -func (x *MessageType) UnmarshalJSON(data []byte) error { - value, err := proto.UnmarshalJSONEnum(MessageType_value, data, "MessageType") - if err != nil { - return err - } - *x = MessageType(value) - return nil -} func (MessageType) EnumDescriptor() ([]byte, []int) { return fileDescriptorEraftpb, []int{1} } type ConfChangeType int32 const ( - ConfChangeType_AddNode ConfChangeType = 0 - ConfChangeType_RemoveNode ConfChangeType = 1 + ConfChangeType_AddNode ConfChangeType = 0 + ConfChangeType_RemoveNode ConfChangeType = 1 + ConfChangeType_AddLearnerNode ConfChangeType = 2 ) var ConfChangeType_name = map[int32]string{ 0: "AddNode", 1: "RemoveNode", + 2: "AddLearnerNode", } var ConfChangeType_value = map[string]int32{ - "AddNode": 0, - "RemoveNode": 1, + "AddNode": 0, + "RemoveNode": 1, + "AddLearnerNode": 2, } -func (x ConfChangeType) Enum() *ConfChangeType { - p := new(ConfChangeType) - *p = x - return p -} func (x ConfChangeType) String() string { return proto.EnumName(ConfChangeType_name, int32(x)) } -func (x *ConfChangeType) UnmarshalJSON(data []byte) error { - value, err := proto.UnmarshalJSONEnum(ConfChangeType_value, data, "ConfChangeType") - if err != nil { - return err - } - *x = ConfChangeType(value) - return nil -} func (ConfChangeType) EnumDescriptor() ([]byte, []int) { return fileDescriptorEraftpb, []int{2} } type Entry struct { - EntryType *EntryType `protobuf:"varint,1,opt,name=entry_type,json=entryType,enum=eraftpb.EntryType" json:"entry_type,omitempty"` - Term *uint64 `protobuf:"varint,2,opt,name=term" json:"term,omitempty"` - Index *uint64 `protobuf:"varint,3,opt,name=index" json:"index,omitempty"` - Data []byte `protobuf:"bytes,4,opt,name=data" json:"data,omitempty"` - SyncLog *bool `protobuf:"varint,5,opt,name=sync_log,json=syncLog" json:"sync_log,omitempty"` - XXX_unrecognized []byte `json:"-"` + EntryType EntryType `protobuf:"varint,1,opt,name=entry_type,json=entryType,proto3,enum=eraftpb.EntryType" json:"entry_type,omitempty"` + Term uint64 `protobuf:"varint,2,opt,name=term,proto3" json:"term,omitempty"` + Index uint64 `protobuf:"varint,3,opt,name=index,proto3" json:"index,omitempty"` + Data []byte `protobuf:"bytes,4,opt,name=data,proto3" json:"data,omitempty"` + SyncLog bool `protobuf:"varint,5,opt,name=sync_log,json=syncLog,proto3" json:"sync_log,omitempty"` } func (m *Entry) Reset() { *m = Entry{} } @@ -206,22 +169,22 @@ func (*Entry) ProtoMessage() {} func (*Entry) Descriptor() ([]byte, []int) { return fileDescriptorEraftpb, []int{0} } func (m *Entry) GetEntryType() EntryType { - if m != nil && m.EntryType != nil { - return *m.EntryType + if m != nil { + return m.EntryType } return EntryType_EntryNormal } func (m *Entry) GetTerm() uint64 { - if m != nil && m.Term != nil { - return *m.Term + if m != nil { + return m.Term } return 0 } func (m *Entry) GetIndex() uint64 { - if m != nil && m.Index != nil { - return *m.Index + if m != nil { + return m.Index } return 0 } @@ -234,17 +197,16 @@ func (m *Entry) GetData() []byte { } func (m *Entry) GetSyncLog() bool { - if m != nil && m.SyncLog != nil { - return *m.SyncLog + if m != nil { + return m.SyncLog } return false } type SnapshotMetadata struct { - ConfState *ConfState `protobuf:"bytes,1,opt,name=conf_state,json=confState" json:"conf_state,omitempty"` - Index *uint64 `protobuf:"varint,2,opt,name=index" json:"index,omitempty"` - Term *uint64 `protobuf:"varint,3,opt,name=term" json:"term,omitempty"` - XXX_unrecognized []byte `json:"-"` + ConfState *ConfState `protobuf:"bytes,1,opt,name=conf_state,json=confState" json:"conf_state,omitempty"` + Index uint64 `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty"` + Term uint64 `protobuf:"varint,3,opt,name=term,proto3" json:"term,omitempty"` } func (m *SnapshotMetadata) Reset() { *m = SnapshotMetadata{} } @@ -260,23 +222,22 @@ func (m *SnapshotMetadata) GetConfState() *ConfState { } func (m *SnapshotMetadata) GetIndex() uint64 { - if m != nil && m.Index != nil { - return *m.Index + if m != nil { + return m.Index } return 0 } func (m *SnapshotMetadata) GetTerm() uint64 { - if m != nil && m.Term != nil { - return *m.Term + if m != nil { + return m.Term } return 0 } type Snapshot struct { - Data []byte `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"` - Metadata *SnapshotMetadata `protobuf:"bytes,2,opt,name=metadata" json:"metadata,omitempty"` - XXX_unrecognized []byte `json:"-"` + Data []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` + Metadata *SnapshotMetadata `protobuf:"bytes,2,opt,name=metadata" json:"metadata,omitempty"` } func (m *Snapshot) Reset() { *m = Snapshot{} } @@ -299,19 +260,18 @@ func (m *Snapshot) GetMetadata() *SnapshotMetadata { } type Message struct { - MsgType *MessageType `protobuf:"varint,1,opt,name=msg_type,json=msgType,enum=eraftpb.MessageType" json:"msg_type,omitempty"` - To *uint64 `protobuf:"varint,2,opt,name=to" json:"to,omitempty"` - From *uint64 `protobuf:"varint,3,opt,name=from" json:"from,omitempty"` - Term *uint64 `protobuf:"varint,4,opt,name=term" json:"term,omitempty"` - LogTerm *uint64 `protobuf:"varint,5,opt,name=log_term,json=logTerm" json:"log_term,omitempty"` - Index *uint64 `protobuf:"varint,6,opt,name=index" json:"index,omitempty"` - Entries []*Entry `protobuf:"bytes,7,rep,name=entries" json:"entries,omitempty"` - Commit *uint64 `protobuf:"varint,8,opt,name=commit" json:"commit,omitempty"` - Snapshot *Snapshot `protobuf:"bytes,9,opt,name=snapshot" json:"snapshot,omitempty"` - Reject *bool `protobuf:"varint,10,opt,name=reject" json:"reject,omitempty"` - RejectHint *uint64 `protobuf:"varint,11,opt,name=reject_hint,json=rejectHint" json:"reject_hint,omitempty"` - Context []byte `protobuf:"bytes,12,opt,name=context" json:"context,omitempty"` - XXX_unrecognized []byte `json:"-"` + MsgType MessageType `protobuf:"varint,1,opt,name=msg_type,json=msgType,proto3,enum=eraftpb.MessageType" json:"msg_type,omitempty"` + To uint64 `protobuf:"varint,2,opt,name=to,proto3" json:"to,omitempty"` + From uint64 `protobuf:"varint,3,opt,name=from,proto3" json:"from,omitempty"` + Term uint64 `protobuf:"varint,4,opt,name=term,proto3" json:"term,omitempty"` + LogTerm uint64 `protobuf:"varint,5,opt,name=log_term,json=logTerm,proto3" json:"log_term,omitempty"` + Index uint64 `protobuf:"varint,6,opt,name=index,proto3" json:"index,omitempty"` + Entries []*Entry `protobuf:"bytes,7,rep,name=entries" json:"entries,omitempty"` + Commit uint64 `protobuf:"varint,8,opt,name=commit,proto3" json:"commit,omitempty"` + Snapshot *Snapshot `protobuf:"bytes,9,opt,name=snapshot" json:"snapshot,omitempty"` + Reject bool `protobuf:"varint,10,opt,name=reject,proto3" json:"reject,omitempty"` + RejectHint uint64 `protobuf:"varint,11,opt,name=reject_hint,json=rejectHint,proto3" json:"reject_hint,omitempty"` + Context []byte `protobuf:"bytes,12,opt,name=context,proto3" json:"context,omitempty"` } func (m *Message) Reset() { *m = Message{} } @@ -320,43 +280,43 @@ func (*Message) ProtoMessage() {} func (*Message) Descriptor() ([]byte, []int) { return fileDescriptorEraftpb, []int{3} } func (m *Message) GetMsgType() MessageType { - if m != nil && m.MsgType != nil { - return *m.MsgType + if m != nil { + return m.MsgType } return MessageType_MsgHup } func (m *Message) GetTo() uint64 { - if m != nil && m.To != nil { - return *m.To + if m != nil { + return m.To } return 0 } func (m *Message) GetFrom() uint64 { - if m != nil && m.From != nil { - return *m.From + if m != nil { + return m.From } return 0 } func (m *Message) GetTerm() uint64 { - if m != nil && m.Term != nil { - return *m.Term + if m != nil { + return m.Term } return 0 } func (m *Message) GetLogTerm() uint64 { - if m != nil && m.LogTerm != nil { - return *m.LogTerm + if m != nil { + return m.LogTerm } return 0 } func (m *Message) GetIndex() uint64 { - if m != nil && m.Index != nil { - return *m.Index + if m != nil { + return m.Index } return 0 } @@ -369,8 +329,8 @@ func (m *Message) GetEntries() []*Entry { } func (m *Message) GetCommit() uint64 { - if m != nil && m.Commit != nil { - return *m.Commit + if m != nil { + return m.Commit } return 0 } @@ -383,15 +343,15 @@ func (m *Message) GetSnapshot() *Snapshot { } func (m *Message) GetReject() bool { - if m != nil && m.Reject != nil { - return *m.Reject + if m != nil { + return m.Reject } return false } func (m *Message) GetRejectHint() uint64 { - if m != nil && m.RejectHint != nil { - return *m.RejectHint + if m != nil { + return m.RejectHint } return 0 } @@ -404,10 +364,9 @@ func (m *Message) GetContext() []byte { } type HardState struct { - Term *uint64 `protobuf:"varint,1,opt,name=term" json:"term,omitempty"` - Vote *uint64 `protobuf:"varint,2,opt,name=vote" json:"vote,omitempty"` - Commit *uint64 `protobuf:"varint,3,opt,name=commit" json:"commit,omitempty"` - XXX_unrecognized []byte `json:"-"` + Term uint64 `protobuf:"varint,1,opt,name=term,proto3" json:"term,omitempty"` + Vote uint64 `protobuf:"varint,2,opt,name=vote,proto3" json:"vote,omitempty"` + Commit uint64 `protobuf:"varint,3,opt,name=commit,proto3" json:"commit,omitempty"` } func (m *HardState) Reset() { *m = HardState{} } @@ -416,29 +375,29 @@ func (*HardState) ProtoMessage() {} func (*HardState) Descriptor() ([]byte, []int) { return fileDescriptorEraftpb, []int{4} } func (m *HardState) GetTerm() uint64 { - if m != nil && m.Term != nil { - return *m.Term + if m != nil { + return m.Term } return 0 } func (m *HardState) GetVote() uint64 { - if m != nil && m.Vote != nil { - return *m.Vote + if m != nil { + return m.Vote } return 0 } func (m *HardState) GetCommit() uint64 { - if m != nil && m.Commit != nil { - return *m.Commit + if m != nil { + return m.Commit } return 0 } type ConfState struct { - Nodes []uint64 `protobuf:"varint,1,rep,name=nodes" json:"nodes,omitempty"` - XXX_unrecognized []byte `json:"-"` + Nodes []uint64 `protobuf:"varint,1,rep,packed,name=nodes" json:"nodes,omitempty"` + Learners []uint64 `protobuf:"varint,2,rep,packed,name=learners" json:"learners,omitempty"` } func (m *ConfState) Reset() { *m = ConfState{} } @@ -453,12 +412,18 @@ func (m *ConfState) GetNodes() []uint64 { return nil } +func (m *ConfState) GetLearners() []uint64 { + if m != nil { + return m.Learners + } + return nil +} + type ConfChange struct { - Id *uint64 `protobuf:"varint,1,opt,name=id" json:"id,omitempty"` - ChangeType *ConfChangeType `protobuf:"varint,2,opt,name=change_type,json=changeType,enum=eraftpb.ConfChangeType" json:"change_type,omitempty"` - NodeId *uint64 `protobuf:"varint,3,opt,name=node_id,json=nodeId" json:"node_id,omitempty"` - Context []byte `protobuf:"bytes,4,opt,name=context" json:"context,omitempty"` - XXX_unrecognized []byte `json:"-"` + Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + ChangeType ConfChangeType `protobuf:"varint,2,opt,name=change_type,json=changeType,proto3,enum=eraftpb.ConfChangeType" json:"change_type,omitempty"` + NodeId uint64 `protobuf:"varint,3,opt,name=node_id,json=nodeId,proto3" json:"node_id,omitempty"` + Context []byte `protobuf:"bytes,4,opt,name=context,proto3" json:"context,omitempty"` } func (m *ConfChange) Reset() { *m = ConfChange{} } @@ -467,22 +432,22 @@ func (*ConfChange) ProtoMessage() {} func (*ConfChange) Descriptor() ([]byte, []int) { return fileDescriptorEraftpb, []int{6} } func (m *ConfChange) GetId() uint64 { - if m != nil && m.Id != nil { - return *m.Id + if m != nil { + return m.Id } return 0 } func (m *ConfChange) GetChangeType() ConfChangeType { - if m != nil && m.ChangeType != nil { - return *m.ChangeType + if m != nil { + return m.ChangeType } return ConfChangeType_AddNode } func (m *ConfChange) GetNodeId() uint64 { - if m != nil && m.NodeId != nil { - return *m.NodeId + if m != nil { + return m.NodeId } return 0 } @@ -521,40 +486,37 @@ func (m *Entry) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.EntryType != nil { + if m.EntryType != 0 { dAtA[i] = 0x8 i++ - i = encodeVarintEraftpb(dAtA, i, uint64(*m.EntryType)) + i = encodeVarintEraftpb(dAtA, i, uint64(m.EntryType)) } - if m.Term != nil { + if m.Term != 0 { dAtA[i] = 0x10 i++ - i = encodeVarintEraftpb(dAtA, i, uint64(*m.Term)) + i = encodeVarintEraftpb(dAtA, i, uint64(m.Term)) } - if m.Index != nil { + if m.Index != 0 { dAtA[i] = 0x18 i++ - i = encodeVarintEraftpb(dAtA, i, uint64(*m.Index)) + i = encodeVarintEraftpb(dAtA, i, uint64(m.Index)) } - if m.Data != nil { + if len(m.Data) > 0 { dAtA[i] = 0x22 i++ i = encodeVarintEraftpb(dAtA, i, uint64(len(m.Data))) i += copy(dAtA[i:], m.Data) } - if m.SyncLog != nil { + if m.SyncLog { dAtA[i] = 0x28 i++ - if *m.SyncLog { + if m.SyncLog { dAtA[i] = 1 } else { dAtA[i] = 0 } i++ } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } return i, nil } @@ -583,18 +545,15 @@ func (m *SnapshotMetadata) MarshalTo(dAtA []byte) (int, error) { } i += n1 } - if m.Index != nil { + if m.Index != 0 { dAtA[i] = 0x10 i++ - i = encodeVarintEraftpb(dAtA, i, uint64(*m.Index)) + i = encodeVarintEraftpb(dAtA, i, uint64(m.Index)) } - if m.Term != nil { + if m.Term != 0 { dAtA[i] = 0x18 i++ - i = encodeVarintEraftpb(dAtA, i, uint64(*m.Term)) - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i = encodeVarintEraftpb(dAtA, i, uint64(m.Term)) } return i, nil } @@ -614,7 +573,7 @@ func (m *Snapshot) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.Data != nil { + if len(m.Data) > 0 { dAtA[i] = 0xa i++ i = encodeVarintEraftpb(dAtA, i, uint64(len(m.Data))) @@ -630,9 +589,6 @@ func (m *Snapshot) MarshalTo(dAtA []byte) (int, error) { } i += n2 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } return i, nil } @@ -651,35 +607,35 @@ func (m *Message) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.MsgType != nil { + if m.MsgType != 0 { dAtA[i] = 0x8 i++ - i = encodeVarintEraftpb(dAtA, i, uint64(*m.MsgType)) + i = encodeVarintEraftpb(dAtA, i, uint64(m.MsgType)) } - if m.To != nil { + if m.To != 0 { dAtA[i] = 0x10 i++ - i = encodeVarintEraftpb(dAtA, i, uint64(*m.To)) + i = encodeVarintEraftpb(dAtA, i, uint64(m.To)) } - if m.From != nil { + if m.From != 0 { dAtA[i] = 0x18 i++ - i = encodeVarintEraftpb(dAtA, i, uint64(*m.From)) + i = encodeVarintEraftpb(dAtA, i, uint64(m.From)) } - if m.Term != nil { + if m.Term != 0 { dAtA[i] = 0x20 i++ - i = encodeVarintEraftpb(dAtA, i, uint64(*m.Term)) + i = encodeVarintEraftpb(dAtA, i, uint64(m.Term)) } - if m.LogTerm != nil { + if m.LogTerm != 0 { dAtA[i] = 0x28 i++ - i = encodeVarintEraftpb(dAtA, i, uint64(*m.LogTerm)) + i = encodeVarintEraftpb(dAtA, i, uint64(m.LogTerm)) } - if m.Index != nil { + if m.Index != 0 { dAtA[i] = 0x30 i++ - i = encodeVarintEraftpb(dAtA, i, uint64(*m.Index)) + i = encodeVarintEraftpb(dAtA, i, uint64(m.Index)) } if len(m.Entries) > 0 { for _, msg := range m.Entries { @@ -693,10 +649,10 @@ func (m *Message) MarshalTo(dAtA []byte) (int, error) { i += n } } - if m.Commit != nil { + if m.Commit != 0 { dAtA[i] = 0x40 i++ - i = encodeVarintEraftpb(dAtA, i, uint64(*m.Commit)) + i = encodeVarintEraftpb(dAtA, i, uint64(m.Commit)) } if m.Snapshot != nil { dAtA[i] = 0x4a @@ -708,30 +664,27 @@ func (m *Message) MarshalTo(dAtA []byte) (int, error) { } i += n3 } - if m.Reject != nil { + if m.Reject { dAtA[i] = 0x50 i++ - if *m.Reject { + if m.Reject { dAtA[i] = 1 } else { dAtA[i] = 0 } i++ } - if m.RejectHint != nil { + if m.RejectHint != 0 { dAtA[i] = 0x58 i++ - i = encodeVarintEraftpb(dAtA, i, uint64(*m.RejectHint)) + i = encodeVarintEraftpb(dAtA, i, uint64(m.RejectHint)) } - if m.Context != nil { + if len(m.Context) > 0 { dAtA[i] = 0x62 i++ i = encodeVarintEraftpb(dAtA, i, uint64(len(m.Context))) i += copy(dAtA[i:], m.Context) } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } return i, nil } @@ -750,23 +703,20 @@ func (m *HardState) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.Term != nil { + if m.Term != 0 { dAtA[i] = 0x8 i++ - i = encodeVarintEraftpb(dAtA, i, uint64(*m.Term)) + i = encodeVarintEraftpb(dAtA, i, uint64(m.Term)) } - if m.Vote != nil { + if m.Vote != 0 { dAtA[i] = 0x10 i++ - i = encodeVarintEraftpb(dAtA, i, uint64(*m.Vote)) + i = encodeVarintEraftpb(dAtA, i, uint64(m.Vote)) } - if m.Commit != nil { + if m.Commit != 0 { dAtA[i] = 0x18 i++ - i = encodeVarintEraftpb(dAtA, i, uint64(*m.Commit)) - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i = encodeVarintEraftpb(dAtA, i, uint64(m.Commit)) } return i, nil } @@ -787,14 +737,38 @@ func (m *ConfState) MarshalTo(dAtA []byte) (int, error) { var l int _ = l if len(m.Nodes) > 0 { + dAtA5 := make([]byte, len(m.Nodes)*10) + var j4 int for _, num := range m.Nodes { - dAtA[i] = 0x8 - i++ - i = encodeVarintEraftpb(dAtA, i, uint64(num)) + for num >= 1<<7 { + dAtA5[j4] = uint8(uint64(num)&0x7f | 0x80) + num >>= 7 + j4++ + } + dAtA5[j4] = uint8(num) + j4++ } - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + dAtA[i] = 0xa + i++ + i = encodeVarintEraftpb(dAtA, i, uint64(j4)) + i += copy(dAtA[i:], dAtA5[:j4]) + } + if len(m.Learners) > 0 { + dAtA7 := make([]byte, len(m.Learners)*10) + var j6 int + for _, num := range m.Learners { + for num >= 1<<7 { + dAtA7[j6] = uint8(uint64(num)&0x7f | 0x80) + num >>= 7 + j6++ + } + dAtA7[j6] = uint8(num) + j6++ + } + dAtA[i] = 0x12 + i++ + i = encodeVarintEraftpb(dAtA, i, uint64(j6)) + i += copy(dAtA[i:], dAtA7[:j6]) } return i, nil } @@ -814,30 +788,27 @@ func (m *ConfChange) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.Id != nil { + if m.Id != 0 { dAtA[i] = 0x8 i++ - i = encodeVarintEraftpb(dAtA, i, uint64(*m.Id)) + i = encodeVarintEraftpb(dAtA, i, uint64(m.Id)) } - if m.ChangeType != nil { + if m.ChangeType != 0 { dAtA[i] = 0x10 i++ - i = encodeVarintEraftpb(dAtA, i, uint64(*m.ChangeType)) + i = encodeVarintEraftpb(dAtA, i, uint64(m.ChangeType)) } - if m.NodeId != nil { + if m.NodeId != 0 { dAtA[i] = 0x18 i++ - i = encodeVarintEraftpb(dAtA, i, uint64(*m.NodeId)) + i = encodeVarintEraftpb(dAtA, i, uint64(m.NodeId)) } - if m.Context != nil { + if len(m.Context) > 0 { dAtA[i] = 0x22 i++ i = encodeVarintEraftpb(dAtA, i, uint64(len(m.Context))) i += copy(dAtA[i:], m.Context) } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } return i, nil } @@ -871,25 +842,22 @@ func encodeVarintEraftpb(dAtA []byte, offset int, v uint64) int { func (m *Entry) Size() (n int) { var l int _ = l - if m.EntryType != nil { - n += 1 + sovEraftpb(uint64(*m.EntryType)) + if m.EntryType != 0 { + n += 1 + sovEraftpb(uint64(m.EntryType)) } - if m.Term != nil { - n += 1 + sovEraftpb(uint64(*m.Term)) + if m.Term != 0 { + n += 1 + sovEraftpb(uint64(m.Term)) } - if m.Index != nil { - n += 1 + sovEraftpb(uint64(*m.Index)) + if m.Index != 0 { + n += 1 + sovEraftpb(uint64(m.Index)) } - if m.Data != nil { - l = len(m.Data) + l = len(m.Data) + if l > 0 { n += 1 + l + sovEraftpb(uint64(l)) } - if m.SyncLog != nil { + if m.SyncLog { n += 2 } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -900,14 +868,11 @@ func (m *SnapshotMetadata) Size() (n int) { l = m.ConfState.Size() n += 1 + l + sovEraftpb(uint64(l)) } - if m.Index != nil { - n += 1 + sovEraftpb(uint64(*m.Index)) + if m.Index != 0 { + n += 1 + sovEraftpb(uint64(m.Index)) } - if m.Term != nil { - n += 1 + sovEraftpb(uint64(*m.Term)) - } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) + if m.Term != 0 { + n += 1 + sovEraftpb(uint64(m.Term)) } return n } @@ -915,40 +880,37 @@ func (m *SnapshotMetadata) Size() (n int) { func (m *Snapshot) Size() (n int) { var l int _ = l - if m.Data != nil { - l = len(m.Data) + l = len(m.Data) + if l > 0 { n += 1 + l + sovEraftpb(uint64(l)) } if m.Metadata != nil { l = m.Metadata.Size() n += 1 + l + sovEraftpb(uint64(l)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } func (m *Message) Size() (n int) { var l int _ = l - if m.MsgType != nil { - n += 1 + sovEraftpb(uint64(*m.MsgType)) + if m.MsgType != 0 { + n += 1 + sovEraftpb(uint64(m.MsgType)) } - if m.To != nil { - n += 1 + sovEraftpb(uint64(*m.To)) + if m.To != 0 { + n += 1 + sovEraftpb(uint64(m.To)) } - if m.From != nil { - n += 1 + sovEraftpb(uint64(*m.From)) + if m.From != 0 { + n += 1 + sovEraftpb(uint64(m.From)) } - if m.Term != nil { - n += 1 + sovEraftpb(uint64(*m.Term)) + if m.Term != 0 { + n += 1 + sovEraftpb(uint64(m.Term)) } - if m.LogTerm != nil { - n += 1 + sovEraftpb(uint64(*m.LogTerm)) + if m.LogTerm != 0 { + n += 1 + sovEraftpb(uint64(m.LogTerm)) } - if m.Index != nil { - n += 1 + sovEraftpb(uint64(*m.Index)) + if m.Index != 0 { + n += 1 + sovEraftpb(uint64(m.Index)) } if len(m.Entries) > 0 { for _, e := range m.Entries { @@ -956,43 +918,37 @@ func (m *Message) Size() (n int) { n += 1 + l + sovEraftpb(uint64(l)) } } - if m.Commit != nil { - n += 1 + sovEraftpb(uint64(*m.Commit)) + if m.Commit != 0 { + n += 1 + sovEraftpb(uint64(m.Commit)) } if m.Snapshot != nil { l = m.Snapshot.Size() n += 1 + l + sovEraftpb(uint64(l)) } - if m.Reject != nil { + if m.Reject { n += 2 } - if m.RejectHint != nil { - n += 1 + sovEraftpb(uint64(*m.RejectHint)) + if m.RejectHint != 0 { + n += 1 + sovEraftpb(uint64(m.RejectHint)) } - if m.Context != nil { - l = len(m.Context) + l = len(m.Context) + if l > 0 { n += 1 + l + sovEraftpb(uint64(l)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } func (m *HardState) Size() (n int) { var l int _ = l - if m.Term != nil { - n += 1 + sovEraftpb(uint64(*m.Term)) - } - if m.Vote != nil { - n += 1 + sovEraftpb(uint64(*m.Vote)) + if m.Term != 0 { + n += 1 + sovEraftpb(uint64(m.Term)) } - if m.Commit != nil { - n += 1 + sovEraftpb(uint64(*m.Commit)) + if m.Vote != 0 { + n += 1 + sovEraftpb(uint64(m.Vote)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) + if m.Commit != 0 { + n += 1 + sovEraftpb(uint64(m.Commit)) } return n } @@ -1001,12 +957,18 @@ func (m *ConfState) Size() (n int) { var l int _ = l if len(m.Nodes) > 0 { + l = 0 for _, e := range m.Nodes { - n += 1 + sovEraftpb(uint64(e)) + l += sovEraftpb(uint64(e)) } + n += 1 + sovEraftpb(uint64(l)) + l } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) + if len(m.Learners) > 0 { + l = 0 + for _, e := range m.Learners { + l += sovEraftpb(uint64(e)) + } + n += 1 + sovEraftpb(uint64(l)) + l } return n } @@ -1014,22 +976,19 @@ func (m *ConfState) Size() (n int) { func (m *ConfChange) Size() (n int) { var l int _ = l - if m.Id != nil { - n += 1 + sovEraftpb(uint64(*m.Id)) + if m.Id != 0 { + n += 1 + sovEraftpb(uint64(m.Id)) } - if m.ChangeType != nil { - n += 1 + sovEraftpb(uint64(*m.ChangeType)) + if m.ChangeType != 0 { + n += 1 + sovEraftpb(uint64(m.ChangeType)) } - if m.NodeId != nil { - n += 1 + sovEraftpb(uint64(*m.NodeId)) + if m.NodeId != 0 { + n += 1 + sovEraftpb(uint64(m.NodeId)) } - if m.Context != nil { - l = len(m.Context) + l = len(m.Context) + if l > 0 { n += 1 + l + sovEraftpb(uint64(l)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -1079,7 +1038,7 @@ func (m *Entry) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field EntryType", wireType) } - var v EntryType + m.EntryType = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowEraftpb @@ -1089,17 +1048,16 @@ func (m *Entry) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (EntryType(b) & 0x7F) << shift + m.EntryType |= (EntryType(b) & 0x7F) << shift if b < 0x80 { break } } - m.EntryType = &v case 2: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Term", wireType) } - var v uint64 + m.Term = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowEraftpb @@ -1109,17 +1067,16 @@ func (m *Entry) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (uint64(b) & 0x7F) << shift + m.Term |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } - m.Term = &v case 3: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Index", wireType) } - var v uint64 + m.Index = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowEraftpb @@ -1129,12 +1086,11 @@ func (m *Entry) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (uint64(b) & 0x7F) << shift + m.Index |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } - m.Index = &v case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Data", wireType) @@ -1185,8 +1141,7 @@ func (m *Entry) Unmarshal(dAtA []byte) error { break } } - b := bool(v != 0) - m.SyncLog = &b + m.SyncLog = bool(v != 0) default: iNdEx = preIndex skippy, err := skipEraftpb(dAtA[iNdEx:]) @@ -1199,7 +1154,6 @@ func (m *Entry) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1275,7 +1229,7 @@ func (m *SnapshotMetadata) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Index", wireType) } - var v uint64 + m.Index = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowEraftpb @@ -1285,17 +1239,16 @@ func (m *SnapshotMetadata) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (uint64(b) & 0x7F) << shift + m.Index |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } - m.Index = &v case 3: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Term", wireType) } - var v uint64 + m.Term = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowEraftpb @@ -1305,12 +1258,11 @@ func (m *SnapshotMetadata) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (uint64(b) & 0x7F) << shift + m.Term |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } - m.Term = &v default: iNdEx = preIndex skippy, err := skipEraftpb(dAtA[iNdEx:]) @@ -1323,7 +1275,6 @@ func (m *SnapshotMetadata) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1438,7 +1389,6 @@ func (m *Snapshot) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1481,7 +1431,7 @@ func (m *Message) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field MsgType", wireType) } - var v MessageType + m.MsgType = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowEraftpb @@ -1491,17 +1441,16 @@ func (m *Message) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (MessageType(b) & 0x7F) << shift + m.MsgType |= (MessageType(b) & 0x7F) << shift if b < 0x80 { break } } - m.MsgType = &v case 2: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field To", wireType) } - var v uint64 + m.To = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowEraftpb @@ -1511,17 +1460,16 @@ func (m *Message) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (uint64(b) & 0x7F) << shift + m.To |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } - m.To = &v case 3: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field From", wireType) } - var v uint64 + m.From = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowEraftpb @@ -1531,17 +1479,16 @@ func (m *Message) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (uint64(b) & 0x7F) << shift + m.From |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } - m.From = &v case 4: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Term", wireType) } - var v uint64 + m.Term = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowEraftpb @@ -1551,17 +1498,16 @@ func (m *Message) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (uint64(b) & 0x7F) << shift + m.Term |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } - m.Term = &v case 5: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field LogTerm", wireType) } - var v uint64 + m.LogTerm = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowEraftpb @@ -1571,17 +1517,16 @@ func (m *Message) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (uint64(b) & 0x7F) << shift + m.LogTerm |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } - m.LogTerm = &v case 6: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Index", wireType) } - var v uint64 + m.Index = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowEraftpb @@ -1591,12 +1536,11 @@ func (m *Message) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (uint64(b) & 0x7F) << shift + m.Index |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } - m.Index = &v case 7: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Entries", wireType) @@ -1632,7 +1576,7 @@ func (m *Message) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Commit", wireType) } - var v uint64 + m.Commit = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowEraftpb @@ -1642,12 +1586,11 @@ func (m *Message) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (uint64(b) & 0x7F) << shift + m.Commit |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } - m.Commit = &v case 9: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Snapshot", wireType) @@ -1700,13 +1643,12 @@ func (m *Message) Unmarshal(dAtA []byte) error { break } } - b := bool(v != 0) - m.Reject = &b + m.Reject = bool(v != 0) case 11: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field RejectHint", wireType) } - var v uint64 + m.RejectHint = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowEraftpb @@ -1716,12 +1658,11 @@ func (m *Message) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (uint64(b) & 0x7F) << shift + m.RejectHint |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } - m.RejectHint = &v case 12: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Context", wireType) @@ -1765,7 +1706,6 @@ func (m *Message) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1808,7 +1748,7 @@ func (m *HardState) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Term", wireType) } - var v uint64 + m.Term = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowEraftpb @@ -1818,17 +1758,16 @@ func (m *HardState) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (uint64(b) & 0x7F) << shift + m.Term |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } - m.Term = &v case 2: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Vote", wireType) } - var v uint64 + m.Vote = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowEraftpb @@ -1838,17 +1777,16 @@ func (m *HardState) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (uint64(b) & 0x7F) << shift + m.Vote |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } - m.Vote = &v case 3: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Commit", wireType) } - var v uint64 + m.Commit = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowEraftpb @@ -1858,12 +1796,11 @@ func (m *HardState) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (uint64(b) & 0x7F) << shift + m.Commit |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } - m.Commit = &v default: iNdEx = preIndex skippy, err := skipEraftpb(dAtA[iNdEx:]) @@ -1876,7 +1813,6 @@ func (m *HardState) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1916,25 +1852,129 @@ func (m *ConfState) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: - if wireType != 0 { + if wireType == 2 { + var packedLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowEraftpb + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + packedLen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if packedLen < 0 { + return ErrInvalidLengthEraftpb + } + postIndex := iNdEx + packedLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + for iNdEx < postIndex { + var v uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowEraftpb + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + m.Nodes = append(m.Nodes, v) + } + } else if wireType == 0 { + var v uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowEraftpb + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + m.Nodes = append(m.Nodes, v) + } else { return fmt.Errorf("proto: wrong wireType = %d for field Nodes", wireType) } - var v uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEraftpb + case 2: + if wireType == 2 { + var packedLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowEraftpb + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + packedLen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } } - if iNdEx >= l { + if packedLen < 0 { + return ErrInvalidLengthEraftpb + } + postIndex := iNdEx + packedLen + if postIndex > l { return io.ErrUnexpectedEOF } - b := dAtA[iNdEx] - iNdEx++ - v |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break + for iNdEx < postIndex { + var v uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowEraftpb + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + m.Learners = append(m.Learners, v) + } + } else if wireType == 0 { + var v uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowEraftpb + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } } + m.Learners = append(m.Learners, v) + } else { + return fmt.Errorf("proto: wrong wireType = %d for field Learners", wireType) } - m.Nodes = append(m.Nodes, v) default: iNdEx = preIndex skippy, err := skipEraftpb(dAtA[iNdEx:]) @@ -1947,7 +1987,6 @@ func (m *ConfState) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1990,7 +2029,7 @@ func (m *ConfChange) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType) } - var v uint64 + m.Id = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowEraftpb @@ -2000,17 +2039,16 @@ func (m *ConfChange) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (uint64(b) & 0x7F) << shift + m.Id |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } - m.Id = &v case 2: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field ChangeType", wireType) } - var v ConfChangeType + m.ChangeType = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowEraftpb @@ -2020,17 +2058,16 @@ func (m *ConfChange) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (ConfChangeType(b) & 0x7F) << shift + m.ChangeType |= (ConfChangeType(b) & 0x7F) << shift if b < 0x80 { break } } - m.ChangeType = &v case 3: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field NodeId", wireType) } - var v uint64 + m.NodeId = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowEraftpb @@ -2040,12 +2077,11 @@ func (m *ConfChange) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (uint64(b) & 0x7F) << shift + m.NodeId |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } - m.NodeId = &v case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Context", wireType) @@ -2089,7 +2125,6 @@ func (m *ConfChange) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2207,56 +2242,58 @@ var ( func init() { proto.RegisterFile("eraftpb.proto", fileDescriptorEraftpb) } var fileDescriptorEraftpb = []byte{ - // 804 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x54, 0xcd, 0x6e, 0xdb, 0x46, - 0x10, 0xf6, 0xea, 0xc7, 0xa4, 0x86, 0xb6, 0xbc, 0xde, 0xba, 0x09, 0x5d, 0xa0, 0xae, 0xaa, 0x93, - 0x60, 0x20, 0x2a, 0x6c, 0xa0, 0x40, 0xaf, 0x89, 0x51, 0xc0, 0x41, 0x23, 0x23, 0x65, 0x9c, 0x5e, - 0x85, 0x35, 0x39, 0xa2, 0x58, 0x8b, 0xbb, 0xec, 0xee, 0xca, 0x8d, 0x1e, 0xa1, 0x40, 0x6f, 0xbd, - 0xf4, 0x91, 0x7a, 0xec, 0x23, 0x14, 0xee, 0xa1, 0xaf, 0x51, 0xec, 0x6a, 0x49, 0x53, 0xc9, 0x6d, - 0xbe, 0xe1, 0xec, 0xcc, 0x37, 0xdf, 0x37, 0x12, 0x1c, 0xa2, 0xe2, 0x0b, 0x53, 0xdd, 0x4d, 0x2b, - 0x25, 0x8d, 0x64, 0x81, 0x87, 0xe3, 0x3f, 0x08, 0xf4, 0xbf, 0x17, 0x46, 0x6d, 0xd8, 0x05, 0x00, - 0xda, 0x60, 0x6e, 0x36, 0x15, 0xc6, 0x64, 0x44, 0x26, 0xc3, 0x4b, 0x36, 0xad, 0x9f, 0xb9, 0x9a, - 0xdb, 0x4d, 0x85, 0xc9, 0x00, 0xeb, 0x90, 0x31, 0xe8, 0x19, 0x54, 0x65, 0xdc, 0x19, 0x91, 0x49, - 0x2f, 0x71, 0x31, 0x3b, 0x81, 0x7e, 0x21, 0x32, 0xfc, 0x10, 0x77, 0x5d, 0x72, 0x0b, 0x6c, 0x65, - 0xc6, 0x0d, 0x8f, 0x7b, 0x23, 0x32, 0x39, 0x48, 0x5c, 0xcc, 0x4e, 0x21, 0xd4, 0x1b, 0x91, 0xce, - 0x57, 0x32, 0x8f, 0xfb, 0x23, 0x32, 0x09, 0x93, 0xc0, 0xe2, 0x37, 0x32, 0x1f, 0x4b, 0xa0, 0xef, - 0x04, 0xaf, 0xf4, 0x52, 0x9a, 0x19, 0x1a, 0xee, 0xca, 0x2f, 0x00, 0x52, 0x29, 0x16, 0x73, 0x6d, - 0xb8, 0xd9, 0xf2, 0x8b, 0x5a, 0xfc, 0xae, 0xa4, 0x58, 0xbc, 0xb3, 0x5f, 0x92, 0x41, 0x5a, 0x87, - 0x4f, 0x5c, 0x3a, 0x1f, 0x71, 0x71, 0xac, 0xbb, 0x4f, 0xac, 0xc7, 0xef, 0x21, 0xac, 0x07, 0x36, - 0x5c, 0x49, 0x8b, 0xeb, 0xb7, 0x10, 0x96, 0x9e, 0x88, 0x6b, 0x16, 0x5d, 0x9e, 0x36, 0xa3, 0x3f, - 0x66, 0x9a, 0x34, 0xa5, 0xe3, 0xff, 0x3a, 0x10, 0xcc, 0x50, 0x6b, 0x9e, 0x23, 0xfb, 0x06, 0xc2, - 0x52, 0xe7, 0x6d, 0x75, 0x4f, 0x9a, 0x16, 0xbe, 0xc6, 0xe9, 0x1b, 0x94, 0x3a, 0x77, 0xea, 0x0e, - 0xa1, 0x63, 0xa4, 0xa7, 0xde, 0x31, 0xd2, 0xf2, 0x5a, 0x28, 0xd9, 0xf0, 0xb6, 0x71, 0xb3, 0x4b, - 0xaf, 0xe5, 0xc0, 0x29, 0x84, 0x2b, 0x99, 0xcf, 0x5d, 0xbe, 0xef, 0xf2, 0xc1, 0x4a, 0xe6, 0xb7, - 0x3b, 0xe6, 0xec, 0xb7, 0x05, 0x99, 0x40, 0x60, 0x3d, 0x2d, 0x50, 0xc7, 0xc1, 0xa8, 0x3b, 0x89, - 0x2e, 0x87, 0xbb, 0xb6, 0x27, 0xf5, 0x67, 0xf6, 0x0c, 0xf6, 0x53, 0x59, 0x96, 0x85, 0x89, 0x43, - 0xd7, 0xc0, 0x23, 0xf6, 0x02, 0x42, 0xed, 0x55, 0x88, 0x07, 0x4e, 0x9e, 0xe3, 0x4f, 0xe4, 0x49, - 0x9a, 0x12, 0xdb, 0x46, 0xe1, 0xcf, 0x98, 0x9a, 0x18, 0x9c, 0xef, 0x1e, 0xb1, 0xaf, 0x20, 0xda, - 0x46, 0xf3, 0x65, 0x21, 0x4c, 0x1c, 0xb9, 0x19, 0xb0, 0x4d, 0x5d, 0x17, 0xc2, 0xb0, 0x18, 0x82, - 0x54, 0x0a, 0x83, 0x1f, 0x4c, 0x7c, 0xe0, 0xdc, 0xa9, 0xe1, 0xf8, 0x07, 0x18, 0x5c, 0x73, 0x95, - 0x6d, 0x7d, 0xaf, 0x55, 0x21, 0x2d, 0x55, 0x18, 0xf4, 0x1e, 0xa4, 0xc1, 0xfa, 0x56, 0x6d, 0xdc, - 0x5a, 0xa7, 0xdb, 0x5e, 0x67, 0xfc, 0x35, 0x0c, 0xae, 0xda, 0x47, 0x24, 0x64, 0x86, 0x3a, 0x26, - 0xa3, 0xae, 0xd5, 0xcc, 0x81, 0xf1, 0x6f, 0x04, 0xc0, 0xd6, 0x5c, 0x2d, 0xb9, 0xc8, 0x9d, 0x57, - 0x45, 0xe6, 0xe7, 0x75, 0x8a, 0x8c, 0x7d, 0x07, 0x51, 0xea, 0xbe, 0x6c, 0xfd, 0xee, 0x38, 0xbf, - 0x9f, 0xef, 0x5c, 0xeb, 0xf6, 0xa5, 0xb3, 0x1c, 0xd2, 0x26, 0x66, 0xcf, 0x21, 0xb0, 0x13, 0xe6, - 0x45, 0x56, 0x93, 0xb2, 0xf0, 0x75, 0xd6, 0xde, 0xbd, 0xb7, 0xb3, 0xfb, 0xf9, 0x05, 0x0c, 0x9a, - 0x9f, 0x27, 0x3b, 0x82, 0xc8, 0x81, 0x1b, 0xa9, 0x4a, 0xbe, 0xa2, 0x7b, 0xec, 0x33, 0x38, 0x72, - 0x89, 0xa7, 0x99, 0x94, 0x9c, 0xff, 0xde, 0x85, 0xa8, 0x75, 0x74, 0x0c, 0x60, 0x7f, 0xa6, 0xf3, - 0xeb, 0x75, 0x45, 0xf7, 0x58, 0x04, 0xc1, 0x4c, 0xe7, 0xaf, 0x90, 0x1b, 0x4a, 0xd8, 0x10, 0x60, - 0xa6, 0xf3, 0xb7, 0x4a, 0x56, 0x52, 0x23, 0xed, 0xb0, 0x43, 0x18, 0xcc, 0x74, 0xfe, 0xb2, 0xaa, - 0x50, 0x64, 0xb4, 0xcb, 0x3e, 0x87, 0xe3, 0x06, 0x26, 0xa8, 0x2b, 0x29, 0x34, 0xd2, 0x1e, 0x63, - 0x30, 0x9c, 0xe9, 0x3c, 0xc1, 0x5f, 0xd6, 0xa8, 0xcd, 0x4f, 0xd2, 0x20, 0xed, 0xb3, 0x2f, 0xe0, - 0xd9, 0x6e, 0xae, 0xa9, 0xdf, 0xb7, 0xa4, 0x67, 0x3a, 0xaf, 0x2f, 0x85, 0x06, 0x8c, 0xc2, 0x81, - 0xe5, 0x83, 0x5c, 0x99, 0x3b, 0x4b, 0x24, 0x64, 0x31, 0x9c, 0xb4, 0x33, 0xcd, 0xe3, 0x81, 0x1f, - 0xf6, 0x5e, 0x28, 0xe4, 0xe9, 0x92, 0xdf, 0xad, 0x90, 0x02, 0x3b, 0x86, 0x43, 0xdf, 0xd0, 0x9a, - 0xb8, 0xd6, 0x34, 0xf2, 0x65, 0x57, 0x4b, 0x4c, 0xef, 0x7f, 0x5c, 0x4b, 0xb5, 0x2e, 0xe9, 0x81, - 0xa7, 0x7f, 0xab, 0xb8, 0xd0, 0x0b, 0x54, 0x6f, 0x90, 0x67, 0xa8, 0xe8, 0xa1, 0x7f, 0x7d, 0x5b, - 0x94, 0x28, 0xd7, 0xe6, 0x46, 0xfe, 0x4a, 0x87, 0x9e, 0x50, 0x82, 0x3c, 0x7b, 0x6d, 0x7f, 0x33, - 0xf4, 0x88, 0x9d, 0x00, 0x6d, 0x67, 0x2c, 0x21, 0x4a, 0x7d, 0x47, 0xbf, 0xe5, 0x5b, 0x85, 0x6e, - 0xf9, 0x63, 0xf6, 0x25, 0x9c, 0x7e, 0x92, 0x6e, 0x56, 0x60, 0xe7, 0x2f, 0x60, 0xb8, 0x7b, 0x12, - 0xd6, 0x84, 0x97, 0x59, 0x76, 0x23, 0x33, 0xa4, 0x7b, 0xd6, 0x84, 0x04, 0x4b, 0xf9, 0x80, 0x0e, - 0x93, 0x57, 0xe7, 0x7f, 0x3d, 0x9e, 0x91, 0xbf, 0x1f, 0xcf, 0xc8, 0x3f, 0x8f, 0x67, 0xe4, 0xcf, - 0x7f, 0xcf, 0xf6, 0x20, 0x4e, 0x65, 0x39, 0xad, 0x0a, 0x91, 0xa7, 0xbc, 0x9a, 0x9a, 0xe2, 0xfe, - 0x61, 0x7a, 0xff, 0xe0, 0xfe, 0xe9, 0xff, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x86, 0x7a, 0x29, 0x6f, - 0xf9, 0x05, 0x00, 0x00, + // 834 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x55, 0xcd, 0x6e, 0xe3, 0x36, + 0x10, 0x8e, 0xe4, 0x1f, 0xc9, 0xa3, 0xc4, 0x61, 0xd8, 0x74, 0x57, 0x59, 0xa0, 0xa9, 0xe1, 0x93, + 0x11, 0xa0, 0x2e, 0x92, 0xa2, 0x40, 0x2f, 0x3d, 0x64, 0x83, 0x02, 0x59, 0x34, 0x0e, 0xb6, 0xda, + 0x6c, 0xaf, 0x06, 0x23, 0x8d, 0x65, 0x35, 0x16, 0xa9, 0x92, 0x74, 0xba, 0x79, 0x84, 0x02, 0xbd, + 0xf5, 0xd2, 0x47, 0xea, 0xb1, 0x8f, 0x50, 0xa4, 0x87, 0xbe, 0xc6, 0x82, 0x34, 0xa5, 0xc8, 0x9b, + 0x93, 0xe7, 0x1b, 0x0e, 0x39, 0xdf, 0x7c, 0xdf, 0x08, 0x86, 0x3d, 0x94, 0x6c, 0xa1, 0xab, 0xdb, + 0x69, 0x25, 0x85, 0x16, 0x34, 0x70, 0x70, 0xfc, 0xa7, 0x07, 0xbd, 0x1f, 0xb8, 0x96, 0x0f, 0xf4, + 0x14, 0x00, 0x4d, 0x30, 0xd7, 0x0f, 0x15, 0xc6, 0xde, 0xc8, 0x9b, 0x0c, 0xcf, 0xe8, 0xb4, 0xbe, + 0x66, 0x6b, 0x6e, 0x1e, 0x2a, 0x4c, 0x06, 0x58, 0x87, 0x94, 0x42, 0x57, 0xa3, 0x2c, 0x63, 0x7f, + 0xe4, 0x4d, 0xba, 0x89, 0x8d, 0xe9, 0x21, 0xf4, 0x0a, 0x9e, 0xe1, 0x87, 0xb8, 0x63, 0x93, 0x1b, + 0x60, 0x2a, 0x33, 0xa6, 0x59, 0xdc, 0x1d, 0x79, 0x93, 0xdd, 0xc4, 0xc6, 0xf4, 0x08, 0x42, 0xf5, + 0xc0, 0xd3, 0xf9, 0x4a, 0xe4, 0x71, 0x6f, 0xe4, 0x4d, 0xc2, 0x24, 0x30, 0xf8, 0x4a, 0xe4, 0x63, + 0x01, 0xe4, 0x1d, 0x67, 0x95, 0x5a, 0x0a, 0x3d, 0x43, 0xcd, 0x6c, 0xf9, 0x29, 0x40, 0x2a, 0xf8, + 0x62, 0xae, 0x34, 0xd3, 0x1b, 0x7e, 0x51, 0x8b, 0xdf, 0x85, 0xe0, 0x8b, 0x77, 0xe6, 0x24, 0x19, + 0xa4, 0x75, 0xf8, 0xc4, 0xc5, 0xff, 0x84, 0x8b, 0x65, 0xdd, 0x79, 0x62, 0x3d, 0x7e, 0x0f, 0x61, + 0xdd, 0xb0, 0xe1, 0xea, 0xb5, 0xb8, 0x7e, 0x0b, 0x61, 0xe9, 0x88, 0xd8, 0xc7, 0xa2, 0xb3, 0xa3, + 0xa6, 0xf5, 0xa7, 0x4c, 0x93, 0xa6, 0x74, 0xfc, 0xbf, 0x0f, 0xc1, 0x0c, 0x95, 0x62, 0x39, 0xd2, + 0xaf, 0x21, 0x2c, 0x55, 0xde, 0x56, 0xf7, 0xb0, 0x79, 0xc2, 0xd5, 0x58, 0x7d, 0x83, 0x52, 0xe5, + 0x56, 0xdd, 0x21, 0xf8, 0x5a, 0x38, 0xea, 0xbe, 0x16, 0x86, 0xd7, 0x42, 0x8a, 0x86, 0xb7, 0x89, + 0x9b, 0x59, 0xba, 0x2d, 0x07, 0x8e, 0x20, 0x5c, 0x89, 0x7c, 0x6e, 0xf3, 0x3d, 0x9b, 0x0f, 0x56, + 0x22, 0xbf, 0xd9, 0x32, 0xa7, 0xdf, 0x16, 0x64, 0x02, 0x81, 0xf1, 0xb4, 0x40, 0x15, 0x07, 0xa3, + 0xce, 0x24, 0x3a, 0x1b, 0x6e, 0xdb, 0x9e, 0xd4, 0xc7, 0xf4, 0x05, 0xf4, 0x53, 0x51, 0x96, 0x85, + 0x8e, 0x43, 0xfb, 0x80, 0x43, 0xf4, 0x2b, 0x08, 0x95, 0x53, 0x21, 0x1e, 0x58, 0x79, 0x0e, 0x9e, + 0xc9, 0x93, 0x34, 0x25, 0xe6, 0x19, 0x89, 0xbf, 0x60, 0xaa, 0x63, 0xb0, 0xbe, 0x3b, 0x44, 0xbf, + 0x84, 0x68, 0x13, 0xcd, 0x97, 0x05, 0xd7, 0x71, 0x64, 0x7b, 0xc0, 0x26, 0x75, 0x59, 0x70, 0x4d, + 0x63, 0x08, 0x52, 0xc1, 0x35, 0x7e, 0xd0, 0xf1, 0xae, 0x75, 0xa7, 0x86, 0xe3, 0x1f, 0x61, 0x70, + 0xc9, 0x64, 0xb6, 0xf1, 0xbd, 0x56, 0xc5, 0x6b, 0xa9, 0x42, 0xa1, 0x7b, 0x2f, 0x34, 0xd6, 0xbb, + 0x6a, 0xe2, 0xd6, 0x38, 0x9d, 0xf6, 0x38, 0xe3, 0xef, 0x61, 0x70, 0xd1, 0x5e, 0x22, 0x2e, 0x32, + 0x54, 0xb1, 0x37, 0xea, 0x18, 0xcd, 0x2c, 0xa0, 0xaf, 0x20, 0x5c, 0x21, 0x93, 0x1c, 0xa5, 0x8a, + 0x7d, 0x7b, 0xd0, 0xe0, 0xf1, 0xef, 0x1e, 0x80, 0xb9, 0x7f, 0xb1, 0x64, 0x3c, 0xb7, 0x3e, 0x16, + 0x99, 0xe3, 0xe2, 0x17, 0x19, 0xfd, 0x0e, 0xa2, 0xd4, 0x9e, 0x6c, 0x76, 0xc1, 0xb7, 0xbb, 0xf0, + 0x72, 0x6b, 0x93, 0x37, 0x37, 0xed, 0x3a, 0x40, 0xda, 0xc4, 0xf4, 0x25, 0x04, 0xa6, 0xfb, 0xbc, + 0xc8, 0x6a, 0xc2, 0x06, 0xbe, 0xc9, 0xda, 0xba, 0x74, 0xb7, 0x74, 0x39, 0x39, 0x85, 0x41, 0xf3, + 0xe9, 0xd2, 0x7d, 0x88, 0x2c, 0xb8, 0x16, 0xb2, 0x64, 0x2b, 0xb2, 0x43, 0x3f, 0x83, 0x7d, 0x9b, + 0x78, 0xea, 0x49, 0xbc, 0x93, 0x3f, 0x3a, 0x10, 0xb5, 0x16, 0x92, 0x02, 0xf4, 0x67, 0x2a, 0xbf, + 0x5c, 0x57, 0x64, 0x87, 0x46, 0x10, 0xcc, 0x54, 0xfe, 0x1a, 0x99, 0x26, 0x1e, 0x1d, 0x02, 0xcc, + 0x54, 0xfe, 0x56, 0x8a, 0x4a, 0x28, 0x24, 0x3e, 0xdd, 0x83, 0xc1, 0x4c, 0xe5, 0xe7, 0x55, 0x85, + 0x3c, 0x23, 0x1d, 0xfa, 0x39, 0x1c, 0x34, 0x30, 0x41, 0x55, 0x09, 0xae, 0x90, 0x74, 0x29, 0x85, + 0xe1, 0x4c, 0xe5, 0x09, 0xfe, 0xba, 0x46, 0xa5, 0x7f, 0x16, 0x1a, 0x49, 0x8f, 0xbe, 0x82, 0x17, + 0xdb, 0xb9, 0xa6, 0xbe, 0x6f, 0x48, 0xcf, 0x54, 0x5e, 0x6f, 0x11, 0x09, 0x28, 0x81, 0x5d, 0xc3, + 0x07, 0x99, 0xd4, 0xb7, 0x86, 0x48, 0x48, 0x63, 0x38, 0x6c, 0x67, 0x9a, 0xcb, 0x03, 0xd7, 0xec, + 0x3d, 0x97, 0xc8, 0xd2, 0x25, 0xbb, 0x5d, 0x21, 0x01, 0x7a, 0x00, 0x7b, 0xee, 0x41, 0x63, 0xf0, + 0x5a, 0x91, 0xc8, 0x95, 0x5d, 0x2c, 0x31, 0xbd, 0xfb, 0x69, 0x2d, 0xe4, 0xba, 0x24, 0xbb, 0x8e, + 0xfe, 0x8d, 0x64, 0x5c, 0x2d, 0x50, 0x5e, 0x21, 0xcb, 0x50, 0x92, 0x3d, 0x77, 0xfb, 0xa6, 0x28, + 0x51, 0xac, 0xf5, 0xb5, 0xf8, 0x8d, 0x0c, 0x1d, 0xa1, 0x04, 0x59, 0xf6, 0xc6, 0x7c, 0x4f, 0x64, + 0x9f, 0x1e, 0x02, 0x69, 0x67, 0x0c, 0x21, 0x42, 0xdc, 0x8b, 0x6e, 0xca, 0xb7, 0x12, 0xed, 0xf0, + 0x07, 0xf4, 0x0b, 0x38, 0x7a, 0x96, 0x6e, 0x46, 0xa0, 0x27, 0xe7, 0x30, 0xdc, 0x5e, 0x09, 0x63, + 0xc2, 0x79, 0x96, 0x5d, 0x8b, 0x0c, 0xc9, 0x8e, 0x31, 0x21, 0xc1, 0x52, 0xdc, 0xa3, 0xc5, 0x9e, + 0x19, 0xe5, 0x3c, 0xcb, 0xae, 0x36, 0xbb, 0x68, 0x73, 0xfe, 0xeb, 0x93, 0xbf, 0x1f, 0x8f, 0xbd, + 0x7f, 0x1e, 0x8f, 0xbd, 0x7f, 0x1f, 0x8f, 0xbd, 0xbf, 0xfe, 0x3b, 0xde, 0x81, 0x38, 0x15, 0xe5, + 0xb4, 0x2a, 0x78, 0x9e, 0xb2, 0x6a, 0xaa, 0x8b, 0xbb, 0xfb, 0xe9, 0xdd, 0xbd, 0xfd, 0x67, 0xb8, + 0xed, 0xdb, 0x9f, 0x6f, 0x3e, 0x06, 0x00, 0x00, 0xff, 0xff, 0x9b, 0x21, 0xc6, 0xf6, 0x31, 0x06, + 0x00, 0x00, } diff --git a/_vendor/src/github.com/pingcap/kvproto/pkg/errorpb/errorpb.pb.go b/_vendor/src/github.com/pingcap/kvproto/pkg/errorpb/errorpb.pb.go index 0fd66ab25a367..4e18d72fb9f74 100644 --- a/_vendor/src/github.com/pingcap/kvproto/pkg/errorpb/errorpb.pb.go +++ b/_vendor/src/github.com/pingcap/kvproto/pkg/errorpb/errorpb.pb.go @@ -43,9 +43,8 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type NotLeader struct { - RegionId *uint64 `protobuf:"varint,1,opt,name=region_id,json=regionId" json:"region_id,omitempty"` - Leader *metapb.Peer `protobuf:"bytes,2,opt,name=leader" json:"leader,omitempty"` - XXX_unrecognized []byte `json:"-"` + RegionId uint64 `protobuf:"varint,1,opt,name=region_id,json=regionId,proto3" json:"region_id,omitempty"` + Leader *metapb.Peer `protobuf:"bytes,2,opt,name=leader" json:"leader,omitempty"` } func (m *NotLeader) Reset() { *m = NotLeader{} } @@ -54,8 +53,8 @@ func (*NotLeader) ProtoMessage() {} func (*NotLeader) Descriptor() ([]byte, []int) { return fileDescriptorErrorpb, []int{0} } func (m *NotLeader) GetRegionId() uint64 { - if m != nil && m.RegionId != nil { - return *m.RegionId + if m != nil { + return m.RegionId } return 0 } @@ -68,7 +67,6 @@ func (m *NotLeader) GetLeader() *metapb.Peer { } type StoreNotMatch struct { - XXX_unrecognized []byte `json:"-"` } func (m *StoreNotMatch) Reset() { *m = StoreNotMatch{} } @@ -77,8 +75,7 @@ func (*StoreNotMatch) ProtoMessage() {} func (*StoreNotMatch) Descriptor() ([]byte, []int) { return fileDescriptorErrorpb, []int{1} } type RegionNotFound struct { - RegionId *uint64 `protobuf:"varint,1,opt,name=region_id,json=regionId" json:"region_id,omitempty"` - XXX_unrecognized []byte `json:"-"` + RegionId uint64 `protobuf:"varint,1,opt,name=region_id,json=regionId,proto3" json:"region_id,omitempty"` } func (m *RegionNotFound) Reset() { *m = RegionNotFound{} } @@ -87,18 +84,17 @@ func (*RegionNotFound) ProtoMessage() {} func (*RegionNotFound) Descriptor() ([]byte, []int) { return fileDescriptorErrorpb, []int{2} } func (m *RegionNotFound) GetRegionId() uint64 { - if m != nil && m.RegionId != nil { - return *m.RegionId + if m != nil { + return m.RegionId } return 0 } type KeyNotInRegion struct { - Key []byte `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"` - RegionId *uint64 `protobuf:"varint,2,opt,name=region_id,json=regionId" json:"region_id,omitempty"` - StartKey []byte `protobuf:"bytes,3,opt,name=start_key,json=startKey" json:"start_key,omitempty"` - EndKey []byte `protobuf:"bytes,4,opt,name=end_key,json=endKey" json:"end_key,omitempty"` - XXX_unrecognized []byte `json:"-"` + Key []byte `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` + RegionId uint64 `protobuf:"varint,2,opt,name=region_id,json=regionId,proto3" json:"region_id,omitempty"` + StartKey []byte `protobuf:"bytes,3,opt,name=start_key,json=startKey,proto3" json:"start_key,omitempty"` + EndKey []byte `protobuf:"bytes,4,opt,name=end_key,json=endKey,proto3" json:"end_key,omitempty"` } func (m *KeyNotInRegion) Reset() { *m = KeyNotInRegion{} } @@ -114,8 +110,8 @@ func (m *KeyNotInRegion) GetKey() []byte { } func (m *KeyNotInRegion) GetRegionId() uint64 { - if m != nil && m.RegionId != nil { - return *m.RegionId + if m != nil { + return m.RegionId } return 0 } @@ -135,8 +131,7 @@ func (m *KeyNotInRegion) GetEndKey() []byte { } type StaleEpoch struct { - NewRegions []*metapb.Region `protobuf:"bytes,1,rep,name=new_regions,json=newRegions" json:"new_regions,omitempty"` - XXX_unrecognized []byte `json:"-"` + NewRegions []*metapb.Region `protobuf:"bytes,1,rep,name=new_regions,json=newRegions" json:"new_regions,omitempty"` } func (m *StaleEpoch) Reset() { *m = StaleEpoch{} } @@ -152,8 +147,8 @@ func (m *StaleEpoch) GetNewRegions() []*metapb.Region { } type ServerIsBusy struct { - Reason *string `protobuf:"bytes,1,opt,name=reason" json:"reason,omitempty"` - XXX_unrecognized []byte `json:"-"` + Reason string `protobuf:"bytes,1,opt,name=reason,proto3" json:"reason,omitempty"` + BackoffMs uint64 `protobuf:"varint,2,opt,name=backoff_ms,json=backoffMs,proto3" json:"backoff_ms,omitempty"` } func (m *ServerIsBusy) Reset() { *m = ServerIsBusy{} } @@ -162,14 +157,20 @@ func (*ServerIsBusy) ProtoMessage() {} func (*ServerIsBusy) Descriptor() ([]byte, []int) { return fileDescriptorErrorpb, []int{5} } func (m *ServerIsBusy) GetReason() string { - if m != nil && m.Reason != nil { - return *m.Reason + if m != nil { + return m.Reason } return "" } +func (m *ServerIsBusy) GetBackoffMs() uint64 { + if m != nil { + return m.BackoffMs + } + return 0 +} + type StaleCommand struct { - XXX_unrecognized []byte `json:"-"` } func (m *StaleCommand) Reset() { *m = StaleCommand{} } @@ -178,9 +179,8 @@ func (*StaleCommand) ProtoMessage() {} func (*StaleCommand) Descriptor() ([]byte, []int) { return fileDescriptorErrorpb, []int{6} } type RaftEntryTooLarge struct { - RegionId *uint64 `protobuf:"varint,1,opt,name=region_id,json=regionId" json:"region_id,omitempty"` - EntrySize *uint64 `protobuf:"varint,2,opt,name=entry_size,json=entrySize" json:"entry_size,omitempty"` - XXX_unrecognized []byte `json:"-"` + RegionId uint64 `protobuf:"varint,1,opt,name=region_id,json=regionId,proto3" json:"region_id,omitempty"` + EntrySize uint64 `protobuf:"varint,2,opt,name=entry_size,json=entrySize,proto3" json:"entry_size,omitempty"` } func (m *RaftEntryTooLarge) Reset() { *m = RaftEntryTooLarge{} } @@ -189,21 +189,21 @@ func (*RaftEntryTooLarge) ProtoMessage() {} func (*RaftEntryTooLarge) Descriptor() ([]byte, []int) { return fileDescriptorErrorpb, []int{7} } func (m *RaftEntryTooLarge) GetRegionId() uint64 { - if m != nil && m.RegionId != nil { - return *m.RegionId + if m != nil { + return m.RegionId } return 0 } func (m *RaftEntryTooLarge) GetEntrySize() uint64 { - if m != nil && m.EntrySize != nil { - return *m.EntrySize + if m != nil { + return m.EntrySize } return 0 } type Error struct { - Message *string `protobuf:"bytes,1,opt,name=message" json:"message,omitempty"` + Message string `protobuf:"bytes,1,opt,name=message,proto3" json:"message,omitempty"` NotLeader *NotLeader `protobuf:"bytes,2,opt,name=not_leader,json=notLeader" json:"not_leader,omitempty"` RegionNotFound *RegionNotFound `protobuf:"bytes,3,opt,name=region_not_found,json=regionNotFound" json:"region_not_found,omitempty"` KeyNotInRegion *KeyNotInRegion `protobuf:"bytes,4,opt,name=key_not_in_region,json=keyNotInRegion" json:"key_not_in_region,omitempty"` @@ -212,7 +212,6 @@ type Error struct { StaleCommand *StaleCommand `protobuf:"bytes,7,opt,name=stale_command,json=staleCommand" json:"stale_command,omitempty"` StoreNotMatch *StoreNotMatch `protobuf:"bytes,8,opt,name=store_not_match,json=storeNotMatch" json:"store_not_match,omitempty"` RaftEntryTooLarge *RaftEntryTooLarge `protobuf:"bytes,9,opt,name=raft_entry_too_large,json=raftEntryTooLarge" json:"raft_entry_too_large,omitempty"` - XXX_unrecognized []byte `json:"-"` } func (m *Error) Reset() { *m = Error{} } @@ -221,8 +220,8 @@ func (*Error) ProtoMessage() {} func (*Error) Descriptor() ([]byte, []int) { return fileDescriptorErrorpb, []int{8} } func (m *Error) GetMessage() string { - if m != nil && m.Message != nil { - return *m.Message + if m != nil { + return m.Message } return "" } @@ -309,10 +308,10 @@ func (m *NotLeader) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.RegionId != nil { + if m.RegionId != 0 { dAtA[i] = 0x8 i++ - i = encodeVarintErrorpb(dAtA, i, uint64(*m.RegionId)) + i = encodeVarintErrorpb(dAtA, i, uint64(m.RegionId)) } if m.Leader != nil { dAtA[i] = 0x12 @@ -324,9 +323,6 @@ func (m *NotLeader) MarshalTo(dAtA []byte) (int, error) { } i += n1 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } return i, nil } @@ -345,9 +341,6 @@ func (m *StoreNotMatch) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } return i, nil } @@ -366,13 +359,10 @@ func (m *RegionNotFound) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.RegionId != nil { + if m.RegionId != 0 { dAtA[i] = 0x8 i++ - i = encodeVarintErrorpb(dAtA, i, uint64(*m.RegionId)) - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i = encodeVarintErrorpb(dAtA, i, uint64(m.RegionId)) } return i, nil } @@ -392,32 +382,29 @@ func (m *KeyNotInRegion) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.Key != nil { + if len(m.Key) > 0 { dAtA[i] = 0xa i++ i = encodeVarintErrorpb(dAtA, i, uint64(len(m.Key))) i += copy(dAtA[i:], m.Key) } - if m.RegionId != nil { + if m.RegionId != 0 { dAtA[i] = 0x10 i++ - i = encodeVarintErrorpb(dAtA, i, uint64(*m.RegionId)) + i = encodeVarintErrorpb(dAtA, i, uint64(m.RegionId)) } - if m.StartKey != nil { + if len(m.StartKey) > 0 { dAtA[i] = 0x1a i++ i = encodeVarintErrorpb(dAtA, i, uint64(len(m.StartKey))) i += copy(dAtA[i:], m.StartKey) } - if m.EndKey != nil { + if len(m.EndKey) > 0 { dAtA[i] = 0x22 i++ i = encodeVarintErrorpb(dAtA, i, uint64(len(m.EndKey))) i += copy(dAtA[i:], m.EndKey) } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } return i, nil } @@ -448,9 +435,6 @@ func (m *StaleEpoch) MarshalTo(dAtA []byte) (int, error) { i += n } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } return i, nil } @@ -469,14 +453,16 @@ func (m *ServerIsBusy) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.Reason != nil { + if len(m.Reason) > 0 { dAtA[i] = 0xa i++ - i = encodeVarintErrorpb(dAtA, i, uint64(len(*m.Reason))) - i += copy(dAtA[i:], *m.Reason) + i = encodeVarintErrorpb(dAtA, i, uint64(len(m.Reason))) + i += copy(dAtA[i:], m.Reason) } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.BackoffMs != 0 { + dAtA[i] = 0x10 + i++ + i = encodeVarintErrorpb(dAtA, i, uint64(m.BackoffMs)) } return i, nil } @@ -496,9 +482,6 @@ func (m *StaleCommand) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } return i, nil } @@ -517,18 +500,15 @@ func (m *RaftEntryTooLarge) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.RegionId != nil { + if m.RegionId != 0 { dAtA[i] = 0x8 i++ - i = encodeVarintErrorpb(dAtA, i, uint64(*m.RegionId)) + i = encodeVarintErrorpb(dAtA, i, uint64(m.RegionId)) } - if m.EntrySize != nil { + if m.EntrySize != 0 { dAtA[i] = 0x10 i++ - i = encodeVarintErrorpb(dAtA, i, uint64(*m.EntrySize)) - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i = encodeVarintErrorpb(dAtA, i, uint64(m.EntrySize)) } return i, nil } @@ -548,11 +528,11 @@ func (m *Error) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.Message != nil { + if len(m.Message) > 0 { dAtA[i] = 0xa i++ - i = encodeVarintErrorpb(dAtA, i, uint64(len(*m.Message))) - i += copy(dAtA[i:], *m.Message) + i = encodeVarintErrorpb(dAtA, i, uint64(len(m.Message))) + i += copy(dAtA[i:], m.Message) } if m.NotLeader != nil { dAtA[i] = 0x12 @@ -634,9 +614,6 @@ func (m *Error) MarshalTo(dAtA []byte) (int, error) { } i += n9 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } return i, nil } @@ -670,36 +647,27 @@ func encodeVarintErrorpb(dAtA []byte, offset int, v uint64) int { func (m *NotLeader) Size() (n int) { var l int _ = l - if m.RegionId != nil { - n += 1 + sovErrorpb(uint64(*m.RegionId)) + if m.RegionId != 0 { + n += 1 + sovErrorpb(uint64(m.RegionId)) } if m.Leader != nil { l = m.Leader.Size() n += 1 + l + sovErrorpb(uint64(l)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } func (m *StoreNotMatch) Size() (n int) { var l int _ = l - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } func (m *RegionNotFound) Size() (n int) { var l int _ = l - if m.RegionId != nil { - n += 1 + sovErrorpb(uint64(*m.RegionId)) - } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) + if m.RegionId != 0 { + n += 1 + sovErrorpb(uint64(m.RegionId)) } return n } @@ -707,24 +675,21 @@ func (m *RegionNotFound) Size() (n int) { func (m *KeyNotInRegion) Size() (n int) { var l int _ = l - if m.Key != nil { - l = len(m.Key) + l = len(m.Key) + if l > 0 { n += 1 + l + sovErrorpb(uint64(l)) } - if m.RegionId != nil { - n += 1 + sovErrorpb(uint64(*m.RegionId)) + if m.RegionId != 0 { + n += 1 + sovErrorpb(uint64(m.RegionId)) } - if m.StartKey != nil { - l = len(m.StartKey) + l = len(m.StartKey) + if l > 0 { n += 1 + l + sovErrorpb(uint64(l)) } - if m.EndKey != nil { - l = len(m.EndKey) + l = len(m.EndKey) + if l > 0 { n += 1 + l + sovErrorpb(uint64(l)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -737,21 +702,18 @@ func (m *StaleEpoch) Size() (n int) { n += 1 + l + sovErrorpb(uint64(l)) } } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } func (m *ServerIsBusy) Size() (n int) { var l int _ = l - if m.Reason != nil { - l = len(*m.Reason) + l = len(m.Reason) + if l > 0 { n += 1 + l + sovErrorpb(uint64(l)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) + if m.BackoffMs != 0 { + n += 1 + sovErrorpb(uint64(m.BackoffMs)) } return n } @@ -759,23 +721,17 @@ func (m *ServerIsBusy) Size() (n int) { func (m *StaleCommand) Size() (n int) { var l int _ = l - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } func (m *RaftEntryTooLarge) Size() (n int) { var l int _ = l - if m.RegionId != nil { - n += 1 + sovErrorpb(uint64(*m.RegionId)) - } - if m.EntrySize != nil { - n += 1 + sovErrorpb(uint64(*m.EntrySize)) + if m.RegionId != 0 { + n += 1 + sovErrorpb(uint64(m.RegionId)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) + if m.EntrySize != 0 { + n += 1 + sovErrorpb(uint64(m.EntrySize)) } return n } @@ -783,8 +739,8 @@ func (m *RaftEntryTooLarge) Size() (n int) { func (m *Error) Size() (n int) { var l int _ = l - if m.Message != nil { - l = len(*m.Message) + l = len(m.Message) + if l > 0 { n += 1 + l + sovErrorpb(uint64(l)) } if m.NotLeader != nil { @@ -819,9 +775,6 @@ func (m *Error) Size() (n int) { l = m.RaftEntryTooLarge.Size() n += 1 + l + sovErrorpb(uint64(l)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -871,7 +824,7 @@ func (m *NotLeader) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field RegionId", wireType) } - var v uint64 + m.RegionId = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowErrorpb @@ -881,12 +834,11 @@ func (m *NotLeader) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (uint64(b) & 0x7F) << shift + m.RegionId |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } - m.RegionId = &v case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Leader", wireType) @@ -932,7 +884,6 @@ func (m *NotLeader) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -983,7 +934,6 @@ func (m *StoreNotMatch) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1026,7 +976,7 @@ func (m *RegionNotFound) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field RegionId", wireType) } - var v uint64 + m.RegionId = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowErrorpb @@ -1036,12 +986,11 @@ func (m *RegionNotFound) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (uint64(b) & 0x7F) << shift + m.RegionId |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } - m.RegionId = &v default: iNdEx = preIndex skippy, err := skipErrorpb(dAtA[iNdEx:]) @@ -1054,7 +1003,6 @@ func (m *RegionNotFound) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1128,7 +1076,7 @@ func (m *KeyNotInRegion) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field RegionId", wireType) } - var v uint64 + m.RegionId = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowErrorpb @@ -1138,12 +1086,11 @@ func (m *KeyNotInRegion) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (uint64(b) & 0x7F) << shift + m.RegionId |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } - m.RegionId = &v case 3: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field StartKey", wireType) @@ -1218,7 +1165,6 @@ func (m *KeyNotInRegion) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1300,7 +1246,6 @@ func (m *StaleEpoch) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1366,9 +1311,27 @@ func (m *ServerIsBusy) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - s := string(dAtA[iNdEx:postIndex]) - m.Reason = &s + m.Reason = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field BackoffMs", wireType) + } + m.BackoffMs = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowErrorpb + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.BackoffMs |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipErrorpb(dAtA[iNdEx:]) @@ -1381,7 +1344,6 @@ func (m *ServerIsBusy) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1432,7 +1394,6 @@ func (m *StaleCommand) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1475,7 +1436,7 @@ func (m *RaftEntryTooLarge) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field RegionId", wireType) } - var v uint64 + m.RegionId = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowErrorpb @@ -1485,17 +1446,16 @@ func (m *RaftEntryTooLarge) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (uint64(b) & 0x7F) << shift + m.RegionId |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } - m.RegionId = &v case 2: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field EntrySize", wireType) } - var v uint64 + m.EntrySize = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowErrorpb @@ -1505,12 +1465,11 @@ func (m *RaftEntryTooLarge) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (uint64(b) & 0x7F) << shift + m.EntrySize |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } - m.EntrySize = &v default: iNdEx = preIndex skippy, err := skipErrorpb(dAtA[iNdEx:]) @@ -1523,7 +1482,6 @@ func (m *RaftEntryTooLarge) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1589,8 +1547,7 @@ func (m *Error) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - s := string(dAtA[iNdEx:postIndex]) - m.Message = &s + m.Message = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { @@ -1868,7 +1825,6 @@ func (m *Error) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1986,42 +1942,43 @@ var ( func init() { proto.RegisterFile("errorpb.proto", fileDescriptorErrorpb) } var fileDescriptorErrorpb = []byte{ - // 583 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x94, 0xdf, 0x6f, 0xd3, 0x30, - 0x10, 0xc7, 0xc9, 0x7e, 0xb4, 0xcb, 0x35, 0xcd, 0x36, 0x33, 0xb6, 0x68, 0x13, 0xd5, 0x14, 0x21, - 0x34, 0x21, 0x91, 0x89, 0x89, 0x27, 0x10, 0x48, 0x0c, 0x0d, 0x69, 0xea, 0x28, 0xc8, 0xe5, 0x3d, - 0xf2, 0x9a, 0x5b, 0x16, 0x75, 0xb1, 0x2b, 0xdb, 0xdd, 0x94, 0xfd, 0x23, 0xf0, 0x27, 0xf1, 0xc8, - 0x9f, 0x80, 0xc6, 0x3f, 0x82, 0xec, 0xa4, 0x6d, 0xd2, 0x87, 0xbd, 0xdd, 0x9d, 0xfd, 0x3d, 0x9f, - 0xef, 0x73, 0x36, 0x74, 0x51, 0x4a, 0x21, 0x27, 0x97, 0xd1, 0x44, 0x0a, 0x2d, 0x48, 0xbb, 0x72, - 0xf7, 0xbd, 0x1c, 0x35, 0x9b, 0x85, 0xf7, 0x77, 0x52, 0x91, 0x0a, 0x6b, 0x1e, 0x1b, 0xab, 0x8c, - 0x86, 0x03, 0x70, 0x07, 0x42, 0x5f, 0x20, 0x4b, 0x50, 0x92, 0x03, 0x70, 0x25, 0xa6, 0x99, 0xe0, - 0x71, 0x96, 0x04, 0xce, 0xa1, 0x73, 0xb4, 0x46, 0x37, 0xca, 0xc0, 0x79, 0x42, 0x5e, 0x40, 0xeb, - 0xc6, 0x6e, 0x0b, 0x56, 0x0e, 0x9d, 0xa3, 0xce, 0x89, 0x17, 0x55, 0xe9, 0xbf, 0x23, 0x4a, 0x5a, - 0xad, 0x85, 0x9b, 0xd0, 0x1d, 0x6a, 0x21, 0x71, 0x20, 0xf4, 0x57, 0xa6, 0x47, 0xd7, 0xe1, 0x6b, - 0xf0, 0xa9, 0x4d, 0x31, 0x10, 0xfa, 0x8b, 0x98, 0xf2, 0xe4, 0xd1, 0x53, 0xc2, 0x29, 0xf8, 0x7d, - 0x2c, 0x06, 0x42, 0x9f, 0xf3, 0x52, 0x46, 0xb6, 0x60, 0x75, 0x8c, 0x85, 0xdd, 0xe8, 0x51, 0x63, - 0x36, 0x13, 0xac, 0x2c, 0x95, 0x79, 0x00, 0xae, 0xd2, 0x4c, 0xea, 0xd8, 0x88, 0x56, 0xad, 0x68, - 0xc3, 0x06, 0xfa, 0x58, 0x90, 0x3d, 0x68, 0x23, 0x4f, 0xec, 0xd2, 0x9a, 0x5d, 0x6a, 0x21, 0x4f, - 0xfa, 0x58, 0x84, 0x1f, 0x00, 0x86, 0x9a, 0xdd, 0xe0, 0xd9, 0x44, 0x8c, 0xae, 0xc9, 0x31, 0x74, - 0x38, 0xde, 0xc5, 0x65, 0x4e, 0x15, 0x38, 0x87, 0xab, 0x47, 0x9d, 0x13, 0x7f, 0x76, 0xdf, 0xb2, - 0x2e, 0x0a, 0x1c, 0xef, 0x4a, 0x53, 0x85, 0x2f, 0xc1, 0x1b, 0xa2, 0xbc, 0x45, 0x79, 0xae, 0x4e, - 0xa7, 0xaa, 0x20, 0xbb, 0xd0, 0x92, 0xc8, 0x94, 0xe0, 0xb6, 0x6c, 0x97, 0x56, 0x5e, 0xe8, 0x83, - 0x67, 0x8f, 0xf9, 0x2c, 0xf2, 0x9c, 0xf1, 0x24, 0xfc, 0x06, 0xdb, 0x94, 0x5d, 0xe9, 0x33, 0xae, - 0x65, 0xf1, 0x43, 0x88, 0x0b, 0x26, 0x53, 0x7c, 0x9c, 0xc2, 0x73, 0x00, 0x34, 0xbb, 0x63, 0x95, - 0xdd, 0x63, 0x75, 0x79, 0xd7, 0x46, 0x86, 0xd9, 0x3d, 0x86, 0x3f, 0xd7, 0x60, 0xfd, 0xcc, 0xe0, - 0x27, 0x01, 0xb4, 0x73, 0x54, 0x8a, 0xa5, 0x58, 0xd5, 0x30, 0x73, 0xc9, 0x1b, 0x00, 0x2e, 0x74, - 0xdc, 0x80, 0x49, 0xa2, 0xd9, 0x0c, 0xcd, 0xa7, 0x81, 0xba, 0x7c, 0x3e, 0x18, 0x9f, 0x60, 0xab, - 0x2a, 0xc9, 0x28, 0xaf, 0x0c, 0x46, 0xdb, 0xdb, 0xce, 0xc9, 0xde, 0x5c, 0xd8, 0xa4, 0x4c, 0x7d, - 0xd9, 0xa4, 0x7e, 0x0a, 0xdb, 0x63, 0x2c, 0xac, 0x3e, 0xe3, 0x55, 0x6b, 0x2d, 0x84, 0x7a, 0x8e, - 0x26, 0x7a, 0xea, 0x8f, 0x9b, 0xa3, 0xf0, 0x16, 0x3a, 0xca, 0xb4, 0x2f, 0x46, 0x83, 0x29, 0x58, - 0xb7, 0xea, 0xa7, 0x73, 0xf5, 0x82, 0x20, 0x05, 0xb5, 0xa0, 0xf9, 0x1e, 0x7c, 0x65, 0xe1, 0xc4, - 0x99, 0x8a, 0x2f, 0xa7, 0xaa, 0x08, 0x5a, 0x56, 0xf8, 0x6c, 0x21, 0xac, 0xb1, 0xa3, 0x9e, 0xaa, - 0x93, 0x7c, 0x07, 0xdd, 0xf2, 0xc8, 0x51, 0x89, 0x2c, 0x68, 0x2f, 0x6b, 0x6b, 0x3c, 0xa9, 0xa7, - 0x6a, 0x1e, 0xf9, 0x08, 0x9b, 0xca, 0xbc, 0x05, 0x7b, 0xe9, 0xdc, 0xbc, 0x86, 0x60, 0xc3, 0xaa, - 0x77, 0x6b, 0xea, 0xda, 0x5b, 0xa1, 0x5d, 0x55, 0x77, 0x49, 0x1f, 0x76, 0x24, 0xbb, 0xd2, 0x71, - 0x09, 0x5c, 0x0b, 0x11, 0xdf, 0x98, 0x01, 0x09, 0x5c, 0x9b, 0x64, 0x7f, 0xd1, 0xf9, 0xe5, 0x11, - 0xa2, 0xdb, 0x72, 0x39, 0x74, 0xfa, 0xea, 0xf7, 0x43, 0xcf, 0xf9, 0xf3, 0xd0, 0x73, 0xfe, 0x3e, - 0xf4, 0x9c, 0x5f, 0xff, 0x7a, 0x4f, 0x20, 0x18, 0x89, 0x3c, 0x9a, 0x64, 0x3c, 0x1d, 0xb1, 0x49, - 0xa4, 0xb3, 0xf1, 0x6d, 0x34, 0xbe, 0xb5, 0x9f, 0xc2, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x65, - 0xf5, 0x06, 0x9b, 0x51, 0x04, 0x00, 0x00, + // 604 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x54, 0xdd, 0x6e, 0xd3, 0x30, + 0x14, 0x26, 0xfb, 0x69, 0x97, 0xd3, 0x34, 0xdb, 0xcc, 0xd8, 0xa2, 0x4d, 0xab, 0xa6, 0x88, 0x8b, + 0x09, 0x89, 0x4e, 0x0c, 0xae, 0x40, 0x20, 0x31, 0x54, 0xa4, 0xa9, 0x5b, 0x41, 0x2e, 0xf7, 0x91, + 0xdb, 0x9c, 0x76, 0x51, 0x17, 0xbb, 0xb2, 0xdd, 0x4d, 0xd9, 0x8b, 0xc0, 0x23, 0x71, 0xc9, 0x23, + 0xa0, 0xf1, 0x22, 0xc8, 0x4e, 0xda, 0x26, 0xbd, 0xd8, 0x55, 0xce, 0x39, 0xf6, 0x77, 0xfc, 0xf9, + 0x7c, 0x9f, 0x03, 0x4d, 0x94, 0x52, 0xc8, 0xe9, 0xa0, 0x3d, 0x95, 0x42, 0x0b, 0x52, 0x2f, 0xd2, + 0x43, 0x2f, 0x45, 0xcd, 0xe6, 0xe5, 0xc3, 0xbd, 0xb1, 0x18, 0x0b, 0x1b, 0x9e, 0x99, 0x28, 0xaf, + 0x86, 0x3d, 0x70, 0x7b, 0x42, 0x5f, 0x21, 0x8b, 0x51, 0x92, 0x23, 0x70, 0x25, 0x8e, 0x13, 0xc1, + 0xa3, 0x24, 0x0e, 0x9c, 0x13, 0xe7, 0x74, 0x83, 0x6e, 0xe5, 0x85, 0xcb, 0x98, 0xbc, 0x84, 0xda, + 0xad, 0xdd, 0x16, 0xac, 0x9d, 0x38, 0xa7, 0x8d, 0x73, 0xaf, 0x5d, 0xb4, 0xff, 0x8e, 0x28, 0x69, + 0xb1, 0x16, 0x6e, 0x43, 0xb3, 0xaf, 0x85, 0xc4, 0x9e, 0xd0, 0xd7, 0x4c, 0x0f, 0x6f, 0xc2, 0xd7, + 0xe0, 0x53, 0xdb, 0xa2, 0x27, 0xf4, 0x57, 0x31, 0xe3, 0xf1, 0x93, 0xa7, 0x84, 0x33, 0xf0, 0xbb, + 0x98, 0xf5, 0x84, 0xbe, 0xe4, 0x39, 0x8c, 0xec, 0xc0, 0xfa, 0x04, 0x33, 0xbb, 0xd1, 0xa3, 0x26, + 0xac, 0x36, 0x58, 0x5b, 0xa1, 0x79, 0x04, 0xae, 0xd2, 0x4c, 0xea, 0xc8, 0x80, 0xd6, 0x2d, 0x68, + 0xcb, 0x16, 0xba, 0x98, 0x91, 0x03, 0xa8, 0x23, 0x8f, 0xed, 0xd2, 0x86, 0x5d, 0xaa, 0x21, 0x8f, + 0xbb, 0x98, 0x85, 0x1f, 0x01, 0xfa, 0x9a, 0xdd, 0x62, 0x67, 0x2a, 0x86, 0x37, 0xe4, 0x0c, 0x1a, + 0x1c, 0xef, 0xa3, 0xbc, 0xa7, 0x0a, 0x9c, 0x93, 0xf5, 0xd3, 0xc6, 0xb9, 0x3f, 0xbf, 0x6f, 0xce, + 0x8b, 0x02, 0xc7, 0xfb, 0x3c, 0x54, 0x61, 0x07, 0xbc, 0x3e, 0xca, 0x3b, 0x94, 0x97, 0xea, 0x62, + 0xa6, 0x32, 0xb2, 0x0f, 0x35, 0x89, 0x4c, 0x09, 0x6e, 0x69, 0xbb, 0xb4, 0xc8, 0xc8, 0x31, 0xc0, + 0x80, 0x0d, 0x27, 0x62, 0x34, 0x8a, 0x52, 0x55, 0x50, 0x77, 0x8b, 0xca, 0xb5, 0x0a, 0x7d, 0xf0, + 0x2c, 0x8b, 0x2f, 0x22, 0x4d, 0x19, 0x8f, 0xc3, 0x6f, 0xb0, 0x4b, 0xd9, 0x48, 0x77, 0xb8, 0x96, + 0xd9, 0x0f, 0x21, 0xae, 0x98, 0x1c, 0xe3, 0xd3, 0x22, 0x1d, 0x03, 0xa0, 0xd9, 0x1d, 0xa9, 0xe4, + 0x01, 0xe7, 0x07, 0xd8, 0x4a, 0x3f, 0x79, 0xc0, 0xf0, 0xe7, 0x06, 0x6c, 0x76, 0x8c, 0x3b, 0x48, + 0x00, 0xf5, 0x14, 0x95, 0x62, 0x63, 0x2c, 0x28, 0xce, 0x53, 0xf2, 0x06, 0x80, 0x0b, 0x1d, 0x55, + 0xb4, 0x26, 0xed, 0xb9, 0xc5, 0x16, 0x66, 0xa1, 0x2e, 0x5f, 0xf8, 0xe6, 0x33, 0xec, 0x14, 0x94, + 0x0c, 0x72, 0x64, 0x54, 0xb6, 0xa3, 0x6f, 0x9c, 0x1f, 0x2c, 0x80, 0x55, 0x13, 0x50, 0x5f, 0x56, + 0x4d, 0x71, 0x01, 0xbb, 0x13, 0xcc, 0x2c, 0x3e, 0xe1, 0xc5, 0xe4, 0xad, 0x46, 0xe5, 0x1e, 0x55, + 0x67, 0x50, 0x7f, 0x52, 0x75, 0xca, 0x3b, 0x68, 0x28, 0x33, 0xbe, 0x08, 0x8d, 0x8a, 0xc1, 0xa6, + 0x45, 0x3f, 0x5f, 0xa0, 0x97, 0x02, 0x53, 0x50, 0x4b, 0xb1, 0x3f, 0x80, 0xaf, 0xac, 0x76, 0x51, + 0xa2, 0xa2, 0xc1, 0x4c, 0x65, 0x41, 0xcd, 0x02, 0x5f, 0x2c, 0x81, 0x25, 0x69, 0xa9, 0xa7, 0xca, + 0x42, 0xbf, 0x87, 0x66, 0x7e, 0xe4, 0x30, 0x97, 0x2c, 0xa8, 0xaf, 0x62, 0x4b, 0x7a, 0x52, 0x4f, + 0x95, 0x32, 0xf2, 0x09, 0xb6, 0x95, 0x79, 0x2a, 0xf6, 0xd2, 0xa9, 0x79, 0x2c, 0xc1, 0x96, 0x45, + 0xef, 0x97, 0xd0, 0xa5, 0xa7, 0x44, 0x9b, 0xaa, 0x9c, 0x92, 0x2e, 0xec, 0x49, 0x36, 0xd2, 0x51, + 0x2e, 0xb8, 0x16, 0x22, 0xba, 0x35, 0x06, 0x09, 0x5c, 0xdb, 0xe4, 0x70, 0x39, 0xf9, 0x55, 0x0b, + 0xd1, 0x5d, 0xb9, 0x5a, 0xba, 0x78, 0xf5, 0xfb, 0xb1, 0xe5, 0xfc, 0x79, 0x6c, 0x39, 0x7f, 0x1f, + 0x5b, 0xce, 0xaf, 0x7f, 0xad, 0x67, 0x10, 0x0c, 0x45, 0xda, 0x9e, 0x26, 0x7c, 0x3c, 0x64, 0xd3, + 0xb6, 0x4e, 0x26, 0x77, 0xed, 0xc9, 0x9d, 0xfd, 0x67, 0x0c, 0x6a, 0xf6, 0xf3, 0xf6, 0x7f, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x6f, 0xa9, 0xa3, 0xe6, 0x78, 0x04, 0x00, 0x00, } diff --git a/_vendor/src/github.com/pingcap/kvproto/pkg/kvrpcpb/kvrpcpb.pb.go b/_vendor/src/github.com/pingcap/kvproto/pkg/kvrpcpb/kvrpcpb.pb.go index c5a921d75855e..44378840d40fe 100644 --- a/_vendor/src/github.com/pingcap/kvproto/pkg/kvrpcpb/kvrpcpb.pb.go +++ b/_vendor/src/github.com/pingcap/kvproto/pkg/kvrpcpb/kvrpcpb.pb.go @@ -32,6 +32,7 @@ BatchGetResponse ScanLockRequest ScanLockResponse + TxnInfo ResolveLockRequest ResolveLockResponse GCRequest @@ -922,17 +923,42 @@ func (m *ScanLockResponse) GetLocks() []*LockInfo { return nil } +type TxnInfo struct { + Txn uint64 `protobuf:"varint,1,opt,name=txn,proto3" json:"txn,omitempty"` + Status uint64 `protobuf:"varint,2,opt,name=status,proto3" json:"status,omitempty"` +} + +func (m *TxnInfo) Reset() { *m = TxnInfo{} } +func (m *TxnInfo) String() string { return proto.CompactTextString(m) } +func (*TxnInfo) ProtoMessage() {} +func (*TxnInfo) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{23} } + +func (m *TxnInfo) GetTxn() uint64 { + if m != nil { + return m.Txn + } + return 0 +} + +func (m *TxnInfo) GetStatus() uint64 { + if m != nil { + return m.Status + } + return 0 +} + type ResolveLockRequest struct { Context *Context `protobuf:"bytes,1,opt,name=context" json:"context,omitempty"` StartVersion uint64 `protobuf:"varint,2,opt,name=start_version,json=startVersion,proto3" json:"start_version,omitempty"` // If the txn is rolled back, do not set it. - CommitVersion uint64 `protobuf:"varint,3,opt,name=commit_version,json=commitVersion,proto3" json:"commit_version,omitempty"` + CommitVersion uint64 `protobuf:"varint,3,opt,name=commit_version,json=commitVersion,proto3" json:"commit_version,omitempty"` + TxnInfos []*TxnInfo `protobuf:"bytes,4,rep,name=txn_infos,json=txnInfos" json:"txn_infos,omitempty"` } func (m *ResolveLockRequest) Reset() { *m = ResolveLockRequest{} } func (m *ResolveLockRequest) String() string { return proto.CompactTextString(m) } func (*ResolveLockRequest) ProtoMessage() {} -func (*ResolveLockRequest) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{23} } +func (*ResolveLockRequest) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{24} } func (m *ResolveLockRequest) GetContext() *Context { if m != nil { @@ -955,6 +981,13 @@ func (m *ResolveLockRequest) GetCommitVersion() uint64 { return 0 } +func (m *ResolveLockRequest) GetTxnInfos() []*TxnInfo { + if m != nil { + return m.TxnInfos + } + return nil +} + type ResolveLockResponse struct { RegionError *errorpb.Error `protobuf:"bytes,1,opt,name=region_error,json=regionError" json:"region_error,omitempty"` Error *KeyError `protobuf:"bytes,2,opt,name=error" json:"error,omitempty"` @@ -963,7 +996,7 @@ type ResolveLockResponse struct { func (m *ResolveLockResponse) Reset() { *m = ResolveLockResponse{} } func (m *ResolveLockResponse) String() string { return proto.CompactTextString(m) } func (*ResolveLockResponse) ProtoMessage() {} -func (*ResolveLockResponse) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{24} } +func (*ResolveLockResponse) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{25} } func (m *ResolveLockResponse) GetRegionError() *errorpb.Error { if m != nil { @@ -987,7 +1020,7 @@ type GCRequest struct { func (m *GCRequest) Reset() { *m = GCRequest{} } func (m *GCRequest) String() string { return proto.CompactTextString(m) } func (*GCRequest) ProtoMessage() {} -func (*GCRequest) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{25} } +func (*GCRequest) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{26} } func (m *GCRequest) GetContext() *Context { if m != nil { @@ -1011,7 +1044,7 @@ type GCResponse struct { func (m *GCResponse) Reset() { *m = GCResponse{} } func (m *GCResponse) String() string { return proto.CompactTextString(m) } func (*GCResponse) ProtoMessage() {} -func (*GCResponse) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{26} } +func (*GCResponse) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{27} } func (m *GCResponse) GetRegionError() *errorpb.Error { if m != nil { @@ -1035,7 +1068,7 @@ type RawGetRequest struct { func (m *RawGetRequest) Reset() { *m = RawGetRequest{} } func (m *RawGetRequest) String() string { return proto.CompactTextString(m) } func (*RawGetRequest) ProtoMessage() {} -func (*RawGetRequest) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{27} } +func (*RawGetRequest) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{28} } func (m *RawGetRequest) GetContext() *Context { if m != nil { @@ -1060,7 +1093,7 @@ type RawGetResponse struct { func (m *RawGetResponse) Reset() { *m = RawGetResponse{} } func (m *RawGetResponse) String() string { return proto.CompactTextString(m) } func (*RawGetResponse) ProtoMessage() {} -func (*RawGetResponse) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{28} } +func (*RawGetResponse) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{29} } func (m *RawGetResponse) GetRegionError() *errorpb.Error { if m != nil { @@ -1092,7 +1125,7 @@ type RawPutRequest struct { func (m *RawPutRequest) Reset() { *m = RawPutRequest{} } func (m *RawPutRequest) String() string { return proto.CompactTextString(m) } func (*RawPutRequest) ProtoMessage() {} -func (*RawPutRequest) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{29} } +func (*RawPutRequest) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{30} } func (m *RawPutRequest) GetContext() *Context { if m != nil { @@ -1123,7 +1156,7 @@ type RawPutResponse struct { func (m *RawPutResponse) Reset() { *m = RawPutResponse{} } func (m *RawPutResponse) String() string { return proto.CompactTextString(m) } func (*RawPutResponse) ProtoMessage() {} -func (*RawPutResponse) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{30} } +func (*RawPutResponse) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{31} } func (m *RawPutResponse) GetRegionError() *errorpb.Error { if m != nil { @@ -1147,7 +1180,7 @@ type RawDeleteRequest struct { func (m *RawDeleteRequest) Reset() { *m = RawDeleteRequest{} } func (m *RawDeleteRequest) String() string { return proto.CompactTextString(m) } func (*RawDeleteRequest) ProtoMessage() {} -func (*RawDeleteRequest) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{31} } +func (*RawDeleteRequest) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{32} } func (m *RawDeleteRequest) GetContext() *Context { if m != nil { @@ -1171,7 +1204,7 @@ type RawDeleteResponse struct { func (m *RawDeleteResponse) Reset() { *m = RawDeleteResponse{} } func (m *RawDeleteResponse) String() string { return proto.CompactTextString(m) } func (*RawDeleteResponse) ProtoMessage() {} -func (*RawDeleteResponse) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{32} } +func (*RawDeleteResponse) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{33} } func (m *RawDeleteResponse) GetRegionError() *errorpb.Error { if m != nil { @@ -1196,7 +1229,7 @@ type DeleteRangeRequest struct { func (m *DeleteRangeRequest) Reset() { *m = DeleteRangeRequest{} } func (m *DeleteRangeRequest) String() string { return proto.CompactTextString(m) } func (*DeleteRangeRequest) ProtoMessage() {} -func (*DeleteRangeRequest) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{33} } +func (*DeleteRangeRequest) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{34} } func (m *DeleteRangeRequest) GetContext() *Context { if m != nil { @@ -1227,7 +1260,7 @@ type DeleteRangeResponse struct { func (m *DeleteRangeResponse) Reset() { *m = DeleteRangeResponse{} } func (m *DeleteRangeResponse) String() string { return proto.CompactTextString(m) } func (*DeleteRangeResponse) ProtoMessage() {} -func (*DeleteRangeResponse) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{34} } +func (*DeleteRangeResponse) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{35} } func (m *DeleteRangeResponse) GetRegionError() *errorpb.Error { if m != nil { @@ -1252,7 +1285,7 @@ type RawScanRequest struct { func (m *RawScanRequest) Reset() { *m = RawScanRequest{} } func (m *RawScanRequest) String() string { return proto.CompactTextString(m) } func (*RawScanRequest) ProtoMessage() {} -func (*RawScanRequest) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{35} } +func (*RawScanRequest) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{36} } func (m *RawScanRequest) GetContext() *Context { if m != nil { @@ -1283,7 +1316,7 @@ type RawScanResponse struct { func (m *RawScanResponse) Reset() { *m = RawScanResponse{} } func (m *RawScanResponse) String() string { return proto.CompactTextString(m) } func (*RawScanResponse) ProtoMessage() {} -func (*RawScanResponse) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{36} } +func (*RawScanResponse) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{37} } func (m *RawScanResponse) GetRegionError() *errorpb.Error { if m != nil { @@ -1308,7 +1341,7 @@ type WriteInfo struct { func (m *WriteInfo) Reset() { *m = WriteInfo{} } func (m *WriteInfo) String() string { return proto.CompactTextString(m) } func (*WriteInfo) ProtoMessage() {} -func (*WriteInfo) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{37} } +func (*WriteInfo) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{38} } func (m *WriteInfo) GetStartTs() uint64 { if m != nil { @@ -1340,7 +1373,7 @@ type ValueInfo struct { func (m *ValueInfo) Reset() { *m = ValueInfo{} } func (m *ValueInfo) String() string { return proto.CompactTextString(m) } func (*ValueInfo) ProtoMessage() {} -func (*ValueInfo) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{38} } +func (*ValueInfo) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{39} } func (m *ValueInfo) GetValue() []byte { if m != nil { @@ -1372,7 +1405,7 @@ type MvccInfo struct { func (m *MvccInfo) Reset() { *m = MvccInfo{} } func (m *MvccInfo) String() string { return proto.CompactTextString(m) } func (*MvccInfo) ProtoMessage() {} -func (*MvccInfo) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{39} } +func (*MvccInfo) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{40} } func (m *MvccInfo) GetLock() *LockInfo { if m != nil { @@ -1403,7 +1436,7 @@ type MvccGetByKeyRequest struct { func (m *MvccGetByKeyRequest) Reset() { *m = MvccGetByKeyRequest{} } func (m *MvccGetByKeyRequest) String() string { return proto.CompactTextString(m) } func (*MvccGetByKeyRequest) ProtoMessage() {} -func (*MvccGetByKeyRequest) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{40} } +func (*MvccGetByKeyRequest) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{41} } func (m *MvccGetByKeyRequest) GetContext() *Context { if m != nil { @@ -1428,7 +1461,7 @@ type MvccGetByKeyResponse struct { func (m *MvccGetByKeyResponse) Reset() { *m = MvccGetByKeyResponse{} } func (m *MvccGetByKeyResponse) String() string { return proto.CompactTextString(m) } func (*MvccGetByKeyResponse) ProtoMessage() {} -func (*MvccGetByKeyResponse) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{41} } +func (*MvccGetByKeyResponse) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{42} } func (m *MvccGetByKeyResponse) GetRegionError() *errorpb.Error { if m != nil { @@ -1459,7 +1492,7 @@ type MvccGetByStartTsRequest struct { func (m *MvccGetByStartTsRequest) Reset() { *m = MvccGetByStartTsRequest{} } func (m *MvccGetByStartTsRequest) String() string { return proto.CompactTextString(m) } func (*MvccGetByStartTsRequest) ProtoMessage() {} -func (*MvccGetByStartTsRequest) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{42} } +func (*MvccGetByStartTsRequest) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{43} } func (m *MvccGetByStartTsRequest) GetContext() *Context { if m != nil { @@ -1485,7 +1518,7 @@ type MvccGetByStartTsResponse struct { func (m *MvccGetByStartTsResponse) Reset() { *m = MvccGetByStartTsResponse{} } func (m *MvccGetByStartTsResponse) String() string { return proto.CompactTextString(m) } func (*MvccGetByStartTsResponse) ProtoMessage() {} -func (*MvccGetByStartTsResponse) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{43} } +func (*MvccGetByStartTsResponse) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{44} } func (m *MvccGetByStartTsResponse) GetRegionError() *errorpb.Error { if m != nil { @@ -1523,7 +1556,7 @@ type SplitRegionRequest struct { func (m *SplitRegionRequest) Reset() { *m = SplitRegionRequest{} } func (m *SplitRegionRequest) String() string { return proto.CompactTextString(m) } func (*SplitRegionRequest) ProtoMessage() {} -func (*SplitRegionRequest) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{44} } +func (*SplitRegionRequest) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{45} } func (m *SplitRegionRequest) GetContext() *Context { if m != nil { @@ -1548,7 +1581,7 @@ type SplitRegionResponse struct { func (m *SplitRegionResponse) Reset() { *m = SplitRegionResponse{} } func (m *SplitRegionResponse) String() string { return proto.CompactTextString(m) } func (*SplitRegionResponse) ProtoMessage() {} -func (*SplitRegionResponse) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{45} } +func (*SplitRegionResponse) Descriptor() ([]byte, []int) { return fileDescriptorKvrpcpb, []int{46} } func (m *SplitRegionResponse) GetRegionError() *errorpb.Error { if m != nil { @@ -1595,6 +1628,7 @@ func init() { proto.RegisterType((*BatchGetResponse)(nil), "kvrpcpb.BatchGetResponse") proto.RegisterType((*ScanLockRequest)(nil), "kvrpcpb.ScanLockRequest") proto.RegisterType((*ScanLockResponse)(nil), "kvrpcpb.ScanLockResponse") + proto.RegisterType((*TxnInfo)(nil), "kvrpcpb.TxnInfo") proto.RegisterType((*ResolveLockRequest)(nil), "kvrpcpb.ResolveLockRequest") proto.RegisterType((*ResolveLockResponse)(nil), "kvrpcpb.ResolveLockResponse") proto.RegisterType((*GCRequest)(nil), "kvrpcpb.GCRequest") @@ -2616,6 +2650,34 @@ func (m *ScanLockResponse) MarshalTo(dAtA []byte) (int, error) { return i, nil } +func (m *TxnInfo) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalTo(dAtA) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *TxnInfo) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if m.Txn != 0 { + dAtA[i] = 0x8 + i++ + i = encodeVarintKvrpcpb(dAtA, i, uint64(m.Txn)) + } + if m.Status != 0 { + dAtA[i] = 0x10 + i++ + i = encodeVarintKvrpcpb(dAtA, i, uint64(m.Status)) + } + return i, nil +} + func (m *ResolveLockRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -2651,6 +2713,18 @@ func (m *ResolveLockRequest) MarshalTo(dAtA []byte) (int, error) { i++ i = encodeVarintKvrpcpb(dAtA, i, uint64(m.CommitVersion)) } + if len(m.TxnInfos) > 0 { + for _, msg := range m.TxnInfos { + dAtA[i] = 0x22 + i++ + i = encodeVarintKvrpcpb(dAtA, i, uint64(msg.Size())) + n, err := msg.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n + } + } return i, nil } @@ -3950,6 +4024,18 @@ func (m *ScanLockResponse) Size() (n int) { return n } +func (m *TxnInfo) Size() (n int) { + var l int + _ = l + if m.Txn != 0 { + n += 1 + sovKvrpcpb(uint64(m.Txn)) + } + if m.Status != 0 { + n += 1 + sovKvrpcpb(uint64(m.Status)) + } + return n +} + func (m *ResolveLockRequest) Size() (n int) { var l int _ = l @@ -3963,6 +4049,12 @@ func (m *ResolveLockRequest) Size() (n int) { if m.CommitVersion != 0 { n += 1 + sovKvrpcpb(uint64(m.CommitVersion)) } + if len(m.TxnInfos) > 0 { + for _, e := range m.TxnInfos { + l = e.Size() + n += 1 + l + sovKvrpcpb(uint64(l)) + } + } return n } @@ -7498,6 +7590,94 @@ func (m *ScanLockResponse) Unmarshal(dAtA []byte) error { } return nil } +func (m *TxnInfo) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowKvrpcpb + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: TxnInfo: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: TxnInfo: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Txn", wireType) + } + m.Txn = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowKvrpcpb + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Txn |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Status", wireType) + } + m.Status = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowKvrpcpb + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Status |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + default: + iNdEx = preIndex + skippy, err := skipKvrpcpb(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthKvrpcpb + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *ResolveLockRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -7598,6 +7778,37 @@ func (m *ResolveLockRequest) Unmarshal(dAtA []byte) error { break } } + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TxnInfos", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowKvrpcpb + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthKvrpcpb + } + postIndex := iNdEx + msglen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.TxnInfos = append(m.TxnInfos, &TxnInfo{}) + if err := m.TxnInfos[len(m.TxnInfos)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipKvrpcpb(dAtA[iNdEx:]) @@ -10477,102 +10688,106 @@ var ( func init() { proto.RegisterFile("kvrpcpb.proto", fileDescriptorKvrpcpb) } var fileDescriptorKvrpcpb = []byte{ - // 1549 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4f, 0x6f, 0xdb, 0xc6, - 0x12, 0x0f, 0x29, 0x4a, 0xa2, 0x46, 0x7f, 0xcc, 0xac, 0x1d, 0x44, 0x2f, 0x79, 0xcf, 0x51, 0xf8, - 0x62, 0xc4, 0xf1, 0x03, 0x14, 0x3c, 0x17, 0xe8, 0xb9, 0x88, 0x92, 0xa6, 0x8e, 0x9d, 0x5a, 0x58, - 0x07, 0x0e, 0x02, 0xb4, 0x51, 0x69, 0x6a, 0x2d, 0x2d, 0x44, 0x71, 0x19, 0x72, 0x25, 0x87, 0x28, - 0x8a, 0x9e, 0x5a, 0xa0, 0x40, 0x4f, 0x45, 0x81, 0xf6, 0xd0, 0x4b, 0x8f, 0xfd, 0x26, 0x3d, 0xf6, - 0xde, 0x4b, 0x91, 0x7e, 0x91, 0x62, 0x97, 0xff, 0x24, 0xcb, 0x69, 0x0d, 0x42, 0xd1, 0x49, 0xda, - 0x99, 0xd9, 0x9d, 0xf9, 0xcd, 0xfc, 0x76, 0x96, 0xbb, 0x50, 0x1f, 0x4d, 0x7d, 0xcf, 0xf6, 0x4e, - 0xda, 0x9e, 0xcf, 0x38, 0x43, 0xe5, 0x78, 0x78, 0xa3, 0x36, 0x26, 0xdc, 0x4a, 0xc4, 0x37, 0xea, - 0xc4, 0xf7, 0x99, 0x9f, 0x0e, 0x37, 0x06, 0x6c, 0xc0, 0xe4, 0xdf, 0xfb, 0xe2, 0x5f, 0x24, 0x35, - 0xbf, 0x00, 0xfd, 0x80, 0xd9, 0xa3, 0x3d, 0xf7, 0x94, 0xa1, 0xdb, 0x50, 0xf3, 0x7c, 0x3a, 0xb6, - 0xfc, 0xb0, 0xe7, 0x30, 0x7b, 0xd4, 0x54, 0x5a, 0xca, 0x76, 0x0d, 0x57, 0x63, 0x99, 0x30, 0x13, - 0x26, 0x42, 0xd5, 0x9b, 0x12, 0x3f, 0xa0, 0xcc, 0x6d, 0xaa, 0x2d, 0x65, 0x5b, 0xc3, 0x55, 0x21, - 0x3b, 0x8e, 0x44, 0xc8, 0x80, 0xc2, 0x88, 0x84, 0xcd, 0x82, 0x9c, 0x2c, 0xfe, 0xa2, 0x7f, 0x81, - 0x2e, 0x27, 0x71, 0xee, 0x34, 0x35, 0x39, 0xa1, 0x2c, 0xc6, 0xcf, 0xb8, 0x63, 0x52, 0xd0, 0xf7, - 0x49, 0xf8, 0x48, 0x04, 0x8a, 0xee, 0x41, 0x49, 0x88, 0x49, 0x5f, 0x3a, 0xae, 0xee, 0x5e, 0x6d, - 0x27, 0x30, 0x93, 0x08, 0x71, 0x6c, 0x80, 0xfe, 0x0d, 0x15, 0x9f, 0x70, 0x3f, 0xb4, 0x4e, 0x1c, - 0x22, 0x63, 0xa8, 0xe0, 0x4c, 0x80, 0x36, 0xa0, 0x68, 0x9d, 0x30, 0x9f, 0xcb, 0x18, 0x2a, 0x38, - 0x1a, 0x98, 0xbf, 0xab, 0x50, 0xee, 0x30, 0x97, 0x93, 0xd7, 0x1c, 0xdd, 0x14, 0xf3, 0x07, 0x94, - 0xb9, 0x3d, 0x1a, 0x79, 0xd3, 0xb0, 0x1e, 0x09, 0xf6, 0xfa, 0xe8, 0x7d, 0xa8, 0xc5, 0x4a, 0xe2, - 0x31, 0x7b, 0x28, 0xd7, 0xaf, 0xee, 0xae, 0xb7, 0xe3, 0xe4, 0x62, 0xa9, 0x7b, 0x24, 0x54, 0xb8, - 0xea, 0x67, 0x03, 0xd4, 0x02, 0xcd, 0x23, 0xc4, 0x97, 0x5e, 0xab, 0xbb, 0xb5, 0xc4, 0xbe, 0x4b, - 0x88, 0x8f, 0xa5, 0x06, 0x21, 0xd0, 0x38, 0xf1, 0xc7, 0xcd, 0xa2, 0xf4, 0x28, 0xff, 0xa3, 0xfb, - 0xa0, 0x7b, 0x3e, 0x65, 0x3e, 0xe5, 0x61, 0xb3, 0xd4, 0x52, 0xb6, 0x1b, 0xbb, 0xeb, 0x29, 0xee, - 0x0e, 0x1b, 0x8f, 0x2d, 0xb7, 0xdf, 0xf5, 0x29, 0x4e, 0x8d, 0xd0, 0x07, 0xb0, 0x46, 0x03, 0xe6, - 0x58, 0x5c, 0x44, 0xe8, 0x90, 0x29, 0x71, 0x9a, 0x65, 0x39, 0xef, 0x7a, 0x3a, 0x6f, 0x2f, 0xd1, - 0x1f, 0x08, 0x35, 0x6e, 0xd0, 0xb9, 0x31, 0xba, 0x03, 0x0d, 0x97, 0xf1, 0xde, 0x29, 0x75, 0x9c, - 0x9e, 0x6d, 0xd9, 0x43, 0xd2, 0xd4, 0x5b, 0xca, 0xb6, 0x8e, 0x6b, 0x2e, 0xe3, 0x1f, 0x52, 0xc7, - 0xe9, 0x08, 0x99, 0xa8, 0x5a, 0x10, 0xba, 0x76, 0xcf, 0x61, 0x83, 0x66, 0x45, 0xea, 0xcb, 0x62, - 0x7c, 0xc0, 0x06, 0x4f, 0x34, 0x5d, 0x33, 0x8a, 0x02, 0xbc, 0xd5, 0xef, 0xbd, 0x9a, 0x30, 0x7f, - 0x32, 0x36, 0xfb, 0x00, 0x8f, 0x09, 0xc7, 0xe4, 0xd5, 0x84, 0x04, 0x1c, 0xed, 0x40, 0xd9, 0x8e, - 0x52, 0x1d, 0xd7, 0xd2, 0x98, 0xc1, 0x24, 0xe5, 0x38, 0x31, 0x48, 0xf8, 0xa2, 0x66, 0x7c, 0x69, - 0x42, 0x39, 0xe1, 0x57, 0x21, 0xa2, 0x4b, 0x3c, 0x34, 0xbf, 0x84, 0xaa, 0xf4, 0x12, 0x78, 0xcc, - 0x0d, 0x08, 0xfa, 0x7f, 0x56, 0x29, 0xc1, 0xa0, 0xd8, 0x57, 0xa3, 0x9d, 0x10, 0x5f, 0xf2, 0x2a, - 0x2d, 0x92, 0x24, 0xd9, 0x5d, 0x28, 0x46, 0xb6, 0xea, 0x39, 0x8e, 0x25, 0x34, 0xc4, 0x91, 0x5e, - 0x90, 0x68, 0x6a, 0x39, 0x13, 0x12, 0x13, 0x39, 0x1a, 0x98, 0x3f, 0x2b, 0x50, 0x3d, 0xb2, 0x2d, - 0x37, 0x0f, 0xd0, 0x9b, 0x50, 0x09, 0xb8, 0xe5, 0xf3, 0x5e, 0x06, 0x57, 0x97, 0x82, 0x7d, 0x12, - 0x0a, 0x77, 0x0e, 0x1d, 0xd3, 0x88, 0xb3, 0x75, 0x1c, 0x0d, 0x66, 0x33, 0xa1, 0xcd, 0x65, 0x42, - 0x54, 0x67, 0x44, 0xc2, 0x1e, 0x73, 0x9d, 0x50, 0xd2, 0x49, 0xc7, 0xe5, 0x11, 0x09, 0x0f, 0x5d, - 0x27, 0x34, 0x5f, 0x40, 0x69, 0x7f, 0xda, 0xb5, 0xe8, 0x0c, 0x58, 0xe5, 0x1f, 0xc0, 0x2e, 0xd6, - 0xe0, 0x62, 0xf8, 0x43, 0xa8, 0x45, 0xe8, 0xf3, 0x17, 0x60, 0x0b, 0x8a, 0x9e, 0x45, 0xfd, 0xa0, - 0xa9, 0xb6, 0x0a, 0xdb, 0xd5, 0xdd, 0xb5, 0x2c, 0x26, 0x19, 0x33, 0x8e, 0xb4, 0xe6, 0x21, 0xe8, - 0x4f, 0x27, 0x5c, 0x92, 0x16, 0xdd, 0x04, 0x95, 0x79, 0x72, 0xed, 0xc6, 0x6e, 0x35, 0xb5, 0x3f, - 0xf4, 0xb0, 0xca, 0xbc, 0x4b, 0x87, 0xfe, 0x95, 0x0a, 0x6b, 0x5d, 0x9f, 0x9c, 0xf9, 0x94, 0x93, - 0x3c, 0xd5, 0xbb, 0x0f, 0x95, 0x71, 0x1c, 0x50, 0x12, 0x7b, 0x96, 0xcf, 0x24, 0x54, 0x9c, 0xd9, - 0x2c, 0x74, 0xd3, 0xc2, 0x62, 0x37, 0xfd, 0x2f, 0xd4, 0x23, 0x46, 0xcc, 0x17, 0xb9, 0x26, 0x85, - 0xc7, 0x59, 0xa5, 0xd3, 0xee, 0x59, 0x9c, 0xeb, 0x9e, 0x68, 0x17, 0xae, 0x05, 0x23, 0xea, 0xf5, - 0x6c, 0xe6, 0x06, 0xdc, 0xb7, 0xa8, 0xcb, 0x7b, 0xf6, 0x90, 0xd8, 0x23, 0xd9, 0x48, 0x74, 0xbc, - 0x2e, 0x94, 0x9d, 0x54, 0xd7, 0x11, 0x2a, 0xd3, 0x03, 0x23, 0x4b, 0x43, 0xfe, 0x32, 0xde, 0x83, - 0x92, 0xd4, 0x2e, 0xe6, 0x22, 0xe5, 0x56, 0x6c, 0x60, 0xfe, 0xa2, 0x40, 0x5d, 0x74, 0x32, 0x9a, - 0xab, 0x3d, 0x2c, 0xe4, 0x48, 0xbd, 0x20, 0x47, 0x08, 0xb4, 0x11, 0x09, 0x83, 0x66, 0xa1, 0x55, - 0xd8, 0xae, 0x61, 0xf9, 0x1f, 0x6d, 0x41, 0xc3, 0x96, 0x5e, 0xcf, 0x65, 0xb7, 0x1e, 0x49, 0xe3, - 0xa9, 0x4f, 0x34, 0xbd, 0x68, 0x94, 0x70, 0xe9, 0x84, 0xba, 0x0e, 0x1b, 0x98, 0x0e, 0x34, 0x92, - 0x50, 0xdf, 0x7d, 0x8f, 0x31, 0x07, 0x50, 0xdf, 0x1b, 0x7b, 0xcc, 0x4f, 0x13, 0x33, 0x47, 0x32, - 0xe5, 0x12, 0x24, 0x5b, 0x04, 0xa9, 0x5e, 0x00, 0xd2, 0x7c, 0x01, 0x8d, 0xc4, 0x51, 0x7e, 0x58, - 0x1b, 0xb3, 0xb0, 0x2a, 0x09, 0x86, 0xcf, 0x61, 0xe3, 0x81, 0xc5, 0xed, 0x21, 0x66, 0x8e, 0x73, - 0x62, 0xd9, 0xa3, 0x55, 0xd6, 0xd8, 0x0c, 0xe0, 0xda, 0x39, 0xe7, 0x2b, 0xa8, 0x5a, 0x00, 0x8d, - 0x8e, 0x43, 0x2c, 0x77, 0xe2, 0x2d, 0xe7, 0xb8, 0x5b, 0x40, 0x5f, 0x58, 0x44, 0x6f, 0x7e, 0xaf, - 0xc0, 0x5a, 0xea, 0x75, 0x05, 0xc7, 0xdf, 0x22, 0xb1, 0x0a, 0x17, 0x11, 0x6b, 0x04, 0x6b, 0xb2, - 0x00, 0x39, 0xcf, 0xfe, 0xa4, 0xa6, 0xea, 0xcc, 0xbe, 0x7d, 0xfb, 0xe9, 0xef, 0x80, 0x91, 0x39, - 0x7b, 0xe7, 0x27, 0xd0, 0x4b, 0x58, 0x13, 0x67, 0x9d, 0x68, 0xd4, 0x79, 0xa0, 0xdd, 0x82, 0xea, - 0xd8, 0x7a, 0x7d, 0x8e, 0xd1, 0x30, 0xb6, 0x5e, 0x27, 0xa9, 0xfb, 0x41, 0x01, 0x23, 0x73, 0xb0, - 0x82, 0x92, 0xde, 0x85, 0xa2, 0x38, 0x38, 0xa2, 0x1d, 0x74, 0xe1, 0xe7, 0x75, 0xa4, 0x37, 0xbf, - 0x55, 0x00, 0x61, 0x12, 0x30, 0x67, 0x4a, 0xf2, 0xa2, 0xbf, 0xd4, 0x8e, 0xbe, 0x24, 0xc7, 0x5e, - 0xc1, 0xfa, 0x5c, 0x34, 0x2b, 0xd8, 0xe2, 0xc7, 0x50, 0x79, 0xdc, 0xc9, 0x83, 0xfb, 0x3f, 0x00, - 0x81, 0x75, 0x4a, 0x7a, 0x1e, 0xa3, 0x2e, 0x8f, 0x41, 0x57, 0x84, 0xa4, 0x2b, 0x04, 0xe6, 0x10, - 0x40, 0xac, 0xbb, 0x02, 0x04, 0x4f, 0xa1, 0x8e, 0xad, 0xb3, 0x65, 0x7d, 0x92, 0x9b, 0x0c, 0x1a, - 0xc9, 0x72, 0x4b, 0x3e, 0x40, 0xde, 0xf2, 0xb9, 0x66, 0xcb, 0xf8, 0xbb, 0x93, 0x25, 0x5d, 0x29, - 0x2e, 0x76, 0xf2, 0x42, 0xa2, 0x92, 0x4e, 0x96, 0x7d, 0x2c, 0x76, 0xc1, 0xc0, 0xd6, 0xd9, 0x43, - 0xe2, 0x90, 0x7c, 0x9f, 0x9b, 0x8b, 0x25, 0xf8, 0x04, 0xae, 0xce, 0xac, 0xb8, 0xec, 0x78, 0xa7, - 0x80, 0xe2, 0xa5, 0x2d, 0x77, 0x40, 0x96, 0x7e, 0xbd, 0xb9, 0x0e, 0x65, 0xe2, 0xf6, 0x7b, 0xd9, - 0xc3, 0x40, 0x89, 0xb8, 0xfd, 0x7d, 0x12, 0x9a, 0x2f, 0x61, 0x7d, 0xce, 0xef, 0xb2, 0x71, 0x45, - 0xc4, 0x5d, 0xdd, 0x95, 0xcd, 0x1c, 0xc0, 0x5a, 0xea, 0x30, 0x3f, 0x98, 0xdb, 0x50, 0x18, 0x4d, - 0xdf, 0x7a, 0x42, 0x09, 0x9d, 0xd9, 0x87, 0xca, 0x73, 0xf1, 0x15, 0x2f, 0x9f, 0x6e, 0xc4, 0x65, - 0x5d, 0x06, 0xca, 0x83, 0xf8, 0x3d, 0xa3, 0x2c, 0xc7, 0xcf, 0x02, 0x74, 0x0b, 0x34, 0x1e, 0x7a, - 0xd1, 0x33, 0xc9, 0xb9, 0xfb, 0x93, 0x54, 0x08, 0x90, 0x71, 0x1b, 0xe6, 0x41, 0xdc, 0x81, 0xf5, - 0x48, 0xf0, 0x2c, 0x30, 0x9f, 0x43, 0xe5, 0x58, 0xec, 0x15, 0xe9, 0x25, 0xdd, 0x45, 0xca, 0xcc, - 0x2e, 0x42, 0x0d, 0x50, 0x79, 0x10, 0xf7, 0x3a, 0x95, 0x07, 0xe8, 0x0e, 0x34, 0x68, 0xd0, 0x0b, - 0x86, 0x4c, 0xb4, 0xff, 0x74, 0xd3, 0xe9, 0xb8, 0x46, 0x83, 0x23, 0x21, 0x94, 0xeb, 0x99, 0xdf, - 0x28, 0xa0, 0x3f, 0x9d, 0xda, 0xb6, 0x5c, 0x78, 0x0b, 0xb4, 0xf4, 0xc5, 0xe9, 0xc2, 0x93, 0x49, - 0xaa, 0xd1, 0x0e, 0x94, 0xe4, 0xc5, 0x25, 0x49, 0x0c, 0x4a, 0x0d, 0xd3, 0x4c, 0xe0, 0xd8, 0x42, - 0xd8, 0x4a, 0xe7, 0xc9, 0x71, 0x97, 0xd9, 0xa6, 0x78, 0x70, 0x6c, 0x61, 0x1e, 0xc1, 0xba, 0x08, - 0xe5, 0x31, 0xe1, 0x0f, 0xc2, 0x7d, 0x12, 0x2e, 0x67, 0xbf, 0x7e, 0xad, 0xc0, 0xc6, 0xfc, 0xaa, - 0xcb, 0xee, 0x9c, 0x5b, 0xa0, 0x51, 0xf7, 0x94, 0xc5, 0x0f, 0x4e, 0x33, 0x17, 0x85, 0x38, 0xad, - 0x58, 0xaa, 0xcd, 0xcf, 0xe0, 0x7a, 0x1a, 0xc7, 0x51, 0x44, 0x8a, 0x3c, 0x08, 0x67, 0x29, 0xa6, - 0xce, 0x51, 0xcc, 0xfc, 0x49, 0x81, 0xe6, 0xa2, 0x8b, 0x65, 0xc3, 0x5d, 0x7c, 0x58, 0x4c, 0x12, - 0xa0, 0xfd, 0x7d, 0x02, 0x3e, 0x05, 0x74, 0xe4, 0x39, 0xe2, 0x4e, 0x27, 0x5c, 0xe4, 0xed, 0x03, - 0x62, 0x85, 0xb9, 0x3e, 0x20, 0x04, 0xa2, 0x85, 0x7d, 0xa7, 0xc0, 0xfa, 0xdc, 0xfa, 0xf9, 0x81, - 0x9b, 0xa0, 0x39, 0xe4, 0x94, 0xc7, 0xa7, 0x7b, 0x63, 0xfe, 0xc9, 0x11, 0x4b, 0x1d, 0xba, 0x03, - 0x45, 0x9f, 0x0e, 0x86, 0x3c, 0x2e, 0xfb, 0x79, 0xa3, 0x48, 0xb9, 0xf3, 0x3f, 0x80, 0xec, 0xf5, - 0x10, 0x01, 0x94, 0x3e, 0x66, 0xfe, 0xd8, 0x72, 0x8c, 0x2b, 0xa8, 0x0c, 0x85, 0x03, 0x76, 0x66, - 0x28, 0x48, 0x07, 0xed, 0x23, 0x3a, 0x18, 0x1a, 0xea, 0x4e, 0x0b, 0x1a, 0xf3, 0x4f, 0x86, 0xa8, - 0x04, 0xea, 0xd1, 0x9e, 0x71, 0x45, 0xfc, 0xe2, 0x8e, 0xa1, 0xec, 0xb4, 0x41, 0x3d, 0xf4, 0xc4, - 0xd4, 0xee, 0x84, 0x47, 0x6b, 0x3c, 0x24, 0x4e, 0xb4, 0x86, 0xd8, 0xa3, 0x86, 0x8a, 0x6a, 0xa0, - 0x27, 0xb7, 0x30, 0xa3, 0xf0, 0x60, 0xe7, 0xd7, 0x37, 0x9b, 0xca, 0x6f, 0x6f, 0x36, 0x95, 0x3f, - 0xde, 0x6c, 0x2a, 0x3f, 0xfe, 0xb9, 0x79, 0x05, 0x9a, 0x36, 0x1b, 0xb7, 0x3d, 0xea, 0x0e, 0x6c, - 0xcb, 0x6b, 0x73, 0x3a, 0x9a, 0xb6, 0x47, 0x53, 0xf9, 0x04, 0x7d, 0x52, 0x92, 0x3f, 0xef, 0xfd, - 0x15, 0x00, 0x00, 0xff, 0xff, 0x11, 0xfd, 0x27, 0x65, 0xd6, 0x16, 0x00, 0x00, + // 1602 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x5f, 0x6f, 0xdb, 0x46, + 0x12, 0x0f, 0x29, 0x4a, 0xa2, 0x46, 0x7f, 0xcc, 0xac, 0x9d, 0x0b, 0x93, 0xdc, 0x39, 0x0a, 0x2f, + 0x46, 0x1c, 0x1f, 0x4e, 0xc1, 0x39, 0xc0, 0x3d, 0x1f, 0xa2, 0xe4, 0x72, 0x8e, 0x9d, 0xb3, 0xb0, + 0x36, 0x1c, 0x04, 0xb8, 0x0b, 0x4b, 0x53, 0x6b, 0x89, 0x10, 0xc5, 0x65, 0xc8, 0x95, 0x6c, 0xa2, + 0x28, 0xfa, 0xd4, 0x02, 0x7d, 0x2d, 0x0a, 0xb4, 0x0f, 0x7d, 0xe9, 0x63, 0x3f, 0x43, 0xbf, 0x40, + 0x1f, 0xfb, 0xde, 0x97, 0x22, 0xfd, 0x22, 0xc5, 0x2e, 0xff, 0x49, 0x96, 0xd3, 0x1a, 0x84, 0xe2, + 0x27, 0xee, 0xce, 0xcc, 0xee, 0xcc, 0x6f, 0x66, 0x76, 0x86, 0xbb, 0xd0, 0x1c, 0x4d, 0x03, 0xdf, + 0xf6, 0x8f, 0x3b, 0x7e, 0x40, 0x19, 0x45, 0xd5, 0x64, 0x7a, 0xbb, 0x31, 0x26, 0xcc, 0x4a, 0xc9, + 0xb7, 0x9b, 0x24, 0x08, 0x68, 0x90, 0x4d, 0xd7, 0x06, 0x74, 0x40, 0xc5, 0xf0, 0x11, 0x1f, 0xc5, + 0x54, 0xe3, 0x13, 0x50, 0xf7, 0xa8, 0x3d, 0xda, 0xf1, 0x4e, 0x28, 0xba, 0x07, 0x0d, 0x3f, 0x70, + 0xc6, 0x56, 0x10, 0x99, 0x2e, 0xb5, 0x47, 0xba, 0xd4, 0x96, 0x36, 0x1b, 0xb8, 0x9e, 0xd0, 0xb8, + 0x18, 0x17, 0xe1, 0x2c, 0x73, 0x4a, 0x82, 0xd0, 0xa1, 0x9e, 0x2e, 0xb7, 0xa5, 0x4d, 0x05, 0xd7, + 0x39, 0xed, 0x28, 0x26, 0x21, 0x0d, 0x4a, 0x23, 0x12, 0xe9, 0x25, 0xb1, 0x98, 0x0f, 0xd1, 0x2d, + 0x50, 0xc5, 0x22, 0xc6, 0x5c, 0x5d, 0x11, 0x0b, 0xaa, 0x7c, 0x7e, 0xc8, 0x5c, 0xc3, 0x01, 0x75, + 0x97, 0x44, 0xcf, 0xb8, 0xa1, 0xe8, 0x21, 0x54, 0x38, 0x99, 0xf4, 0x85, 0xe2, 0xfa, 0xf6, 0xf5, + 0x4e, 0x0a, 0x33, 0xb5, 0x10, 0x27, 0x02, 0xe8, 0xcf, 0x50, 0x0b, 0x08, 0x0b, 0x22, 0xeb, 0xd8, + 0x25, 0xc2, 0x86, 0x1a, 0xce, 0x09, 0x68, 0x0d, 0xca, 0xd6, 0x31, 0x0d, 0x98, 0xb0, 0xa1, 0x86, + 0xe3, 0x89, 0xf1, 0xb3, 0x0c, 0xd5, 0x2e, 0xf5, 0x18, 0x39, 0x63, 0xe8, 0x0e, 0x5f, 0x3f, 0x70, + 0xa8, 0x67, 0x3a, 0xb1, 0x36, 0x05, 0xab, 0x31, 0x61, 0xa7, 0x8f, 0xfe, 0x09, 0x8d, 0x84, 0x49, + 0x7c, 0x6a, 0x0f, 0xc5, 0xfe, 0xf5, 0xed, 0xd5, 0x4e, 0xe2, 0x5c, 0x2c, 0x78, 0xcf, 0x38, 0x0b, + 0xd7, 0x83, 0x7c, 0x82, 0xda, 0xa0, 0xf8, 0x84, 0x04, 0x42, 0x6b, 0x7d, 0xbb, 0x91, 0xca, 0xf7, + 0x08, 0x09, 0xb0, 0xe0, 0x20, 0x04, 0x0a, 0x23, 0xc1, 0x58, 0x2f, 0x0b, 0x8d, 0x62, 0x8c, 0x1e, + 0x81, 0xea, 0x07, 0x0e, 0x0d, 0x1c, 0x16, 0xe9, 0x95, 0xb6, 0xb4, 0xd9, 0xda, 0x5e, 0xcd, 0x70, + 0x77, 0xe9, 0x78, 0x6c, 0x79, 0xfd, 0x5e, 0xe0, 0xe0, 0x4c, 0x08, 0xfd, 0x0b, 0x56, 0x9c, 0x90, + 0xba, 0x16, 0xe3, 0x16, 0xba, 0x64, 0x4a, 0x5c, 0xbd, 0x2a, 0xd6, 0xdd, 0xcc, 0xd6, 0xed, 0xa4, + 0xfc, 0x3d, 0xce, 0xc6, 0x2d, 0x67, 0x6e, 0x8e, 0xee, 0x43, 0xcb, 0xa3, 0xcc, 0x3c, 0x71, 0x5c, + 0xd7, 0xb4, 0x2d, 0x7b, 0x48, 0x74, 0xb5, 0x2d, 0x6d, 0xaa, 0xb8, 0xe1, 0x51, 0xf6, 0x6f, 0xc7, + 0x75, 0xbb, 0x9c, 0xc6, 0xa3, 0x16, 0x46, 0x9e, 0x6d, 0xba, 0x74, 0xa0, 0xd7, 0x04, 0xbf, 0xca, + 0xe7, 0x7b, 0x74, 0xf0, 0x42, 0x51, 0x15, 0xad, 0xcc, 0xc1, 0x5b, 0x7d, 0xf3, 0xed, 0x84, 0x06, + 0x93, 0xb1, 0xd1, 0x07, 0x78, 0x4e, 0x18, 0x26, 0x6f, 0x27, 0x24, 0x64, 0x68, 0x0b, 0xaa, 0x76, + 0xec, 0xea, 0x24, 0x96, 0xda, 0x0c, 0x26, 0x41, 0xc7, 0xa9, 0x40, 0x9a, 0x2f, 0x72, 0x9e, 0x2f, + 0x3a, 0x54, 0xd3, 0xfc, 0x2a, 0xc5, 0xe9, 0x92, 0x4c, 0x8d, 0x4f, 0xa1, 0x2e, 0xb4, 0x84, 0x3e, + 0xf5, 0x42, 0x82, 0xfe, 0x91, 0x47, 0x8a, 0x67, 0x50, 0xa2, 0xab, 0xd5, 0x49, 0x13, 0x5f, 0xe4, + 0x55, 0x16, 0x24, 0x91, 0x64, 0x0f, 0xa0, 0x1c, 0xcb, 0xca, 0xe7, 0x72, 0x2c, 0x4d, 0x43, 0x1c, + 0xf3, 0x79, 0x12, 0x4d, 0x2d, 0x77, 0x42, 0x92, 0x44, 0x8e, 0x27, 0xc6, 0x77, 0x12, 0xd4, 0x0f, + 0x6c, 0xcb, 0x2b, 0x02, 0xf4, 0x0e, 0xd4, 0x42, 0x66, 0x05, 0xcc, 0xcc, 0xe1, 0xaa, 0x82, 0xb0, + 0x4b, 0x22, 0xae, 0xce, 0x75, 0xc6, 0x4e, 0x9c, 0xb3, 0x4d, 0x1c, 0x4f, 0x66, 0x3d, 0xa1, 0xcc, + 0x79, 0x82, 0x47, 0x67, 0x44, 0x22, 0x93, 0x7a, 0x6e, 0x24, 0xd2, 0x49, 0xc5, 0xd5, 0x11, 0x89, + 0xf6, 0x3d, 0x37, 0x32, 0x5e, 0x43, 0x65, 0x77, 0xda, 0xb3, 0x9c, 0x19, 0xb0, 0xd2, 0x1f, 0x80, + 0x5d, 0x8c, 0xc1, 0xc5, 0xf0, 0x87, 0xd0, 0x88, 0xd1, 0x17, 0x0f, 0xc0, 0x06, 0x94, 0x7d, 0xcb, + 0x09, 0x42, 0x5d, 0x6e, 0x97, 0x36, 0xeb, 0xdb, 0x2b, 0xb9, 0x4d, 0xc2, 0x66, 0x1c, 0x73, 0x8d, + 0x7d, 0x50, 0x5f, 0x4e, 0x98, 0x48, 0x5a, 0x74, 0x07, 0x64, 0xea, 0x8b, 0xbd, 0x5b, 0xdb, 0xf5, + 0x4c, 0x7e, 0xdf, 0xc7, 0x32, 0xf5, 0x2f, 0x6d, 0xfa, 0x67, 0x32, 0xac, 0xf4, 0x02, 0x72, 0x1a, + 0x38, 0x8c, 0x14, 0x89, 0xde, 0x23, 0xa8, 0x8d, 0x13, 0x83, 0x52, 0xdb, 0x73, 0x7f, 0xa6, 0xa6, + 0xe2, 0x5c, 0x66, 0xa1, 0x9a, 0x96, 0x16, 0xab, 0xe9, 0x5f, 0xa1, 0x19, 0x67, 0xc4, 0x7c, 0x90, + 0x1b, 0x82, 0x78, 0x94, 0x47, 0x3a, 0xab, 0x9e, 0xe5, 0xb9, 0xea, 0x89, 0xb6, 0xe1, 0x46, 0x38, + 0x72, 0x7c, 0xd3, 0xa6, 0x5e, 0xc8, 0x02, 0xcb, 0xf1, 0x98, 0x69, 0x0f, 0x89, 0x3d, 0x12, 0x85, + 0x44, 0xc5, 0xab, 0x9c, 0xd9, 0xcd, 0x78, 0x5d, 0xce, 0x32, 0x7c, 0xd0, 0x72, 0x37, 0x14, 0x0f, + 0xe3, 0x43, 0xa8, 0x08, 0xee, 0xa2, 0x2f, 0xb2, 0xdc, 0x4a, 0x04, 0x8c, 0xef, 0x25, 0x68, 0xf2, + 0x4a, 0xe6, 0x14, 0x2a, 0x0f, 0x0b, 0x3e, 0x92, 0x2f, 0xf0, 0x11, 0x02, 0x65, 0x44, 0xa2, 0x50, + 0x2f, 0xb5, 0x4b, 0x9b, 0x0d, 0x2c, 0xc6, 0x68, 0x03, 0x5a, 0xb6, 0xd0, 0x7a, 0xce, 0xbb, 0xcd, + 0x98, 0x9a, 0x2c, 0x7d, 0xa1, 0xa8, 0x65, 0xad, 0x82, 0x2b, 0xc7, 0x8e, 0xe7, 0xd2, 0x81, 0xe1, + 0x42, 0x2b, 0x35, 0xf5, 0xc3, 0xd7, 0x18, 0x63, 0x00, 0xcd, 0x9d, 0xb1, 0x4f, 0x83, 0xcc, 0x31, + 0x73, 0x49, 0x26, 0x5d, 0x22, 0xc9, 0x16, 0x41, 0xca, 0x17, 0x80, 0x34, 0x5e, 0x43, 0x2b, 0x55, + 0x54, 0x1c, 0xd6, 0xda, 0x2c, 0xac, 0x5a, 0x8a, 0xe1, 0x63, 0x58, 0x7b, 0x62, 0x31, 0x7b, 0x88, + 0xa9, 0xeb, 0x1e, 0x5b, 0xf6, 0xe8, 0x2a, 0x63, 0x6c, 0x84, 0x70, 0xe3, 0x9c, 0xf2, 0x2b, 0x88, + 0x5a, 0x08, 0xad, 0xae, 0x4b, 0x2c, 0x6f, 0xe2, 0x2f, 0xa7, 0xdd, 0x2d, 0xa0, 0x2f, 0x2d, 0xa2, + 0x37, 0xbe, 0x92, 0x60, 0x25, 0xd3, 0x7a, 0x05, 0xed, 0x6f, 0x31, 0xb1, 0x4a, 0x17, 0x25, 0xd6, + 0x08, 0x56, 0x44, 0x00, 0x0a, 0xf6, 0xfe, 0x34, 0xa6, 0xf2, 0xcc, 0xb9, 0x7d, 0x7f, 0xf7, 0x77, + 0x41, 0xcb, 0x95, 0x7d, 0xf0, 0x0e, 0xf4, 0x06, 0x56, 0x78, 0xaf, 0xe3, 0x85, 0xba, 0x08, 0xb4, + 0xbb, 0x50, 0x1f, 0x5b, 0x67, 0xe7, 0x32, 0x1a, 0xc6, 0xd6, 0x59, 0xea, 0xba, 0xaf, 0x25, 0xd0, + 0x72, 0x05, 0x57, 0x10, 0xd2, 0x07, 0x50, 0xe6, 0x8d, 0x23, 0x3e, 0x41, 0x17, 0xfe, 0x5e, 0xc7, + 0x7c, 0xe3, 0x31, 0x54, 0x0f, 0xcf, 0x3c, 0x71, 0x25, 0xd0, 0xa0, 0xc4, 0xce, 0xbc, 0xe4, 0x17, + 0x99, 0x0f, 0xd1, 0x9f, 0xa0, 0x12, 0x32, 0x8b, 0x4d, 0xc2, 0x04, 0x52, 0x32, 0x33, 0x7e, 0x90, + 0x00, 0x61, 0x12, 0x52, 0x77, 0x4a, 0x8a, 0xba, 0xec, 0x52, 0x65, 0xe0, 0x72, 0x89, 0x89, 0xfe, + 0x0e, 0x35, 0x76, 0xe6, 0x99, 0x8e, 0x77, 0x42, 0x43, 0x5d, 0x11, 0x80, 0x73, 0xcd, 0x09, 0x3a, + 0xac, 0xb2, 0x78, 0x10, 0x1a, 0x6f, 0x61, 0x75, 0xce, 0xf8, 0x2b, 0x28, 0x23, 0x47, 0x50, 0x7b, + 0xde, 0x2d, 0xe2, 0xa6, 0xbf, 0x00, 0x84, 0xd6, 0x09, 0x31, 0x7d, 0xea, 0x78, 0x2c, 0xf1, 0x51, + 0x8d, 0x53, 0x7a, 0x9c, 0x60, 0x0c, 0x01, 0xf8, 0xbe, 0x57, 0x80, 0xe0, 0x25, 0x34, 0xb1, 0x75, + 0xba, 0xac, 0xdf, 0x7e, 0x83, 0x42, 0x2b, 0xdd, 0x6e, 0xc9, 0x4d, 0xea, 0x3d, 0xbf, 0x84, 0xb6, + 0xb0, 0xbf, 0x37, 0x59, 0xd2, 0xb5, 0xe5, 0x62, 0x25, 0xaf, 0x05, 0x2a, 0xa1, 0x64, 0xd9, 0xad, + 0xb7, 0x07, 0x1a, 0xb6, 0x4e, 0x9f, 0x12, 0x97, 0x14, 0xfb, 0xa5, 0x5d, 0x0c, 0xc1, 0xff, 0xe0, + 0xfa, 0xcc, 0x8e, 0xcb, 0xb6, 0x77, 0x0a, 0x28, 0xd9, 0xda, 0xf2, 0x06, 0x64, 0xe9, 0x57, 0xa8, + 0x9b, 0x50, 0x25, 0x5e, 0xdf, 0xcc, 0x1f, 0x1f, 0x2a, 0xc4, 0xeb, 0xef, 0x92, 0xc8, 0x78, 0x03, + 0xab, 0x73, 0x7a, 0x97, 0x8d, 0x2b, 0x4e, 0xdc, 0xab, 0xbb, 0x16, 0x1a, 0x03, 0x58, 0xc9, 0x14, + 0x16, 0x07, 0x73, 0x0f, 0x4a, 0xa3, 0xe9, 0x7b, 0xbb, 0x20, 0xe7, 0x19, 0x7d, 0xa8, 0xbd, 0xe2, + 0x37, 0x05, 0xd1, 0x0b, 0x6e, 0x41, 0x6c, 0x97, 0xc9, 0xc2, 0xa4, 0x21, 0x54, 0xc5, 0xfc, 0x30, + 0x44, 0x77, 0x41, 0x61, 0x91, 0x1f, 0x3f, 0xc5, 0x9c, 0xbb, 0xa3, 0x09, 0x06, 0x07, 0x99, 0x54, + 0x6d, 0x16, 0x26, 0x05, 0x5b, 0x8d, 0x09, 0x87, 0xa1, 0xf1, 0x0a, 0x6a, 0x47, 0xfc, 0xac, 0x08, + 0x2d, 0xd9, 0x29, 0x92, 0x66, 0x4e, 0x11, 0x6a, 0x81, 0xcc, 0xd2, 0x8e, 0x23, 0xb3, 0x10, 0xdd, + 0x87, 0x96, 0x13, 0x9a, 0xe1, 0x90, 0xf2, 0x6e, 0x91, 0x1d, 0x3a, 0x15, 0x37, 0x9c, 0xf0, 0x80, + 0x13, 0xc5, 0x7e, 0xc6, 0x17, 0x12, 0xa8, 0x2f, 0xa7, 0xb6, 0x2d, 0x36, 0xde, 0x00, 0x25, 0x7b, + 0xd5, 0xba, 0xb0, 0xfb, 0x09, 0x36, 0xda, 0x82, 0x8a, 0xb8, 0x1c, 0xa5, 0x8e, 0x41, 0x99, 0x60, + 0xe6, 0x09, 0x9c, 0x48, 0x70, 0x59, 0xa1, 0x3c, 0x6d, 0xa9, 0xb9, 0x6c, 0x86, 0x07, 0x27, 0x12, + 0xc6, 0x01, 0xac, 0x72, 0x53, 0x9e, 0x13, 0xf6, 0x24, 0xda, 0x25, 0xd1, 0x72, 0xce, 0xeb, 0xe7, + 0x12, 0xac, 0xcd, 0xef, 0xba, 0xec, 0xca, 0xb9, 0x01, 0x0a, 0xef, 0xa1, 0xc9, 0xa3, 0xd6, 0xcc, + 0x65, 0x24, 0x71, 0x2b, 0x16, 0x6c, 0xe3, 0x23, 0xb8, 0x99, 0xd9, 0x71, 0x10, 0x27, 0x45, 0x11, + 0x84, 0xb3, 0x29, 0x26, 0xcf, 0xa5, 0x98, 0xf1, 0xad, 0x04, 0xfa, 0xa2, 0x8a, 0x65, 0xc3, 0x5d, + 0x7c, 0xbc, 0x4c, 0x1d, 0xa0, 0xfc, 0xbe, 0x03, 0xfe, 0x0f, 0xe8, 0xc0, 0x77, 0xf9, 0xbd, 0x91, + 0xab, 0x28, 0x5a, 0x07, 0xf8, 0x0e, 0x73, 0x75, 0x80, 0x13, 0x78, 0x09, 0xfb, 0x52, 0x82, 0xd5, + 0xb9, 0xfd, 0x8b, 0x03, 0x37, 0x40, 0x71, 0xc9, 0x09, 0x4b, 0xba, 0x7b, 0x6b, 0xfe, 0x59, 0x13, + 0x0b, 0x1e, 0xba, 0x0f, 0xe5, 0xc0, 0x19, 0x0c, 0x59, 0x12, 0xf6, 0xf3, 0x42, 0x31, 0x73, 0xeb, + 0x6f, 0x00, 0xf9, 0x0b, 0x25, 0x02, 0xa8, 0xfc, 0x97, 0x06, 0x63, 0xcb, 0xd5, 0xae, 0xa1, 0x2a, + 0x94, 0xf6, 0xe8, 0xa9, 0x26, 0x21, 0x15, 0x94, 0xff, 0x38, 0x83, 0xa1, 0x26, 0x6f, 0xb5, 0xa1, + 0x35, 0xff, 0x2c, 0x89, 0x2a, 0x20, 0x1f, 0xec, 0x68, 0xd7, 0xf8, 0x17, 0x77, 0x35, 0x69, 0xab, + 0x03, 0xf2, 0xbe, 0xcf, 0x97, 0xf6, 0x26, 0x2c, 0xde, 0xe3, 0x29, 0x71, 0xe3, 0x3d, 0xf8, 0x19, + 0xd5, 0x64, 0xd4, 0x00, 0x35, 0xbd, 0xe9, 0x69, 0xa5, 0x27, 0x5b, 0x3f, 0xbe, 0x5b, 0x97, 0x7e, + 0x7a, 0xb7, 0x2e, 0xfd, 0xf2, 0x6e, 0x5d, 0xfa, 0xe6, 0xd7, 0xf5, 0x6b, 0xa0, 0xdb, 0x74, 0xdc, + 0xf1, 0x1d, 0x6f, 0x60, 0x5b, 0x7e, 0x87, 0x39, 0xa3, 0x69, 0x67, 0x34, 0x15, 0xcf, 0xdc, 0xc7, + 0x15, 0xf1, 0x79, 0xfc, 0x5b, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa3, 0x3a, 0x25, 0x2d, 0x3a, 0x17, + 0x00, 0x00, } diff --git a/_vendor/src/github.com/pingcap/kvproto/pkg/metapb/metapb.pb.go b/_vendor/src/github.com/pingcap/kvproto/pkg/metapb/metapb.pb.go index 782798e0e30e9..3da13857558b5 100644 --- a/_vendor/src/github.com/pingcap/kvproto/pkg/metapb/metapb.pb.go +++ b/_vendor/src/github.com/pingcap/kvproto/pkg/metapb/metapb.pb.go @@ -56,30 +56,16 @@ var StoreState_value = map[string]int32{ "Tombstone": 2, } -func (x StoreState) Enum() *StoreState { - p := new(StoreState) - *p = x - return p -} func (x StoreState) String() string { return proto.EnumName(StoreState_name, int32(x)) } -func (x *StoreState) UnmarshalJSON(data []byte) error { - value, err := proto.UnmarshalJSONEnum(StoreState_value, data, "StoreState") - if err != nil { - return err - } - *x = StoreState(value) - return nil -} func (StoreState) EnumDescriptor() ([]byte, []int) { return fileDescriptorMetapb, []int{0} } type Cluster struct { - Id uint64 `protobuf:"varint,1,opt,name=id" json:"id"` + Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` // max peer count for a region. // pd will do the auto-balance if region peer count mismatches. - MaxPeerCount uint32 `protobuf:"varint,2,opt,name=max_peer_count,json=maxPeerCount" json:"max_peer_count"` - XXX_unrecognized []byte `json:"-"` + MaxPeerCount uint32 `protobuf:"varint,2,opt,name=max_peer_count,json=maxPeerCount,proto3" json:"max_peer_count,omitempty"` } func (m *Cluster) Reset() { *m = Cluster{} } @@ -103,9 +89,8 @@ func (m *Cluster) GetMaxPeerCount() uint32 { // Case insensitive key/value for replica constraints. type StoreLabel struct { - Key string `protobuf:"bytes,1,opt,name=key" json:"key"` - Value string `protobuf:"bytes,2,opt,name=value" json:"value"` - XXX_unrecognized []byte `json:"-"` + Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` + Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` } func (m *StoreLabel) Reset() { *m = StoreLabel{} } @@ -128,11 +113,10 @@ func (m *StoreLabel) GetValue() string { } type Store struct { - Id uint64 `protobuf:"varint,1,opt,name=id" json:"id"` - Address string `protobuf:"bytes,2,opt,name=address" json:"address"` - State StoreState `protobuf:"varint,3,opt,name=state,enum=metapb.StoreState" json:"state"` - Labels []*StoreLabel `protobuf:"bytes,4,rep,name=labels" json:"labels,omitempty"` - XXX_unrecognized []byte `json:"-"` + Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"` + State StoreState `protobuf:"varint,3,opt,name=state,proto3,enum=metapb.StoreState" json:"state,omitempty"` + Labels []*StoreLabel `protobuf:"bytes,4,rep,name=labels" json:"labels,omitempty"` } func (m *Store) Reset() { *m = Store{} } @@ -170,10 +154,9 @@ func (m *Store) GetLabels() []*StoreLabel { type RegionEpoch struct { // Conf change version, auto increment when add or remove peer - ConfVer uint64 `protobuf:"varint,1,opt,name=conf_ver,json=confVer" json:"conf_ver"` + ConfVer uint64 `protobuf:"varint,1,opt,name=conf_ver,json=confVer,proto3" json:"conf_ver,omitempty"` // Region version, auto increment when split or merge - Version uint64 `protobuf:"varint,2,opt,name=version" json:"version"` - XXX_unrecognized []byte `json:"-"` + Version uint64 `protobuf:"varint,2,opt,name=version,proto3" json:"version,omitempty"` } func (m *RegionEpoch) Reset() { *m = RegionEpoch{} } @@ -196,13 +179,12 @@ func (m *RegionEpoch) GetVersion() uint64 { } type Region struct { - Id uint64 `protobuf:"varint,1,opt,name=id" json:"id"` + Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` // Region key range [start_key, end_key). - StartKey []byte `protobuf:"bytes,2,opt,name=start_key,json=startKey" json:"start_key,omitempty"` - EndKey []byte `protobuf:"bytes,3,opt,name=end_key,json=endKey" json:"end_key,omitempty"` - RegionEpoch *RegionEpoch `protobuf:"bytes,4,opt,name=region_epoch,json=regionEpoch" json:"region_epoch,omitempty"` - Peers []*Peer `protobuf:"bytes,5,rep,name=peers" json:"peers,omitempty"` - XXX_unrecognized []byte `json:"-"` + StartKey []byte `protobuf:"bytes,2,opt,name=start_key,json=startKey,proto3" json:"start_key,omitempty"` + EndKey []byte `protobuf:"bytes,3,opt,name=end_key,json=endKey,proto3" json:"end_key,omitempty"` + RegionEpoch *RegionEpoch `protobuf:"bytes,4,opt,name=region_epoch,json=regionEpoch" json:"region_epoch,omitempty"` + Peers []*Peer `protobuf:"bytes,5,rep,name=peers" json:"peers,omitempty"` } func (m *Region) Reset() { *m = Region{} } @@ -246,9 +228,8 @@ func (m *Region) GetPeers() []*Peer { } type Peer struct { - Id uint64 `protobuf:"varint,1,opt,name=id" json:"id"` - StoreId uint64 `protobuf:"varint,2,opt,name=store_id,json=storeId" json:"store_id"` - XXX_unrecognized []byte `json:"-"` + Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + StoreId uint64 `protobuf:"varint,2,opt,name=store_id,json=storeId,proto3" json:"store_id,omitempty"` } func (m *Peer) Reset() { *m = Peer{} } @@ -294,14 +275,15 @@ func (m *Cluster) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - dAtA[i] = 0x8 - i++ - i = encodeVarintMetapb(dAtA, i, uint64(m.Id)) - dAtA[i] = 0x10 - i++ - i = encodeVarintMetapb(dAtA, i, uint64(m.MaxPeerCount)) - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Id != 0 { + dAtA[i] = 0x8 + i++ + i = encodeVarintMetapb(dAtA, i, uint64(m.Id)) + } + if m.MaxPeerCount != 0 { + dAtA[i] = 0x10 + i++ + i = encodeVarintMetapb(dAtA, i, uint64(m.MaxPeerCount)) } return i, nil } @@ -321,16 +303,17 @@ func (m *StoreLabel) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintMetapb(dAtA, i, uint64(len(m.Key))) - i += copy(dAtA[i:], m.Key) - dAtA[i] = 0x12 - i++ - i = encodeVarintMetapb(dAtA, i, uint64(len(m.Value))) - i += copy(dAtA[i:], m.Value) - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.Key) > 0 { + dAtA[i] = 0xa + i++ + i = encodeVarintMetapb(dAtA, i, uint64(len(m.Key))) + i += copy(dAtA[i:], m.Key) + } + if len(m.Value) > 0 { + dAtA[i] = 0x12 + i++ + i = encodeVarintMetapb(dAtA, i, uint64(len(m.Value))) + i += copy(dAtA[i:], m.Value) } return i, nil } @@ -350,16 +333,22 @@ func (m *Store) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - dAtA[i] = 0x8 - i++ - i = encodeVarintMetapb(dAtA, i, uint64(m.Id)) - dAtA[i] = 0x12 - i++ - i = encodeVarintMetapb(dAtA, i, uint64(len(m.Address))) - i += copy(dAtA[i:], m.Address) - dAtA[i] = 0x18 - i++ - i = encodeVarintMetapb(dAtA, i, uint64(m.State)) + if m.Id != 0 { + dAtA[i] = 0x8 + i++ + i = encodeVarintMetapb(dAtA, i, uint64(m.Id)) + } + if len(m.Address) > 0 { + dAtA[i] = 0x12 + i++ + i = encodeVarintMetapb(dAtA, i, uint64(len(m.Address))) + i += copy(dAtA[i:], m.Address) + } + if m.State != 0 { + dAtA[i] = 0x18 + i++ + i = encodeVarintMetapb(dAtA, i, uint64(m.State)) + } if len(m.Labels) > 0 { for _, msg := range m.Labels { dAtA[i] = 0x22 @@ -372,9 +361,6 @@ func (m *Store) MarshalTo(dAtA []byte) (int, error) { i += n } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } return i, nil } @@ -393,14 +379,15 @@ func (m *RegionEpoch) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - dAtA[i] = 0x8 - i++ - i = encodeVarintMetapb(dAtA, i, uint64(m.ConfVer)) - dAtA[i] = 0x10 - i++ - i = encodeVarintMetapb(dAtA, i, uint64(m.Version)) - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.ConfVer != 0 { + dAtA[i] = 0x8 + i++ + i = encodeVarintMetapb(dAtA, i, uint64(m.ConfVer)) + } + if m.Version != 0 { + dAtA[i] = 0x10 + i++ + i = encodeVarintMetapb(dAtA, i, uint64(m.Version)) } return i, nil } @@ -420,16 +407,18 @@ func (m *Region) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - dAtA[i] = 0x8 - i++ - i = encodeVarintMetapb(dAtA, i, uint64(m.Id)) - if m.StartKey != nil { + if m.Id != 0 { + dAtA[i] = 0x8 + i++ + i = encodeVarintMetapb(dAtA, i, uint64(m.Id)) + } + if len(m.StartKey) > 0 { dAtA[i] = 0x12 i++ i = encodeVarintMetapb(dAtA, i, uint64(len(m.StartKey))) i += copy(dAtA[i:], m.StartKey) } - if m.EndKey != nil { + if len(m.EndKey) > 0 { dAtA[i] = 0x1a i++ i = encodeVarintMetapb(dAtA, i, uint64(len(m.EndKey))) @@ -457,9 +446,6 @@ func (m *Region) MarshalTo(dAtA []byte) (int, error) { i += n } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } return i, nil } @@ -478,14 +464,15 @@ func (m *Peer) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - dAtA[i] = 0x8 - i++ - i = encodeVarintMetapb(dAtA, i, uint64(m.Id)) - dAtA[i] = 0x10 - i++ - i = encodeVarintMetapb(dAtA, i, uint64(m.StoreId)) - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Id != 0 { + dAtA[i] = 0x8 + i++ + i = encodeVarintMetapb(dAtA, i, uint64(m.Id)) + } + if m.StoreId != 0 { + dAtA[i] = 0x10 + i++ + i = encodeVarintMetapb(dAtA, i, uint64(m.StoreId)) } return i, nil } @@ -520,10 +507,11 @@ func encodeVarintMetapb(dAtA []byte, offset int, v uint64) int { func (m *Cluster) Size() (n int) { var l int _ = l - n += 1 + sovMetapb(uint64(m.Id)) - n += 1 + sovMetapb(uint64(m.MaxPeerCount)) - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) + if m.Id != 0 { + n += 1 + sovMetapb(uint64(m.Id)) + } + if m.MaxPeerCount != 0 { + n += 1 + sovMetapb(uint64(m.MaxPeerCount)) } return n } @@ -532,11 +520,12 @@ func (m *StoreLabel) Size() (n int) { var l int _ = l l = len(m.Key) - n += 1 + l + sovMetapb(uint64(l)) + if l > 0 { + n += 1 + l + sovMetapb(uint64(l)) + } l = len(m.Value) - n += 1 + l + sovMetapb(uint64(l)) - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) + if l > 0 { + n += 1 + l + sovMetapb(uint64(l)) } return n } @@ -544,29 +533,33 @@ func (m *StoreLabel) Size() (n int) { func (m *Store) Size() (n int) { var l int _ = l - n += 1 + sovMetapb(uint64(m.Id)) + if m.Id != 0 { + n += 1 + sovMetapb(uint64(m.Id)) + } l = len(m.Address) - n += 1 + l + sovMetapb(uint64(l)) - n += 1 + sovMetapb(uint64(m.State)) + if l > 0 { + n += 1 + l + sovMetapb(uint64(l)) + } + if m.State != 0 { + n += 1 + sovMetapb(uint64(m.State)) + } if len(m.Labels) > 0 { for _, e := range m.Labels { l = e.Size() n += 1 + l + sovMetapb(uint64(l)) } } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } func (m *RegionEpoch) Size() (n int) { var l int _ = l - n += 1 + sovMetapb(uint64(m.ConfVer)) - n += 1 + sovMetapb(uint64(m.Version)) - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) + if m.ConfVer != 0 { + n += 1 + sovMetapb(uint64(m.ConfVer)) + } + if m.Version != 0 { + n += 1 + sovMetapb(uint64(m.Version)) } return n } @@ -574,13 +567,15 @@ func (m *RegionEpoch) Size() (n int) { func (m *Region) Size() (n int) { var l int _ = l - n += 1 + sovMetapb(uint64(m.Id)) - if m.StartKey != nil { - l = len(m.StartKey) + if m.Id != 0 { + n += 1 + sovMetapb(uint64(m.Id)) + } + l = len(m.StartKey) + if l > 0 { n += 1 + l + sovMetapb(uint64(l)) } - if m.EndKey != nil { - l = len(m.EndKey) + l = len(m.EndKey) + if l > 0 { n += 1 + l + sovMetapb(uint64(l)) } if m.RegionEpoch != nil { @@ -593,19 +588,17 @@ func (m *Region) Size() (n int) { n += 1 + l + sovMetapb(uint64(l)) } } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } func (m *Peer) Size() (n int) { var l int _ = l - n += 1 + sovMetapb(uint64(m.Id)) - n += 1 + sovMetapb(uint64(m.StoreId)) - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) + if m.Id != 0 { + n += 1 + sovMetapb(uint64(m.Id)) + } + if m.StoreId != 0 { + n += 1 + sovMetapb(uint64(m.StoreId)) } return n } @@ -702,7 +695,6 @@ func (m *Cluster) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -811,7 +803,6 @@ func (m *StoreLabel) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -960,7 +951,6 @@ func (m *Store) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1049,7 +1039,6 @@ func (m *RegionEpoch) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1245,7 +1234,6 @@ func (m *Region) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1334,7 +1322,6 @@ func (m *Peer) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1452,34 +1439,34 @@ var ( func init() { proto.RegisterFile("metapb.proto", fileDescriptorMetapb) } var fileDescriptorMetapb = []byte{ - // 463 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0xcd, 0x6e, 0xd3, 0x40, - 0x10, 0xce, 0xe6, 0xc7, 0x4e, 0xc6, 0x6e, 0x15, 0x2d, 0x15, 0x58, 0x45, 0x72, 0x2c, 0x9f, 0xac, - 0x1c, 0x0c, 0xea, 0x81, 0x1b, 0x12, 0x6a, 0xc5, 0x01, 0x15, 0x01, 0x72, 0x81, 0xab, 0xe5, 0xd8, - 0x93, 0x60, 0xc5, 0xf6, 0x5a, 0xbb, 0x1b, 0xab, 0x7d, 0x13, 0x78, 0x0b, 0x1e, 0xa3, 0x47, 0x9e, - 0x00, 0xa1, 0xf0, 0x22, 0x68, 0xd7, 0x36, 0x6a, 0x2a, 0xe5, 0xe6, 0xfd, 0xbe, 0x99, 0xcf, 0xdf, - 0x37, 0x33, 0x60, 0x97, 0x28, 0x93, 0x7a, 0x15, 0xd6, 0x9c, 0x49, 0x46, 0x8d, 0xf6, 0x75, 0x7e, - 0xb6, 0x61, 0x1b, 0xa6, 0xa1, 0x17, 0xea, 0xab, 0x65, 0xfd, 0x6b, 0x30, 0xaf, 0x8a, 0x9d, 0x90, - 0xc8, 0xe9, 0x19, 0x0c, 0xf3, 0xcc, 0x21, 0x1e, 0x09, 0xc6, 0x97, 0xe3, 0xfb, 0xdf, 0x8b, 0x41, - 0x34, 0xcc, 0x33, 0xba, 0x84, 0xd3, 0x32, 0xb9, 0x8d, 0x6b, 0x44, 0x1e, 0xa7, 0x6c, 0x57, 0x49, - 0x67, 0xe8, 0x91, 0xe0, 0xa4, 0xab, 0xb0, 0xcb, 0xe4, 0xf6, 0x13, 0x22, 0xbf, 0x52, 0x8c, 0xff, - 0x06, 0xe0, 0x46, 0x32, 0x8e, 0xef, 0x93, 0x15, 0x16, 0xf4, 0x29, 0x8c, 0xb6, 0x78, 0xa7, 0x05, - 0x67, 0x5d, 0xb9, 0x02, 0xe8, 0x39, 0x4c, 0x9a, 0xa4, 0xd8, 0xa1, 0x16, 0xea, 0x99, 0x16, 0xf2, - 0x7f, 0x10, 0x98, 0x68, 0x89, 0x23, 0x6e, 0x5c, 0x30, 0x93, 0x2c, 0xe3, 0x28, 0xc4, 0x41, 0x77, - 0x0f, 0xd2, 0x10, 0x26, 0x42, 0x26, 0x12, 0x9d, 0x91, 0x47, 0x82, 0xd3, 0x0b, 0x1a, 0x76, 0xa3, - 0xd0, 0x9a, 0x37, 0x8a, 0xe9, 0xff, 0xa7, 0xcb, 0xe8, 0x12, 0x8c, 0x42, 0x99, 0x15, 0xce, 0xd8, - 0x1b, 0x05, 0xd6, 0xa3, 0x06, 0x9d, 0x23, 0xea, 0x2a, 0xfc, 0x0f, 0x60, 0x45, 0xb8, 0xc9, 0x59, - 0xf5, 0xb6, 0x66, 0xe9, 0x37, 0xba, 0x80, 0x69, 0xca, 0xaa, 0x75, 0xdc, 0x20, 0x3f, 0xb0, 0x69, - 0x2a, 0xf4, 0x2b, 0x72, 0xe5, 0xb5, 0x41, 0x2e, 0x72, 0x56, 0x69, 0xaf, 0xff, 0xf9, 0x0e, 0xf4, - 0x7f, 0x12, 0x30, 0x5a, 0xc1, 0x23, 0x61, 0x9f, 0xc3, 0x4c, 0xc8, 0x84, 0xcb, 0x58, 0x8d, 0x51, - 0x49, 0xd8, 0xd1, 0x54, 0x03, 0xd7, 0x78, 0x47, 0x9f, 0x81, 0x89, 0x55, 0xa6, 0xa9, 0x91, 0xa6, - 0x0c, 0xac, 0x32, 0x45, 0xbc, 0x02, 0x9b, 0x6b, 0xd5, 0x18, 0x95, 0x4f, 0x67, 0xec, 0x91, 0xc0, - 0xba, 0x78, 0xd2, 0x07, 0x7b, 0x10, 0x21, 0xb2, 0xf8, 0x83, 0x3c, 0x3e, 0x4c, 0xd4, 0x92, 0x85, - 0x33, 0xd1, 0x93, 0xb0, 0xfb, 0x06, 0xb5, 0xde, 0xa8, 0xa5, 0xfc, 0xd7, 0x30, 0x56, 0xcf, 0x23, - 0x7e, 0x17, 0x30, 0x15, 0x6a, 0x6c, 0x71, 0x9e, 0x1d, 0x26, 0xd6, 0xe8, 0xbb, 0x6c, 0xf9, 0xb2, - 0xbb, 0x0f, 0xbd, 0x08, 0x6a, 0xc0, 0xf0, 0x4b, 0x3d, 0x1f, 0x50, 0x0b, 0xcc, 0x8f, 0xeb, 0x75, - 0x91, 0x57, 0x38, 0x27, 0xf4, 0x04, 0x66, 0x9f, 0x59, 0xb9, 0x12, 0x92, 0x55, 0x38, 0x1f, 0x5e, - 0x2e, 0xef, 0xf7, 0x2e, 0xf9, 0xb5, 0x77, 0xc9, 0x9f, 0xbd, 0x4b, 0xbe, 0xff, 0x75, 0x07, 0xe0, - 0xa4, 0xac, 0x0c, 0xeb, 0xbc, 0xda, 0xa4, 0x49, 0x1d, 0xca, 0x7c, 0xdb, 0x84, 0xdb, 0x46, 0x9f, - 0xf2, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5f, 0x7f, 0x55, 0x83, 0xf7, 0x02, 0x00, 0x00, + // 456 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x52, 0x4d, 0x8e, 0xd3, 0x4c, + 0x10, 0x9d, 0x4e, 0xfc, 0x93, 0x94, 0x3d, 0x51, 0xd4, 0xdf, 0x48, 0x9f, 0x07, 0xa4, 0xc8, 0xb2, + 0x58, 0x58, 0x59, 0x18, 0x18, 0x10, 0x5b, 0xa4, 0x19, 0xb1, 0x40, 0x20, 0x81, 0x7a, 0x80, 0xad, + 0xe5, 0xd8, 0x95, 0x60, 0xc5, 0x76, 0x5b, 0xdd, 0x1d, 0x6b, 0xe6, 0x04, 0x5c, 0x81, 0x33, 0x70, + 0x12, 0x96, 0x1c, 0x01, 0x85, 0x8b, 0xa0, 0x6e, 0xdb, 0xd2, 0x88, 0xac, 0xd2, 0xaf, 0x5e, 0xbd, + 0xca, 0x7b, 0x55, 0x06, 0xbf, 0x46, 0x95, 0xb5, 0x9b, 0xa4, 0x15, 0x5c, 0x71, 0xea, 0xf4, 0xe8, + 0xd1, 0xc5, 0x8e, 0xef, 0xb8, 0x29, 0x3d, 0xd5, 0xaf, 0x9e, 0x8d, 0x5e, 0x83, 0x7b, 0x53, 0x1d, + 0xa4, 0x42, 0x41, 0x17, 0x30, 0x29, 0x8b, 0x80, 0x84, 0x24, 0xb6, 0xd8, 0xa4, 0x2c, 0xe8, 0x13, + 0x58, 0xd4, 0xd9, 0x5d, 0xda, 0x22, 0x8a, 0x34, 0xe7, 0x87, 0x46, 0x05, 0x93, 0x90, 0xc4, 0xe7, + 0xcc, 0xaf, 0xb3, 0xbb, 0x8f, 0x88, 0xe2, 0x46, 0xd7, 0xa2, 0x97, 0x00, 0xb7, 0x8a, 0x0b, 0x7c, + 0x9f, 0x6d, 0xb0, 0xa2, 0x4b, 0x98, 0xee, 0xf1, 0xde, 0x0c, 0x99, 0x33, 0xfd, 0xa4, 0x17, 0x60, + 0x77, 0x59, 0x75, 0x40, 0x23, 0x9e, 0xb3, 0x1e, 0x44, 0xdf, 0x08, 0xd8, 0x46, 0x76, 0xf2, 0xaf, + 0x01, 0xb8, 0x59, 0x51, 0x08, 0x94, 0x72, 0x50, 0x8c, 0x90, 0xc6, 0x60, 0x4b, 0x95, 0x29, 0x0c, + 0xa6, 0x21, 0x89, 0x17, 0x57, 0x34, 0x19, 0x62, 0x9a, 0x39, 0xb7, 0x9a, 0x61, 0x7d, 0x03, 0x5d, + 0x83, 0x53, 0x69, 0x3b, 0x32, 0xb0, 0xc2, 0x69, 0xec, 0xfd, 0xd3, 0x6a, 0x9c, 0xb2, 0xa1, 0x23, + 0xba, 0x06, 0x8f, 0xe1, 0xae, 0xe4, 0xcd, 0x9b, 0x96, 0xe7, 0x5f, 0xe9, 0x25, 0xcc, 0x72, 0xde, + 0x6c, 0xd3, 0x0e, 0xc5, 0x60, 0xca, 0xd5, 0xf8, 0x0b, 0x0a, 0xed, 0xac, 0x43, 0x21, 0x4b, 0xde, + 0x18, 0x67, 0x16, 0x1b, 0x61, 0xf4, 0x83, 0x80, 0xd3, 0x0f, 0x39, 0x89, 0xf3, 0x18, 0xe6, 0x52, + 0x65, 0x42, 0xa5, 0x7a, 0x2d, 0x5a, 0xe6, 0xb3, 0x99, 0x29, 0xbc, 0xc3, 0x7b, 0xfa, 0x3f, 0xb8, + 0xd8, 0x14, 0x86, 0x9a, 0x1a, 0xca, 0xc1, 0xa6, 0xd0, 0xc4, 0x2b, 0xf0, 0x85, 0x99, 0x97, 0xa2, + 0x76, 0x15, 0x58, 0x21, 0x89, 0xbd, 0xab, 0xff, 0xc6, 0x18, 0x0f, 0x0c, 0x33, 0x4f, 0x3c, 0x70, + 0x1f, 0x81, 0xad, 0xcf, 0x25, 0x03, 0xdb, 0xe4, 0xf6, 0x47, 0x81, 0x3e, 0x17, 0xeb, 0xa9, 0xe8, + 0x39, 0x58, 0x1a, 0x9e, 0x38, 0xbd, 0x84, 0x99, 0xd4, 0xeb, 0x49, 0xcb, 0x62, 0xcc, 0x67, 0xf0, + 0xdb, 0x62, 0xfd, 0x6c, 0xb8, 0xb1, 0x59, 0x32, 0x75, 0x60, 0xf2, 0xb9, 0x5d, 0x9e, 0x51, 0x0f, + 0xdc, 0x0f, 0xdb, 0x6d, 0x55, 0x36, 0xb8, 0x24, 0xf4, 0x1c, 0xe6, 0x9f, 0x78, 0xbd, 0x91, 0x8a, + 0x37, 0xb8, 0x9c, 0x5c, 0xaf, 0x7f, 0x1e, 0x57, 0xe4, 0xd7, 0x71, 0x45, 0x7e, 0x1f, 0x57, 0xe4, + 0xfb, 0x9f, 0xd5, 0x19, 0x04, 0x39, 0xaf, 0x93, 0xb6, 0x6c, 0x76, 0x79, 0xd6, 0x26, 0xaa, 0xdc, + 0x77, 0xc9, 0xbe, 0x33, 0x9f, 0xe0, 0xc6, 0x31, 0x3f, 0x2f, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, + 0x50, 0x3f, 0x60, 0xb0, 0xb7, 0x02, 0x00, 0x00, } diff --git a/_vendor/src/github.com/pingcap/kvproto/pkg/pdpb/pdpb.pb.go b/_vendor/src/github.com/pingcap/kvproto/pkg/pdpb/pdpb.pb.go index 2039c377514ce..b64335a8380e5 100644 --- a/_vendor/src/github.com/pingcap/kvproto/pkg/pdpb/pdpb.pb.go +++ b/_vendor/src/github.com/pingcap/kvproto/pkg/pdpb/pdpb.pb.go @@ -59,6 +59,8 @@ import ( metapb "github.com/pingcap/kvproto/pkg/metapb" + eraftpb "github.com/pingcap/kvproto/pkg/eraftpb" + context "golang.org/x/net/context" grpc "google.golang.org/grpc" @@ -105,30 +107,6 @@ func (x ErrorType) String() string { } func (ErrorType) EnumDescriptor() ([]byte, []int) { return fileDescriptorPdpb, []int{0} } -// A clone of eraftpb.ConfChangeType, it exists because proto2 enums cannot be -// used directly in proto3 syntax. -// See more: https://developers.google.com/protocol-buffers/docs/proto3#using-proto2-message-types -type ConfChangeType int32 - -const ( - ConfChangeType_AddNode ConfChangeType = 0 - ConfChangeType_RemoveNode ConfChangeType = 1 -) - -var ConfChangeType_name = map[int32]string{ - 0: "AddNode", - 1: "RemoveNode", -} -var ConfChangeType_value = map[string]int32{ - "AddNode": 0, - "RemoveNode": 1, -} - -func (x ConfChangeType) String() string { - return proto.EnumName(ConfChangeType_name, int32(x)) -} -func (ConfChangeType) EnumDescriptor() ([]byte, []int) { return fileDescriptorPdpb, []int{1} } - type RequestHeader struct { // cluster_id is the ID of the cluster which be sent to. ClusterId uint64 `protobuf:"varint,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` @@ -861,9 +839,8 @@ func (m *RegionHeartbeatRequest) GetApproximateSize() uint64 { } type ChangePeer struct { - Peer *metapb.Peer `protobuf:"bytes,1,opt,name=peer" json:"peer,omitempty"` - // FIXME: replace with actual ConfChangeType once eraftpb uses proto3. - ChangeType ConfChangeType `protobuf:"varint,2,opt,name=change_type,json=changeType,proto3,enum=pdpb.ConfChangeType" json:"change_type,omitempty"` + Peer *metapb.Peer `protobuf:"bytes,1,opt,name=peer" json:"peer,omitempty"` + ChangeType eraftpb.ConfChangeType `protobuf:"varint,2,opt,name=change_type,json=changeType,proto3,enum=eraftpb.ConfChangeType" json:"change_type,omitempty"` } func (m *ChangePeer) Reset() { *m = ChangePeer{} } @@ -878,11 +855,11 @@ func (m *ChangePeer) GetPeer() *metapb.Peer { return nil } -func (m *ChangePeer) GetChangeType() ConfChangeType { +func (m *ChangePeer) GetChangeType() eraftpb.ConfChangeType { if m != nil { return m.ChangeType } - return ConfChangeType_AddNode + return eraftpb.ConfChangeType_AddNode } type TransferLeader struct { @@ -1295,7 +1272,6 @@ func init() { proto.RegisterType((*StoreHeartbeatRequest)(nil), "pdpb.StoreHeartbeatRequest") proto.RegisterType((*StoreHeartbeatResponse)(nil), "pdpb.StoreHeartbeatResponse") proto.RegisterEnum("pdpb.ErrorType", ErrorType_name, ErrorType_value) - proto.RegisterEnum("pdpb.ConfChangeType", ConfChangeType_name, ConfChangeType_value) } // Reference imports to suppress errors if they are not otherwise used. @@ -7282,7 +7258,7 @@ func (m *ChangePeer) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.ChangeType |= (ConfChangeType(b) & 0x7F) << shift + m.ChangeType |= (eraftpb.ConfChangeType(b) & 0x7F) << shift if b < 0x80 { break } @@ -8761,115 +8737,114 @@ var ( func init() { proto.RegisterFile("pdpb.proto", fileDescriptorPdpb) } var fileDescriptorPdpb = []byte{ - // 1757 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x4b, 0x6f, 0x1b, 0xc9, - 0x11, 0xd6, 0xf0, 0xcd, 0xe2, 0xd3, 0x6d, 0x59, 0x9a, 0xa5, 0x2d, 0x45, 0xdb, 0x5e, 0x04, 0x5e, - 0x67, 0xcd, 0x78, 0x15, 0x24, 0x08, 0xb0, 0xd8, 0x60, 0xa9, 0x87, 0xd7, 0x82, 0xd7, 0xa2, 0xd0, - 0xe4, 0x62, 0xb1, 0x97, 0x30, 0x43, 0x4e, 0x9b, 0x9a, 0x88, 0x9c, 0x99, 0x9d, 0x6e, 0x4a, 0xa1, - 0x4f, 0x39, 0xe5, 0x92, 0x00, 0xc9, 0x29, 0xc8, 0x1f, 0xc8, 0xcf, 0xc8, 0x3d, 0xc7, 0xfc, 0x84, - 0xc0, 0x39, 0xe7, 0x3f, 0x04, 0xfd, 0x98, 0xe1, 0xcc, 0x90, 0x72, 0x9c, 0x71, 0xf6, 0x44, 0x76, - 0x55, 0xf5, 0xd7, 0x55, 0xd5, 0xf5, 0xe8, 0x1a, 0x00, 0xdf, 0xf6, 0xc7, 0x5d, 0x3f, 0xf0, 0xb8, - 0x87, 0x0a, 0xe2, 0x7f, 0xa7, 0x3e, 0xa7, 0xdc, 0x0a, 0x69, 0x9d, 0xed, 0xa9, 0x37, 0xf5, 0xe4, - 0xdf, 0x1f, 0x8b, 0x7f, 0x8a, 0x8a, 0xbb, 0xd0, 0x20, 0xf4, 0xbb, 0x05, 0x65, 0xfc, 0x39, 0xb5, - 0x6c, 0x1a, 0xa0, 0x3d, 0x80, 0xc9, 0x6c, 0xc1, 0x38, 0x0d, 0x46, 0x8e, 0x6d, 0x1a, 0x07, 0xc6, - 0xa3, 0x02, 0xa9, 0x6a, 0xca, 0x99, 0x8d, 0x09, 0x34, 0x09, 0x65, 0xbe, 0xe7, 0x32, 0xfa, 0x4e, - 0x1b, 0xd0, 0x87, 0x50, 0xa4, 0x41, 0xe0, 0x05, 0x66, 0xee, 0xc0, 0x78, 0x54, 0x3b, 0xac, 0x75, - 0xa5, 0x9a, 0xa7, 0x82, 0x44, 0x14, 0x07, 0x3f, 0x83, 0xa2, 0x5c, 0xa3, 0x87, 0x50, 0xe0, 0x4b, - 0x9f, 0x4a, 0x90, 0xe6, 0x61, 0x2b, 0x26, 0x3a, 0x5c, 0xfa, 0x94, 0x48, 0x26, 0x32, 0xa1, 0x3c, - 0xa7, 0x8c, 0x59, 0x53, 0x2a, 0x21, 0xab, 0x24, 0x5c, 0xe2, 0x3e, 0xc0, 0x90, 0x79, 0xda, 0x1c, - 0xf4, 0x23, 0x28, 0x5d, 0x4a, 0x0d, 0x25, 0x5c, 0xed, 0xf0, 0xae, 0x82, 0x4b, 0x58, 0x4b, 0xb4, - 0x08, 0xda, 0x86, 0xe2, 0xc4, 0x5b, 0xb8, 0x5c, 0x42, 0x36, 0x88, 0x5a, 0xe0, 0x1e, 0x54, 0x87, - 0xce, 0x9c, 0x32, 0x6e, 0xcd, 0x7d, 0xd4, 0x81, 0x8a, 0x7f, 0xb9, 0x64, 0xce, 0xc4, 0x9a, 0x49, - 0xc4, 0x3c, 0x89, 0xd6, 0x42, 0xa7, 0x99, 0x37, 0x95, 0xac, 0x9c, 0x64, 0x85, 0x4b, 0xfc, 0x5b, - 0x03, 0x6a, 0x52, 0x29, 0xe5, 0x33, 0xf4, 0x49, 0x4a, 0xab, 0xed, 0x50, 0xab, 0xb8, 0x4f, 0xdf, - 0xae, 0x16, 0x7a, 0x02, 0x55, 0x1e, 0xaa, 0x65, 0xe6, 0x25, 0x8c, 0xf6, 0x55, 0xa4, 0x2d, 0x59, - 0x49, 0xe0, 0x3f, 0x18, 0xd0, 0x3e, 0xf2, 0x3c, 0xce, 0x78, 0x60, 0xf9, 0x99, 0xbc, 0xf3, 0x10, - 0x8a, 0x8c, 0x7b, 0x01, 0xd5, 0x77, 0xd8, 0xe8, 0xea, 0xc0, 0x1a, 0x08, 0x22, 0x51, 0x3c, 0xf4, - 0x43, 0x28, 0x05, 0x74, 0xea, 0x78, 0xae, 0x56, 0xa9, 0x19, 0x4a, 0x11, 0x49, 0x25, 0x9a, 0x8b, - 0x7b, 0x70, 0x27, 0xa6, 0x4d, 0x16, 0xb7, 0xe0, 0x13, 0xb8, 0x77, 0xc6, 0x22, 0x10, 0x9f, 0xda, - 0x59, 0xac, 0xc2, 0xbf, 0x86, 0x9d, 0x34, 0x4a, 0xa6, 0x4b, 0xc2, 0x50, 0x1f, 0xc7, 0x50, 0xa4, - 0x93, 0x2a, 0x24, 0x41, 0xc3, 0x9f, 0x43, 0xb3, 0x37, 0x9b, 0x79, 0x93, 0xb3, 0x93, 0x4c, 0xaa, - 0xf6, 0xa1, 0x15, 0x6d, 0xcf, 0xa4, 0x63, 0x13, 0x72, 0x8e, 0xd2, 0xac, 0x40, 0x72, 0x8e, 0x8d, - 0xbf, 0x85, 0xd6, 0x97, 0x94, 0xab, 0xfb, 0xcb, 0x12, 0x11, 0x1f, 0x40, 0x45, 0xde, 0xfa, 0x28, - 0x42, 0x2d, 0xcb, 0xf5, 0x99, 0x8d, 0x29, 0xb4, 0x57, 0xd0, 0x99, 0x94, 0x7d, 0x97, 0x70, 0xc3, - 0x13, 0x68, 0x5d, 0x2c, 0xde, 0xc3, 0x82, 0x77, 0x3a, 0xe4, 0x0b, 0x68, 0xaf, 0x0e, 0xc9, 0x14, - 0xaa, 0xbf, 0x94, 0xde, 0xd0, 0x29, 0x90, 0x45, 0xcf, 0x3d, 0x00, 0x95, 0x38, 0xa3, 0x2b, 0xba, - 0x94, 0xca, 0xd6, 0x49, 0x55, 0x51, 0x5e, 0xd0, 0x25, 0xfe, 0xa3, 0x01, 0x77, 0x62, 0x07, 0x64, - 0xf2, 0xf7, 0x2a, 0x73, 0x73, 0x6f, 0xcb, 0x5c, 0xf4, 0x11, 0x94, 0x66, 0x0a, 0x55, 0x65, 0x78, - 0x3d, 0x94, 0xbb, 0xa0, 0x02, 0x4d, 0xf1, 0xf0, 0xaf, 0x60, 0x3b, 0x52, 0xe8, 0x68, 0x99, 0x2d, - 0xe0, 0xd1, 0x7d, 0xd0, 0x36, 0xae, 0x02, 0xac, 0xa2, 0x08, 0x67, 0x36, 0x7e, 0x06, 0xbb, 0x5f, - 0x52, 0x7e, 0xac, 0x5a, 0xcc, 0xb1, 0xe7, 0xbe, 0x72, 0xa6, 0x99, 0xb2, 0x8a, 0x81, 0xb9, 0x8e, - 0x93, 0xc9, 0x83, 0x1f, 0x43, 0x59, 0x77, 0x3c, 0xed, 0xc2, 0x56, 0xe8, 0x1a, 0x8d, 0x4e, 0x42, - 0x3e, 0xfe, 0x0e, 0x76, 0x2f, 0x16, 0xef, 0xaf, 0xfc, 0xff, 0x72, 0xe4, 0x73, 0x30, 0xd7, 0x8f, - 0xcc, 0x14, 0xcd, 0x37, 0x50, 0x7a, 0x49, 0xe7, 0x63, 0x1a, 0x20, 0x04, 0x05, 0xd7, 0x9a, 0xab, - 0x56, 0x5d, 0x25, 0xf2, 0xbf, 0xb8, 0xb4, 0xb9, 0xe4, 0xc6, 0x2e, 0x4d, 0x11, 0xce, 0x6c, 0xc1, - 0xf4, 0x29, 0x0d, 0x46, 0x8b, 0x60, 0xc6, 0xcc, 0xfc, 0x41, 0xfe, 0x51, 0x95, 0x54, 0x04, 0xe1, - 0xeb, 0x60, 0xc6, 0xd0, 0x0f, 0xa0, 0x36, 0x99, 0x39, 0xd4, 0xe5, 0x8a, 0x5d, 0x90, 0x6c, 0x50, - 0x24, 0x21, 0x80, 0xbf, 0x90, 0x51, 0xae, 0xce, 0x66, 0x99, 0x2e, 0xfb, 0x4f, 0x06, 0xa0, 0x38, - 0x44, 0xc6, 0x4c, 0x29, 0x2b, 0x83, 0x98, 0x99, 0x3b, 0xc8, 0xcb, 0x14, 0x90, 0xe2, 0x0a, 0x95, - 0x84, 0xcc, 0x0d, 0x99, 0x12, 0x17, 0x0b, 0x33, 0xe5, 0x02, 0xaa, 0x22, 0x73, 0x06, 0xdc, 0xe2, - 0x0c, 0x1d, 0x40, 0x41, 0xb8, 0x43, 0xab, 0x91, 0x4c, 0x2d, 0xc9, 0x41, 0x1f, 0x42, 0xdd, 0xf6, - 0x6e, 0xdc, 0x11, 0xa3, 0x13, 0xcf, 0xb5, 0x99, 0xf6, 0x70, 0x4d, 0xd0, 0x06, 0x8a, 0x84, 0xff, - 0x9a, 0x87, 0x1d, 0x95, 0x79, 0xcf, 0xa9, 0x15, 0xf0, 0x31, 0xb5, 0x78, 0xa6, 0xe0, 0xfa, 0xbf, - 0x56, 0x04, 0xd4, 0x05, 0x90, 0x8a, 0x0b, 0x2b, 0xd4, 0xe5, 0x46, 0x0f, 0x96, 0xc8, 0x7e, 0x52, - 0x15, 0x22, 0x62, 0xc9, 0xd0, 0xa7, 0xd0, 0xf0, 0xa9, 0x6b, 0x3b, 0xee, 0x54, 0x6f, 0x29, 0x6a, - 0x5f, 0xc7, 0xc1, 0xeb, 0x5a, 0x44, 0x6d, 0x79, 0x08, 0x8d, 0xf1, 0x92, 0x53, 0x36, 0xba, 0x09, - 0x1c, 0xce, 0xa9, 0x6b, 0x96, 0xa4, 0x73, 0xea, 0x92, 0xf8, 0x8d, 0xa2, 0x89, 0x52, 0xaa, 0x84, - 0x02, 0x6a, 0xd9, 0x66, 0x59, 0xbd, 0x54, 0x25, 0x85, 0x50, 0x4b, 0xbc, 0x54, 0xeb, 0x57, 0x74, - 0xb9, 0x82, 0xa8, 0x28, 0xff, 0x0a, 0x5a, 0x88, 0x70, 0x1f, 0xaa, 0x52, 0x44, 0x02, 0x54, 0x55, - 0x84, 0x0b, 0x82, 0xdc, 0xff, 0x31, 0xb4, 0x2d, 0xdf, 0x0f, 0xbc, 0xdf, 0x38, 0x73, 0x8b, 0xd3, - 0x11, 0x73, 0x5e, 0x53, 0x13, 0xa4, 0x4c, 0x2b, 0x46, 0x1f, 0x38, 0xaf, 0x29, 0xa6, 0x00, 0xc7, - 0x97, 0x96, 0x3b, 0xa5, 0x42, 0xfb, 0x77, 0xb8, 0xfa, 0x9f, 0x42, 0x6d, 0x22, 0xe5, 0x47, 0xf2, - 0x7d, 0x9c, 0x93, 0xef, 0x63, 0x1d, 0xaa, 0x22, 0xa1, 0x15, 0x98, 0x7c, 0x24, 0xc3, 0x24, 0xfa, - 0x8f, 0x0f, 0xa1, 0x39, 0x0c, 0x2c, 0x97, 0xbd, 0xa2, 0xc1, 0x57, 0xea, 0x2a, 0xfe, 0xeb, 0x51, - 0xf8, 0x6f, 0x39, 0xd8, 0x5d, 0x0b, 0xa1, 0x4c, 0xc9, 0xf2, 0x69, 0xa4, 0xb4, 0x3c, 0x52, 0x45, - 0x52, 0x5b, 0x2b, 0x1d, 0x59, 0x1f, 0x2a, 0x2c, 0x3d, 0xf1, 0x39, 0xb4, 0xb8, 0x56, 0x78, 0x94, - 0x08, 0x2c, 0x7d, 0x52, 0xd2, 0x1a, 0xd2, 0xe4, 0x49, 0xeb, 0x12, 0x5d, 0xa3, 0x90, 0xec, 0x1a, - 0xe8, 0x67, 0x50, 0xd7, 0x4c, 0xea, 0x7b, 0x93, 0x4b, 0xb3, 0xa8, 0xd3, 0x20, 0x11, 0xd9, 0xa7, - 0x82, 0x45, 0x6a, 0xc1, 0x6a, 0x81, 0x9e, 0x40, 0x8d, 0x5b, 0xc1, 0x94, 0x72, 0x65, 0x46, 0x69, - 0x83, 0xe7, 0x40, 0x09, 0x88, 0xff, 0xf8, 0x15, 0xb4, 0x7a, 0xec, 0x6a, 0xe0, 0xcf, 0x9c, 0xef, - 0x35, 0xf5, 0xf0, 0xef, 0x0c, 0x68, 0xaf, 0x0e, 0xca, 0xf8, 0x70, 0x6d, 0xb8, 0xf4, 0x66, 0x94, - 0x6e, 0xb4, 0x35, 0x97, 0xde, 0x90, 0xd0, 0x6b, 0x07, 0x50, 0x17, 0x32, 0xb2, 0x74, 0x3b, 0xb6, - 0xaa, 0xdc, 0x05, 0x02, 0x2e, 0xbd, 0x11, 0xd6, 0x9e, 0xd9, 0x0c, 0xff, 0xde, 0x00, 0x44, 0xa8, - 0xef, 0x05, 0x3c, 0xbb, 0xd1, 0x18, 0x0a, 0x33, 0xfa, 0x8a, 0xdf, 0x62, 0xb2, 0xe4, 0xa1, 0x8f, - 0xa0, 0x18, 0x38, 0xd3, 0x4b, 0x7e, 0xcb, 0x78, 0xa1, 0x98, 0xf8, 0x18, 0xee, 0x26, 0x94, 0xc9, - 0xd4, 0xe6, 0xfe, 0x9d, 0x07, 0x90, 0x8f, 0x3e, 0x55, 0x9a, 0xe3, 0x8f, 0x5d, 0x23, 0xf1, 0xd8, - 0x15, 0x43, 0xe1, 0xc4, 0xf2, 0xad, 0x89, 0xc3, 0x97, 0x61, 0xc7, 0x0b, 0xd7, 0xe8, 0x01, 0x54, - 0xad, 0x6b, 0xcb, 0x99, 0x59, 0xe3, 0x19, 0x95, 0x4a, 0x17, 0xc8, 0x8a, 0x20, 0xaa, 0x8d, 0x76, - 0xbc, 0x9a, 0xf0, 0x0a, 0x72, 0xc2, 0xd3, 0x91, 0x77, 0x2c, 0xe7, 0xbc, 0x4f, 0x00, 0x31, 0x5d, - 0x07, 0x99, 0x6b, 0xf9, 0x5a, 0xb0, 0x28, 0x05, 0xdb, 0x9a, 0x33, 0x70, 0x2d, 0x5f, 0x49, 0x3f, - 0x85, 0xed, 0x80, 0x4e, 0xa8, 0x73, 0x9d, 0x92, 0x2f, 0x49, 0x79, 0x14, 0xf1, 0x56, 0x3b, 0xf6, - 0x00, 0x18, 0xb7, 0x02, 0x3e, 0x12, 0xb3, 0xa2, 0xac, 0x87, 0x0d, 0x52, 0x95, 0x14, 0x31, 0x47, - 0xa2, 0x2e, 0xdc, 0xb5, 0x7c, 0x7f, 0xb6, 0x4c, 0xe1, 0x55, 0xa4, 0xdc, 0x9d, 0x90, 0xb5, 0x82, - 0xdb, 0x85, 0xb2, 0xc3, 0x46, 0xe3, 0x05, 0x5b, 0xca, 0xd2, 0x58, 0x21, 0x25, 0x87, 0x1d, 0x2d, - 0xd8, 0x52, 0xa4, 0xe5, 0x82, 0x51, 0x3b, 0x5e, 0x11, 0x2b, 0x82, 0x20, 0x4a, 0xe1, 0x7a, 0xe5, - 0xae, 0x6d, 0xa8, 0xdc, 0xe9, 0xd2, 0x5c, 0x5f, 0x2f, 0xcd, 0xc9, 0xe2, 0xde, 0x48, 0x17, 0xf7, - 0x44, 0xe5, 0x6e, 0x26, 0x2b, 0x37, 0x9e, 0xc1, 0x3d, 0x79, 0xdd, 0xef, 0xdb, 0x34, 0x8b, 0x4c, - 0xc4, 0x4b, 0xb2, 0xd2, 0xad, 0xe2, 0x88, 0x28, 0x36, 0x7e, 0x06, 0x3b, 0xe9, 0xd3, 0xb2, 0x44, - 0xe9, 0x63, 0x0a, 0xd5, 0xe8, 0xdb, 0x08, 0x2a, 0x41, 0xae, 0xff, 0xa2, 0xbd, 0x85, 0x6a, 0x50, - 0xfe, 0xfa, 0xfc, 0xc5, 0x79, 0xff, 0x9b, 0xf3, 0xb6, 0x81, 0xb6, 0xa1, 0x7d, 0xde, 0x1f, 0x8e, - 0x8e, 0xfa, 0xfd, 0xe1, 0x60, 0x48, 0x7a, 0x17, 0x17, 0xa7, 0x27, 0xed, 0x1c, 0xba, 0x0b, 0xad, - 0xc1, 0xb0, 0x4f, 0x4e, 0x47, 0xc3, 0xfe, 0xcb, 0xa3, 0xc1, 0xb0, 0x7f, 0x7e, 0xda, 0xce, 0x23, - 0x13, 0xb6, 0x7b, 0x5f, 0x91, 0xd3, 0xde, 0xc9, 0xb7, 0x49, 0xf1, 0xc2, 0xe3, 0x27, 0xd0, 0x4c, - 0xb6, 0x18, 0x71, 0x46, 0xcf, 0xb6, 0xcf, 0x3d, 0x9b, 0xb6, 0xb7, 0x50, 0x13, 0x80, 0xd0, 0xb9, - 0x77, 0x4d, 0xe5, 0xda, 0x38, 0xfc, 0x73, 0x05, 0x72, 0x17, 0x27, 0xa8, 0x07, 0xb0, 0x7a, 0x6d, - 0xa1, 0x5d, 0x65, 0xc8, 0xda, 0x13, 0xae, 0x63, 0xae, 0x33, 0x94, 0xad, 0x78, 0x0b, 0x3d, 0x85, - 0xfc, 0x90, 0x79, 0x48, 0xfb, 0x71, 0xf5, 0x65, 0xa7, 0x73, 0x27, 0x46, 0x09, 0xa5, 0x1f, 0x19, - 0x4f, 0x0d, 0xf4, 0x0b, 0xa8, 0x46, 0xf3, 0x3c, 0xda, 0x51, 0x52, 0xe9, 0x2f, 0x1f, 0x9d, 0xdd, - 0x35, 0x7a, 0x74, 0xe2, 0x4b, 0x68, 0x26, 0xbf, 0x08, 0xa0, 0xfb, 0x4a, 0x78, 0xe3, 0xd7, 0x86, - 0xce, 0x83, 0xcd, 0xcc, 0x08, 0xee, 0xe7, 0x50, 0xd6, 0x53, 0x3b, 0xd2, 0x37, 0x99, 0xfc, 0x06, - 0xd0, 0xb9, 0x97, 0xa2, 0x46, 0x3b, 0x3f, 0x83, 0x4a, 0x38, 0x43, 0xa3, 0x7b, 0x91, 0x8b, 0xe2, - 0xc3, 0x6e, 0x67, 0x27, 0x4d, 0x8e, 0x6f, 0x0e, 0x87, 0xd6, 0x70, 0x73, 0x6a, 0x52, 0x0e, 0x37, - 0xa7, 0x67, 0x5b, 0xe5, 0x82, 0x64, 0x70, 0x86, 0x2e, 0xd8, 0x98, 0x20, 0xa1, 0x0b, 0x36, 0xc7, - 0x33, 0xde, 0x42, 0x43, 0x68, 0xa5, 0x1e, 0x13, 0xe8, 0x41, 0x18, 0xd4, 0x9b, 0x9e, 0xa9, 0x9d, - 0xbd, 0x5b, 0xb8, 0xe9, 0x7b, 0x8e, 0x46, 0x4c, 0xb4, 0x72, 0x44, 0x62, 0xca, 0xee, 0xec, 0xae, - 0xd1, 0x23, 0xad, 0x9e, 0x41, 0x23, 0x31, 0xa2, 0xa2, 0x4e, 0x4a, 0x36, 0x36, 0xb7, 0xbe, 0x0d, - 0xe7, 0x33, 0xa8, 0x84, 0x2d, 0x38, 0xf4, 0x74, 0xaa, 0xf7, 0x87, 0x9e, 0x4e, 0x77, 0x6a, 0xbc, - 0x85, 0x4e, 0xa0, 0x16, 0xeb, 0x54, 0xc8, 0x0c, 0x0d, 0x4f, 0x77, 0xd2, 0xce, 0x07, 0x1b, 0x38, - 0x11, 0xca, 0x40, 0x7e, 0x5f, 0x48, 0xcc, 0x76, 0x68, 0x2f, 0xd2, 0x78, 0xd3, 0x98, 0xd9, 0xd9, - 0xbf, 0x8d, 0x1d, 0x07, 0x4d, 0x0f, 0x8c, 0x21, 0xe8, 0x2d, 0xb3, 0x6b, 0x08, 0x7a, 0xdb, 0x9c, - 0x89, 0xb7, 0x8e, 0x1e, 0xff, 0xfd, 0xcd, 0xbe, 0xf1, 0x8f, 0x37, 0xfb, 0xc6, 0x3f, 0xdf, 0xec, - 0x1b, 0x7f, 0xf9, 0xd7, 0xfe, 0x16, 0x98, 0x13, 0x6f, 0xde, 0xf5, 0x1d, 0x77, 0x3a, 0xb1, 0xfc, - 0x2e, 0x77, 0xae, 0xae, 0xbb, 0x57, 0xd7, 0xf2, 0xab, 0xf4, 0xb8, 0x24, 0x7f, 0x7e, 0xf2, 0x9f, - 0x00, 0x00, 0x00, 0xff, 0xff, 0x20, 0xf4, 0x81, 0xa3, 0xd4, 0x16, 0x00, 0x00, + // 1741 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xcd, 0x6e, 0x23, 0xc7, + 0x11, 0xd6, 0xf0, 0x4f, 0x64, 0xf1, 0x77, 0x7b, 0xb5, 0xd2, 0x98, 0xbb, 0x52, 0xe4, 0x5e, 0x23, + 0x58, 0x3b, 0x36, 0xb3, 0x56, 0x80, 0xc0, 0x80, 0xe1, 0xc0, 0xfa, 0x5b, 0xaf, 0xb0, 0x5e, 0x51, + 0x68, 0xd2, 0x30, 0x7c, 0x09, 0x33, 0xe4, 0xb4, 0xa8, 0x89, 0xc8, 0x99, 0xf1, 0x74, 0x73, 0x15, + 0xee, 0x29, 0xa7, 0x5c, 0x12, 0x20, 0x39, 0x05, 0x79, 0x81, 0x3c, 0x46, 0xee, 0x39, 0xe6, 0x11, + 0x82, 0xcd, 0x39, 0xef, 0x10, 0x74, 0xf7, 0xf4, 0xfc, 0x91, 0xda, 0x28, 0xb3, 0xf1, 0x89, 0xec, + 0xaa, 0xea, 0xaf, 0xbf, 0xae, 0xae, 0xaa, 0xee, 0x1a, 0x00, 0xdf, 0xf6, 0xc7, 0x3d, 0x3f, 0xf0, + 0xb8, 0x87, 0x4a, 0xe2, 0x7f, 0xb7, 0x31, 0xa7, 0xdc, 0xd2, 0xb2, 0x6e, 0x93, 0x06, 0xd6, 0x25, + 0x8f, 0x86, 0x5b, 0x53, 0x6f, 0xea, 0xc9, 0xbf, 0x3f, 0x15, 0xff, 0x94, 0x14, 0xf7, 0xa0, 0x49, + 0xe8, 0xf7, 0x0b, 0xca, 0xf8, 0x73, 0x6a, 0xd9, 0x34, 0x40, 0xbb, 0x00, 0x93, 0xd9, 0x82, 0x71, + 0x1a, 0x8c, 0x1c, 0xdb, 0x34, 0xf6, 0x8d, 0x27, 0x25, 0x52, 0x0b, 0x25, 0x67, 0x36, 0x26, 0xd0, + 0x22, 0x94, 0xf9, 0x9e, 0xcb, 0xe8, 0x9d, 0x26, 0xa0, 0xf7, 0xa1, 0x4c, 0x83, 0xc0, 0x0b, 0xcc, + 0xc2, 0xbe, 0xf1, 0xa4, 0x7e, 0x50, 0xef, 0x49, 0xd6, 0xa7, 0x42, 0x44, 0x94, 0x06, 0x3f, 0x83, + 0xb2, 0x1c, 0xa3, 0xc7, 0x50, 0xe2, 0x4b, 0x9f, 0x4a, 0x90, 0xd6, 0x41, 0x3b, 0x61, 0x3a, 0x5c, + 0xfa, 0x94, 0x48, 0x25, 0x32, 0x61, 0x73, 0x4e, 0x19, 0xb3, 0xa6, 0x54, 0x42, 0xd6, 0x88, 0x1e, + 0xe2, 0x3e, 0xc0, 0x90, 0x79, 0xe1, 0x76, 0xd0, 0x4f, 0xa0, 0x72, 0x25, 0x19, 0x4a, 0xb8, 0xfa, + 0xc1, 0x7d, 0x05, 0x97, 0xda, 0x2d, 0x09, 0x4d, 0xd0, 0x16, 0x94, 0x27, 0xde, 0xc2, 0xe5, 0x12, + 0xb2, 0x49, 0xd4, 0x00, 0x1f, 0x42, 0x6d, 0xe8, 0xcc, 0x29, 0xe3, 0xd6, 0xdc, 0x47, 0x5d, 0xa8, + 0xfa, 0x57, 0x4b, 0xe6, 0x4c, 0xac, 0x99, 0x44, 0x2c, 0x92, 0x68, 0x2c, 0x38, 0xcd, 0xbc, 0xa9, + 0x54, 0x15, 0xa4, 0x4a, 0x0f, 0xf1, 0x6f, 0x0d, 0xa8, 0x4b, 0x52, 0xca, 0x67, 0xe8, 0xe3, 0x0c, + 0xab, 0x2d, 0xcd, 0x2a, 0xe9, 0xd3, 0xb7, 0xd3, 0x42, 0x9f, 0x40, 0x8d, 0x6b, 0x5a, 0x66, 0x51, + 0xc2, 0x84, 0xbe, 0x8a, 0xd8, 0x92, 0xd8, 0x02, 0xff, 0xc1, 0x80, 0xce, 0x91, 0xe7, 0x71, 0xc6, + 0x03, 0xcb, 0xcf, 0xe5, 0x9d, 0xc7, 0x50, 0x66, 0xdc, 0x0b, 0x68, 0x78, 0x86, 0xcd, 0x5e, 0x18, + 0x67, 0x03, 0x21, 0x24, 0x4a, 0x87, 0x7e, 0x0c, 0x95, 0x80, 0x4e, 0x1d, 0xcf, 0x0d, 0x29, 0xb5, + 0xb4, 0x15, 0x91, 0x52, 0x12, 0x6a, 0xf1, 0x21, 0xdc, 0x4b, 0xb0, 0xc9, 0xe3, 0x16, 0x7c, 0x02, + 0x0f, 0xce, 0x58, 0x04, 0xe2, 0x53, 0x3b, 0xcf, 0xae, 0xf0, 0xaf, 0x61, 0x3b, 0x8b, 0x92, 0xeb, + 0x90, 0x30, 0x34, 0xc6, 0x09, 0x14, 0xe9, 0xa4, 0x2a, 0x49, 0xc9, 0xf0, 0x17, 0xd0, 0x3a, 0x9c, + 0xcd, 0xbc, 0xc9, 0xd9, 0x49, 0x2e, 0xaa, 0x7d, 0x68, 0x47, 0xd3, 0x73, 0x71, 0x6c, 0x41, 0xc1, + 0x51, 0xcc, 0x4a, 0xa4, 0xe0, 0xd8, 0xf8, 0x3b, 0x68, 0x7f, 0x45, 0xb9, 0x3a, 0xbf, 0x3c, 0x11, + 0xf1, 0x1e, 0x54, 0xe5, 0xa9, 0x8f, 0x22, 0xd4, 0x4d, 0x39, 0x3e, 0xb3, 0x31, 0x85, 0x4e, 0x0c, + 0x9d, 0x8b, 0xec, 0x5d, 0xc2, 0x0d, 0x4f, 0xa0, 0x7d, 0xb1, 0x78, 0x87, 0x1d, 0xdc, 0x69, 0x91, + 0x2f, 0xa1, 0x13, 0x2f, 0x92, 0x2b, 0x54, 0x7f, 0x29, 0xbd, 0x11, 0xa6, 0x40, 0x1e, 0x9e, 0xbb, + 0x00, 0x2a, 0x71, 0x46, 0xd7, 0x74, 0x29, 0xc9, 0x36, 0x48, 0x4d, 0x49, 0x5e, 0xd0, 0x25, 0xfe, + 0xa3, 0x01, 0xf7, 0x12, 0x0b, 0xe4, 0xf2, 0x77, 0x9c, 0xb9, 0x85, 0xb7, 0x65, 0x2e, 0xfa, 0x00, + 0x2a, 0x33, 0x85, 0xaa, 0x32, 0xbc, 0xa1, 0xed, 0x2e, 0xa8, 0x40, 0x53, 0x3a, 0xfc, 0x2b, 0xd8, + 0x8a, 0x08, 0x1d, 0x2d, 0xf3, 0x05, 0x3c, 0x7a, 0x08, 0xe1, 0x1e, 0xe3, 0x00, 0xab, 0x2a, 0xc1, + 0x99, 0x8d, 0x9f, 0xc1, 0xce, 0x57, 0x94, 0x1f, 0xab, 0x2b, 0xe6, 0xd8, 0x73, 0x2f, 0x9d, 0x69, + 0xae, 0xac, 0x62, 0x60, 0xae, 0xe2, 0xe4, 0xf2, 0xe0, 0x87, 0xb0, 0x19, 0xde, 0x78, 0xa1, 0x0b, + 0xdb, 0xda, 0x35, 0x21, 0x3a, 0xd1, 0x7a, 0xfc, 0x3d, 0xec, 0x5c, 0x2c, 0xde, 0x9d, 0xfc, 0xff, + 0xb2, 0xe4, 0x73, 0x30, 0x57, 0x97, 0xcc, 0x15, 0xcd, 0x37, 0x50, 0x79, 0x49, 0xe7, 0x63, 0x1a, + 0x20, 0x04, 0x25, 0xd7, 0x9a, 0xab, 0xab, 0xba, 0x46, 0xe4, 0x7f, 0x71, 0x68, 0x73, 0xa9, 0x4d, + 0x1c, 0x9a, 0x12, 0x9c, 0xd9, 0x42, 0xe9, 0x53, 0x1a, 0x8c, 0x16, 0xc1, 0x8c, 0x99, 0xc5, 0xfd, + 0xe2, 0x93, 0x1a, 0xa9, 0x0a, 0xc1, 0x37, 0xc1, 0x8c, 0xa1, 0x1f, 0x41, 0x7d, 0x32, 0x73, 0xa8, + 0xcb, 0x95, 0xba, 0x24, 0xd5, 0xa0, 0x44, 0xc2, 0x00, 0x7f, 0x29, 0xa3, 0x5c, 0xad, 0xcd, 0x72, + 0x1d, 0xf6, 0x9f, 0x0c, 0x40, 0x49, 0x88, 0x9c, 0x99, 0xb2, 0xa9, 0x36, 0xc4, 0xcc, 0xc2, 0x7e, + 0x51, 0xa6, 0x80, 0x34, 0x57, 0xa8, 0x44, 0x2b, 0xd7, 0x64, 0x4a, 0xd2, 0x4c, 0x67, 0xca, 0x05, + 0xd4, 0x44, 0xe6, 0x0c, 0xb8, 0xc5, 0x19, 0xda, 0x87, 0x92, 0x70, 0x47, 0x48, 0x23, 0x9d, 0x5a, + 0x52, 0x83, 0xde, 0x87, 0x86, 0xed, 0xdd, 0xb8, 0x23, 0x46, 0x27, 0x9e, 0x6b, 0xb3, 0xd0, 0xc3, + 0x75, 0x21, 0x1b, 0x28, 0x11, 0xfe, 0x6b, 0x11, 0xb6, 0x55, 0xe6, 0x3d, 0xa7, 0x56, 0xc0, 0xc7, + 0xd4, 0xe2, 0xb9, 0x82, 0xeb, 0xff, 0x5a, 0x11, 0x50, 0x0f, 0x40, 0x12, 0x17, 0xbb, 0x50, 0x87, + 0x1b, 0x3d, 0x58, 0xa2, 0xfd, 0x93, 0x9a, 0x30, 0x11, 0x43, 0x86, 0x3e, 0x85, 0xa6, 0x4f, 0x5d, + 0xdb, 0x71, 0xa7, 0xe1, 0x94, 0x72, 0xe8, 0xeb, 0x24, 0x78, 0x23, 0x34, 0x51, 0x53, 0x1e, 0x43, + 0x73, 0xbc, 0xe4, 0x94, 0x8d, 0x6e, 0x02, 0x87, 0x73, 0xea, 0x9a, 0x15, 0xe9, 0x9c, 0x86, 0x14, + 0x7e, 0xab, 0x64, 0xa2, 0x94, 0x2a, 0xa3, 0x80, 0x5a, 0xb6, 0xb9, 0xa9, 0x5e, 0xaa, 0x52, 0x42, + 0xa8, 0x25, 0x5e, 0xaa, 0x8d, 0x6b, 0xba, 0x8c, 0x21, 0xaa, 0xca, 0xbf, 0x42, 0xa6, 0x11, 0x1e, + 0x42, 0x4d, 0x9a, 0x48, 0x80, 0x9a, 0x8a, 0x70, 0x21, 0x90, 0xf3, 0x3f, 0x84, 0x8e, 0xe5, 0xfb, + 0x81, 0xf7, 0x1b, 0x67, 0x6e, 0x71, 0x3a, 0x62, 0xce, 0x6b, 0x6a, 0x82, 0xb4, 0x69, 0x27, 0xe4, + 0x03, 0xe7, 0x35, 0xc5, 0x57, 0x00, 0xc7, 0x57, 0x96, 0x3b, 0xa5, 0x82, 0xfd, 0x1d, 0x8e, 0xfe, + 0x33, 0xa8, 0x4f, 0xa4, 0xfd, 0x48, 0xbe, 0x8f, 0x0b, 0xf2, 0x7d, 0xbc, 0xd3, 0xd3, 0x0f, 0x7c, + 0x91, 0xd3, 0x0a, 0x4f, 0xbe, 0x93, 0x61, 0x12, 0xfd, 0xc7, 0x07, 0xd0, 0x1a, 0x06, 0x96, 0xcb, + 0x2e, 0x69, 0xf0, 0xb5, 0x3a, 0x8d, 0xff, 0xba, 0x1a, 0xfe, 0x5b, 0x01, 0x76, 0x56, 0xa2, 0x28, + 0x57, 0xbe, 0x7c, 0x1a, 0xf1, 0x96, 0x4b, 0xaa, 0x60, 0xea, 0xa8, 0x29, 0xb1, 0x03, 0x34, 0x61, + 0xe9, 0x8c, 0x2f, 0xa0, 0xcd, 0x43, 0xc2, 0xa3, 0x54, 0x6c, 0x85, 0x2b, 0xa5, 0x77, 0x43, 0x5a, + 0x3c, 0xbd, 0xbb, 0xd4, 0xc5, 0x51, 0x4a, 0x5f, 0x1c, 0xe8, 0xe7, 0xd0, 0x08, 0x95, 0xd4, 0xf7, + 0x26, 0x57, 0x66, 0x39, 0xcc, 0x84, 0x54, 0x70, 0x9f, 0x0a, 0x15, 0xa9, 0x07, 0xf1, 0x00, 0x7d, + 0x02, 0x75, 0x6e, 0x05, 0x53, 0xca, 0xd5, 0x36, 0x2a, 0x6b, 0x3c, 0x07, 0xca, 0x40, 0xfc, 0xc7, + 0x97, 0xd0, 0x3e, 0x64, 0xd7, 0x03, 0x7f, 0xe6, 0xfc, 0xa0, 0xd9, 0x87, 0x7f, 0x67, 0x40, 0x27, + 0x5e, 0x28, 0xe7, 0xdb, 0xb5, 0xe9, 0xd2, 0x9b, 0x51, 0xf6, 0xae, 0xad, 0xbb, 0xf4, 0x86, 0x68, + 0xaf, 0xed, 0x43, 0x43, 0xd8, 0xc8, 0xea, 0xed, 0xd8, 0xaa, 0x78, 0x97, 0x08, 0xb8, 0xf4, 0x46, + 0xec, 0xf6, 0xcc, 0x66, 0xf8, 0xf7, 0x06, 0x20, 0x42, 0x7d, 0x2f, 0xe0, 0xf9, 0x37, 0x8d, 0xa1, + 0x34, 0xa3, 0x97, 0xfc, 0x96, 0x2d, 0x4b, 0x1d, 0xfa, 0x00, 0xca, 0x81, 0x33, 0xbd, 0xe2, 0xb7, + 0x74, 0x18, 0x4a, 0x89, 0x8f, 0xe1, 0x7e, 0x8a, 0x4c, 0xae, 0x9b, 0xee, 0xdf, 0x45, 0x00, 0xf9, + 0xee, 0x53, 0xd5, 0x39, 0xf9, 0xde, 0x35, 0x52, 0xef, 0x5d, 0xd1, 0x17, 0x4e, 0x2c, 0xdf, 0x9a, + 0x38, 0x7c, 0xa9, 0x2f, 0x3d, 0x3d, 0x46, 0x8f, 0xa0, 0x66, 0xbd, 0xb2, 0x9c, 0x99, 0x35, 0x9e, + 0x51, 0x49, 0xba, 0x44, 0x62, 0x81, 0x28, 0x38, 0xa1, 0xe3, 0x55, 0x93, 0x57, 0x92, 0x4d, 0x5e, + 0x18, 0x79, 0xc7, 0xb2, 0xd5, 0xfb, 0x18, 0x10, 0x0b, 0x4b, 0x21, 0x73, 0x2d, 0x3f, 0x34, 0x2c, + 0x4b, 0xc3, 0x4e, 0xa8, 0x19, 0xb8, 0x96, 0xaf, 0xac, 0x9f, 0xc2, 0x56, 0x40, 0x27, 0xd4, 0x79, + 0x95, 0xb1, 0xaf, 0x48, 0x7b, 0x14, 0xe9, 0xe2, 0x19, 0xbb, 0x00, 0x8c, 0x5b, 0x01, 0x1f, 0x89, + 0x76, 0x51, 0x96, 0xc4, 0x26, 0xa9, 0x49, 0x89, 0x68, 0x25, 0x51, 0x0f, 0xee, 0x5b, 0xbe, 0x3f, + 0x5b, 0x66, 0xf0, 0xaa, 0xd2, 0xee, 0x9e, 0x56, 0xc5, 0x70, 0x3b, 0xb0, 0xe9, 0xb0, 0xd1, 0x78, + 0xc1, 0x96, 0xb2, 0x3a, 0x56, 0x49, 0xc5, 0x61, 0x47, 0x0b, 0xb6, 0x14, 0x69, 0xb9, 0x60, 0xd4, + 0x4e, 0x16, 0xc5, 0xaa, 0x10, 0x88, 0x6a, 0xb8, 0x5a, 0xbc, 0xeb, 0x6b, 0x8a, 0x77, 0xb6, 0x3a, + 0x37, 0x56, 0xab, 0x73, 0xba, 0xbe, 0x37, 0xb3, 0xf5, 0x3d, 0x55, 0xbc, 0x5b, 0xe9, 0xe2, 0x8d, + 0x67, 0xf0, 0x40, 0x1e, 0xf7, 0xbb, 0xde, 0x9b, 0x65, 0x26, 0xe2, 0x25, 0x5d, 0xe9, 0xe2, 0x38, + 0x22, 0x4a, 0x8d, 0x9f, 0xc1, 0x76, 0x76, 0xb5, 0x3c, 0x51, 0xfa, 0x11, 0x85, 0x5a, 0xf4, 0x79, + 0x04, 0x55, 0xa0, 0xd0, 0x7f, 0xd1, 0xd9, 0x40, 0x75, 0xd8, 0xfc, 0xe6, 0xfc, 0xc5, 0x79, 0xff, + 0xdb, 0xf3, 0x8e, 0x81, 0xb6, 0xa0, 0x73, 0xde, 0x1f, 0x8e, 0x8e, 0xfa, 0xfd, 0xe1, 0x60, 0x48, + 0x0e, 0x2f, 0x2e, 0x4e, 0x4f, 0x3a, 0x05, 0x74, 0x1f, 0xda, 0x83, 0x61, 0x9f, 0x9c, 0x8e, 0x86, + 0xfd, 0x97, 0x47, 0x83, 0x61, 0xff, 0xfc, 0xb4, 0x53, 0x44, 0x26, 0x6c, 0x1d, 0x7e, 0x4d, 0x4e, + 0x0f, 0x4f, 0xbe, 0x4b, 0x9b, 0x97, 0x0e, 0xfe, 0x5c, 0x85, 0xc2, 0xc5, 0x09, 0x3a, 0x04, 0x88, + 0x5f, 0x50, 0x68, 0x47, 0x31, 0x5b, 0x79, 0x96, 0x75, 0xcd, 0x55, 0x85, 0x22, 0x8f, 0x37, 0xd0, + 0x53, 0x28, 0x0e, 0x99, 0x87, 0x42, 0xc7, 0xc4, 0x5f, 0x6b, 0xba, 0xf7, 0x12, 0x12, 0x6d, 0xfd, + 0xc4, 0x78, 0x6a, 0xa0, 0x5f, 0x40, 0x2d, 0xea, 0xd1, 0xd1, 0xb6, 0xb2, 0xca, 0x7e, 0xcd, 0xe8, + 0xee, 0xac, 0xc8, 0xa3, 0x15, 0x5f, 0x42, 0x2b, 0xdd, 0xe5, 0xa3, 0x87, 0xca, 0x78, 0xed, 0x17, + 0x84, 0xee, 0xa3, 0xf5, 0xca, 0x08, 0xee, 0x33, 0xd8, 0x0c, 0x3b, 0x71, 0x14, 0x1e, 0x4d, 0xba, + 0xaf, 0xef, 0x3e, 0xc8, 0x48, 0xa3, 0x99, 0x9f, 0x43, 0x55, 0xf7, 0xc5, 0xe8, 0x41, 0xe4, 0xa2, + 0x64, 0x03, 0xdb, 0xdd, 0xce, 0x8a, 0x93, 0x93, 0x75, 0x23, 0xaa, 0x27, 0x67, 0xba, 0x5f, 0x3d, + 0x39, 0xdb, 0xaf, 0x2a, 0x17, 0xa4, 0xa3, 0x4d, 0xbb, 0x60, 0x6d, 0xc4, 0x6b, 0x17, 0xac, 0x0f, + 0x50, 0xbc, 0x81, 0x86, 0xd0, 0xce, 0xbc, 0x0e, 0xd0, 0x23, 0x1d, 0xa5, 0xeb, 0x9e, 0x9e, 0xdd, + 0xdd, 0x5b, 0xb4, 0xd9, 0x73, 0x8e, 0xda, 0x46, 0x14, 0x3b, 0x22, 0xd5, 0x39, 0x77, 0x77, 0x56, + 0xe4, 0x11, 0xab, 0x67, 0xd0, 0x4c, 0xb5, 0x9d, 0xa8, 0x9b, 0xb1, 0x4d, 0xf4, 0xa2, 0x6f, 0xc3, + 0xf9, 0x1c, 0xaa, 0xfa, 0x4e, 0xd5, 0x9e, 0xce, 0x5c, 0xe6, 0xda, 0xd3, 0xd9, 0xab, 0x17, 0x6f, + 0xa0, 0x13, 0xa8, 0x27, 0xae, 0x1e, 0x64, 0xea, 0x8d, 0x67, 0xaf, 0xc6, 0xee, 0x7b, 0x6b, 0x34, + 0x11, 0xca, 0x40, 0x7e, 0x33, 0x48, 0xf5, 0x6b, 0x68, 0x37, 0x62, 0xbc, 0xae, 0x75, 0xec, 0xee, + 0xdd, 0xa6, 0x4e, 0x82, 0x66, 0x9b, 0x40, 0x0d, 0x7a, 0x4b, 0x3f, 0xaa, 0x41, 0x6f, 0xeb, 0x1d, + 0xf1, 0xc6, 0xd1, 0x47, 0x7f, 0x7f, 0xb3, 0x67, 0xfc, 0xe3, 0xcd, 0x9e, 0xf1, 0xcf, 0x37, 0x7b, + 0xc6, 0x5f, 0xfe, 0xb5, 0xb7, 0x01, 0xe6, 0xc4, 0x9b, 0xf7, 0x7c, 0xc7, 0x9d, 0x4e, 0x2c, 0xbf, + 0xc7, 0x9d, 0xeb, 0x57, 0xbd, 0xeb, 0x57, 0xf2, 0x4b, 0xf3, 0xb8, 0x22, 0x7f, 0x7e, 0xf6, 0x9f, + 0x00, 0x00, 0x00, 0xff, 0xff, 0xc6, 0xc3, 0x58, 0x2b, 0xb7, 0x16, 0x00, 0x00, } diff --git a/_vendor/src/github.com/pingcap/kvproto/pkg/tikvpb/tikvpb.pb.go b/_vendor/src/github.com/pingcap/kvproto/pkg/tikvpb/tikvpb.pb.go index 956df406491ad..043fb26fb21c1 100644 --- a/_vendor/src/github.com/pingcap/kvproto/pkg/tikvpb/tikvpb.pb.go +++ b/_vendor/src/github.com/pingcap/kvproto/pkg/tikvpb/tikvpb.pb.go @@ -71,6 +71,7 @@ type TikvClient interface { RawScan(ctx context.Context, in *kvrpcpb.RawScanRequest, opts ...grpc.CallOption) (*kvrpcpb.RawScanResponse, error) // SQL push down commands. Coprocessor(ctx context.Context, in *coprocessor.Request, opts ...grpc.CallOption) (*coprocessor.Response, error) + CoprocessorStream(ctx context.Context, in *coprocessor.Request, opts ...grpc.CallOption) (Tikv_CoprocessorStreamClient, error) // Raft commands (tikv <-> tikv). Raft(ctx context.Context, opts ...grpc.CallOption) (Tikv_RaftClient, error) Snapshot(ctx context.Context, opts ...grpc.CallOption) (Tikv_SnapshotClient, error) @@ -242,8 +243,40 @@ func (c *tikvClient) Coprocessor(ctx context.Context, in *coprocessor.Request, o return out, nil } +func (c *tikvClient) CoprocessorStream(ctx context.Context, in *coprocessor.Request, opts ...grpc.CallOption) (Tikv_CoprocessorStreamClient, error) { + stream, err := grpc.NewClientStream(ctx, &_Tikv_serviceDesc.Streams[0], c.cc, "/tikvpb.Tikv/CoprocessorStream", opts...) + if err != nil { + return nil, err + } + x := &tikvCoprocessorStreamClient{stream} + if err := x.ClientStream.SendMsg(in); err != nil { + return nil, err + } + if err := x.ClientStream.CloseSend(); err != nil { + return nil, err + } + return x, nil +} + +type Tikv_CoprocessorStreamClient interface { + Recv() (*coprocessor.Response, error) + grpc.ClientStream +} + +type tikvCoprocessorStreamClient struct { + grpc.ClientStream +} + +func (x *tikvCoprocessorStreamClient) Recv() (*coprocessor.Response, error) { + m := new(coprocessor.Response) + if err := x.ClientStream.RecvMsg(m); err != nil { + return nil, err + } + return m, nil +} + func (c *tikvClient) Raft(ctx context.Context, opts ...grpc.CallOption) (Tikv_RaftClient, error) { - stream, err := grpc.NewClientStream(ctx, &_Tikv_serviceDesc.Streams[0], c.cc, "/tikvpb.Tikv/Raft", opts...) + stream, err := grpc.NewClientStream(ctx, &_Tikv_serviceDesc.Streams[1], c.cc, "/tikvpb.Tikv/Raft", opts...) if err != nil { return nil, err } @@ -277,7 +310,7 @@ func (x *tikvRaftClient) CloseAndRecv() (*raft_serverpb.Done, error) { } func (c *tikvClient) Snapshot(ctx context.Context, opts ...grpc.CallOption) (Tikv_SnapshotClient, error) { - stream, err := grpc.NewClientStream(ctx, &_Tikv_serviceDesc.Streams[1], c.cc, "/tikvpb.Tikv/Snapshot", opts...) + stream, err := grpc.NewClientStream(ctx, &_Tikv_serviceDesc.Streams[2], c.cc, "/tikvpb.Tikv/Snapshot", opts...) if err != nil { return nil, err } @@ -360,6 +393,7 @@ type TikvServer interface { RawScan(context.Context, *kvrpcpb.RawScanRequest) (*kvrpcpb.RawScanResponse, error) // SQL push down commands. Coprocessor(context.Context, *coprocessor.Request) (*coprocessor.Response, error) + CoprocessorStream(*coprocessor.Request, Tikv_CoprocessorStreamServer) error // Raft commands (tikv <-> tikv). Raft(Tikv_RaftServer) error Snapshot(Tikv_SnapshotServer) error @@ -680,6 +714,27 @@ func _Tikv_Coprocessor_Handler(srv interface{}, ctx context.Context, dec func(in return interceptor(ctx, in, info, handler) } +func _Tikv_CoprocessorStream_Handler(srv interface{}, stream grpc.ServerStream) error { + m := new(coprocessor.Request) + if err := stream.RecvMsg(m); err != nil { + return err + } + return srv.(TikvServer).CoprocessorStream(m, &tikvCoprocessorStreamServer{stream}) +} + +type Tikv_CoprocessorStreamServer interface { + Send(*coprocessor.Response) error + grpc.ServerStream +} + +type tikvCoprocessorStreamServer struct { + grpc.ServerStream +} + +func (x *tikvCoprocessorStreamServer) Send(m *coprocessor.Response) error { + return x.ServerStream.SendMsg(m) +} + func _Tikv_Raft_Handler(srv interface{}, stream grpc.ServerStream) error { return srv.(TikvServer).Raft(&tikvRaftServer{stream}) } @@ -872,6 +927,11 @@ var _Tikv_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{ + { + StreamName: "CoprocessorStream", + Handler: _Tikv_CoprocessorStream_Handler, + ServerStreams: true, + }, { StreamName: "Raft", Handler: _Tikv_Raft_Handler, @@ -889,43 +949,44 @@ var _Tikv_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("tikvpb.proto", fileDescriptorTikvpb) } var fileDescriptorTikvpb = []byte{ - // 597 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x95, 0x4f, 0x6f, 0xd3, 0x30, - 0x18, 0xc6, 0x57, 0xa9, 0x94, 0xcd, 0xdd, 0x04, 0xb8, 0x05, 0xba, 0xb0, 0x55, 0xb0, 0x13, 0xe2, - 0x10, 0xc4, 0x1f, 0x89, 0x03, 0x7f, 0x04, 0x4d, 0xa5, 0x0a, 0xb2, 0x4a, 0x55, 0xba, 0x0b, 0x27, - 0xe4, 0x46, 0xef, 0xd2, 0x28, 0x69, 0x1c, 0x62, 0xd7, 0xd5, 0xbe, 0x09, 0x1f, 0x89, 0x23, 0x77, - 0x2e, 0xa8, 0x7c, 0x11, 0x94, 0xa4, 0x76, 0xec, 0xa6, 0xe5, 0xd4, 0xe4, 0xf7, 0xbc, 0xcf, 0x93, - 0xb7, 0xce, 0x6b, 0x07, 0x1d, 0xf3, 0x30, 0x12, 0xe9, 0xcc, 0x4e, 0x33, 0xca, 0x29, 0x6e, 0x95, - 0x77, 0xd6, 0x3d, 0x9f, 0xa6, 0x19, 0xf5, 0x81, 0x31, 0x9a, 0x95, 0x92, 0x75, 0x12, 0x89, 0x2c, - 0xf5, 0x65, 0xa5, 0xd5, 0xc9, 0xc8, 0x35, 0xff, 0xc6, 0x20, 0x13, 0x90, 0x29, 0xd8, 0x0d, 0x68, - 0x40, 0x8b, 0xcb, 0xe7, 0xf9, 0x55, 0x49, 0x5f, 0xfe, 0x6e, 0xa3, 0xe6, 0x55, 0x18, 0x09, 0xfc, - 0x1a, 0xdd, 0x72, 0xc5, 0x08, 0x38, 0xee, 0xd8, 0x32, 0x6c, 0x04, 0xdc, 0x83, 0xef, 0x4b, 0x60, - 0xdc, 0xea, 0x9a, 0x90, 0xa5, 0x34, 0x61, 0x70, 0x71, 0x80, 0xdf, 0xa0, 0x96, 0x2b, 0xa6, 0x3e, - 0x49, 0x70, 0x55, 0x91, 0xdf, 0x4a, 0xdf, 0xfd, 0x2d, 0xaa, 0x8c, 0x0e, 0x42, 0xae, 0x98, 0x64, - 0xb0, 0xca, 0x42, 0x0e, 0xb8, 0xa7, 0xca, 0x24, 0x92, 0x01, 0xa7, 0x3b, 0x14, 0x15, 0xf2, 0x1e, - 0x1d, 0xba, 0xc2, 0xa1, 0x8b, 0x45, 0xc8, 0xf1, 0x03, 0x55, 0x58, 0x02, 0x19, 0xf0, 0xb0, 0xc6, - 0x4d, 0xfb, 0xe7, 0x45, 0x4a, 0x33, 0xdd, 0x5e, 0x82, 0xba, 0x5d, 0x72, 0x65, 0xff, 0x88, 0x8e, - 0x5c, 0xe1, 0xc4, 0x40, 0x92, 0x65, 0x8a, 0xb5, 0xc7, 0x94, 0x44, 0x06, 0xf4, 0xea, 0x82, 0xb9, - 0x08, 0x03, 0xc2, 0xfd, 0x79, 0xbe, 0xf0, 0x55, 0xa5, 0x44, 0xf5, 0x45, 0xa8, 0x14, 0x15, 0xe2, - 0xa1, 0x3b, 0x9b, 0x10, 0x8f, 0xc6, 0xf1, 0x8c, 0xf8, 0x11, 0x3e, 0x37, 0xeb, 0x25, 0x97, 0x71, - 0xfd, 0x7d, 0xb2, 0xd9, 0x58, 0xfe, 0xc6, 0x2e, 0xa9, 0x1f, 0x69, 0x8d, 0x49, 0x54, 0x6f, 0xac, - 0x52, 0x54, 0xc8, 0x25, 0x3a, 0x71, 0x85, 0x07, 0x8c, 0xc6, 0x02, 0x8a, 0x9c, 0x47, 0xaa, 0x5a, - 0xa3, 0x32, 0xea, 0x6c, 0xb7, 0xa8, 0xd2, 0x5e, 0xa0, 0xa6, 0x2b, 0x46, 0x0e, 0xc6, 0xd5, 0x24, - 0x3a, 0xd2, 0xdb, 0x31, 0x98, 0xd9, 0xc0, 0x10, 0x62, 0xe0, 0xe0, 0x91, 0x24, 0x00, 0xad, 0x01, - 0x8d, 0xd6, 0x1b, 0x30, 0x44, 0x95, 0xf6, 0x16, 0xb5, 0x3c, 0xb2, 0xca, 0x5f, 0x54, 0x35, 0x2b, - 0x25, 0xa8, 0xcf, 0x8a, 0xe4, 0x5b, 0xe6, 0xc9, 0x72, 0xcb, 0x3c, 0x59, 0xee, 0x36, 0x17, 0x5c, - 0x99, 0x87, 0xe8, 0xc8, 0x23, 0xab, 0xb2, 0x2b, 0x7c, 0xaa, 0xd7, 0x6d, 0x3a, 0xdd, 0x44, 0x58, - 0xbb, 0x24, 0x95, 0xf2, 0x01, 0xdd, 0xf6, 0xc8, 0xaa, 0xd8, 0xab, 0xc6, 0xb3, 0xf4, 0xed, 0xda, - 0xab, 0x0b, 0xca, 0xff, 0x0e, 0xb5, 0x9d, 0xea, 0xe0, 0xc1, 0x5d, 0x5b, 0x3f, 0x86, 0xaa, 0xfd, - 0x6e, 0x52, 0x6d, 0x01, 0x9a, 0x1e, 0xb9, 0xe6, 0xd8, 0xb2, 0xcd, 0xb3, 0x29, 0x87, 0x63, 0x60, - 0x8c, 0x04, 0x60, 0x75, 0xb6, 0xb4, 0x21, 0x4d, 0xe0, 0xe2, 0xe0, 0x69, 0x03, 0x7f, 0x42, 0x87, - 0xd3, 0x84, 0xa4, 0x6c, 0x4e, 0x39, 0x3e, 0xdb, 0x2a, 0x92, 0x82, 0x33, 0x5f, 0x26, 0xd1, 0xfe, - 0x88, 0x2f, 0xa8, 0x3d, 0x4d, 0xe3, 0x7c, 0xfb, 0x07, 0x21, 0x4d, 0xb4, 0x49, 0xd0, 0x68, 0x7d, - 0x12, 0x0c, 0x51, 0xfd, 0x97, 0x31, 0x3a, 0x1e, 0x0b, 0xdf, 0x1f, 0x01, 0x1f, 0xdc, 0xb8, 0x70, - 0x83, 0xab, 0x7a, 0x1d, 0xcb, 0xb4, 0xf3, 0x3d, 0xaa, 0x8a, 0xfb, 0x8a, 0xee, 0x2a, 0x65, 0xca, - 0x49, 0xc6, 0xaf, 0x18, 0x7e, 0x5c, 0x37, 0x6d, 0x24, 0x19, 0xfb, 0xe4, 0x3f, 0x15, 0x32, 0x7a, - 0xf0, 0xec, 0xe7, 0xba, 0xdf, 0xf8, 0xb5, 0xee, 0x37, 0xfe, 0xac, 0xfb, 0x8d, 0x1f, 0x7f, 0xfb, - 0x07, 0xa8, 0xe7, 0xd3, 0x85, 0x9d, 0x86, 0x49, 0xe0, 0x93, 0xd4, 0xce, 0x3f, 0x28, 0x76, 0x24, - 0x8a, 0x2f, 0xc1, 0xac, 0x55, 0xfc, 0xbc, 0xfa, 0x17, 0x00, 0x00, 0xff, 0xff, 0x0e, 0x4a, 0xad, - 0x04, 0x75, 0x06, 0x00, 0x00, + // 612 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x95, 0x4f, 0x6f, 0xd3, 0x30, + 0x18, 0xc6, 0x57, 0x69, 0x94, 0xcd, 0xdb, 0x04, 0x73, 0x0b, 0x74, 0x61, 0xab, 0x60, 0x27, 0xc4, + 0x21, 0xfc, 0x95, 0x38, 0x0c, 0x10, 0x34, 0x95, 0x2a, 0xc8, 0x2a, 0x55, 0xe9, 0x2e, 0x9c, 0x90, + 0x1b, 0xbd, 0x4b, 0xa3, 0xa4, 0x71, 0x70, 0x5c, 0x57, 0xfb, 0x26, 0x5c, 0xf9, 0x36, 0x1c, 0xf9, + 0x08, 0xa8, 0x7c, 0x11, 0x94, 0xa4, 0x76, 0xec, 0xa6, 0x45, 0xe2, 0xd4, 0xe4, 0xf7, 0xbc, 0xcf, + 0x93, 0xb7, 0xce, 0x6b, 0x07, 0x1d, 0xf2, 0x30, 0x12, 0xe9, 0xc4, 0x4e, 0x19, 0xe5, 0x14, 0x37, + 0xcb, 0x3b, 0xeb, 0xd8, 0xa7, 0x29, 0xa3, 0x3e, 0x64, 0x19, 0x65, 0xa5, 0x64, 0x1d, 0x45, 0x82, + 0xa5, 0xbe, 0xac, 0xb4, 0x5a, 0x8c, 0x5c, 0xf3, 0xaf, 0x19, 0x30, 0x01, 0x4c, 0xc1, 0x76, 0x40, + 0x03, 0x5a, 0x5c, 0x3e, 0xcb, 0xaf, 0x4a, 0xfa, 0xf2, 0xc7, 0x21, 0xda, 0xbd, 0x0a, 0x23, 0x81, + 0x5f, 0xa3, 0x5b, 0xae, 0x18, 0x00, 0xc7, 0x2d, 0x5b, 0x86, 0x0d, 0x80, 0x7b, 0xf0, 0x6d, 0x0e, + 0x19, 0xb7, 0xda, 0x26, 0xcc, 0x52, 0x9a, 0x64, 0x70, 0xbe, 0x83, 0xdf, 0xa0, 0xa6, 0x2b, 0xc6, + 0x3e, 0x49, 0x70, 0x55, 0x91, 0xdf, 0x4a, 0xdf, 0xbd, 0x35, 0xaa, 0x8c, 0x0e, 0x42, 0xae, 0x18, + 0x31, 0x58, 0xb0, 0x90, 0x03, 0xee, 0xa8, 0x32, 0x89, 0x64, 0xc0, 0xc9, 0x06, 0x45, 0x85, 0xbc, + 0x43, 0x7b, 0xae, 0x70, 0xe8, 0x6c, 0x16, 0x72, 0x7c, 0x5f, 0x15, 0x96, 0x40, 0x06, 0x3c, 0xa8, + 0x71, 0xd3, 0xfe, 0x69, 0x96, 0x52, 0xa6, 0xdb, 0x4b, 0x50, 0xb7, 0x4b, 0xae, 0xec, 0x1f, 0xd0, + 0xbe, 0x2b, 0x9c, 0x18, 0x48, 0x32, 0x4f, 0xb1, 0xf6, 0x98, 0x92, 0xc8, 0x80, 0x4e, 0x5d, 0x30, + 0x17, 0xa1, 0x47, 0xb8, 0x3f, 0xcd, 0x17, 0xbe, 0xaa, 0x94, 0xa8, 0xbe, 0x08, 0x95, 0xa2, 0x42, + 0x3c, 0x74, 0x67, 0x15, 0xe2, 0xd1, 0x38, 0x9e, 0x10, 0x3f, 0xc2, 0x67, 0x66, 0xbd, 0xe4, 0x32, + 0xae, 0xbb, 0x4d, 0x36, 0x1b, 0xcb, 0xdf, 0xd8, 0x25, 0xf5, 0x23, 0xad, 0x31, 0x89, 0xea, 0x8d, + 0x55, 0x8a, 0x0a, 0xb9, 0x44, 0x47, 0xae, 0xf0, 0x20, 0xa3, 0xb1, 0x80, 0x22, 0xe7, 0xa1, 0xaa, + 0xd6, 0xa8, 0x8c, 0x3a, 0xdd, 0x2c, 0xaa, 0xb4, 0x17, 0x68, 0xd7, 0x15, 0x03, 0x07, 0xe3, 0x6a, + 0x12, 0x1d, 0xe9, 0x6d, 0x19, 0xcc, 0x6c, 0xa0, 0x0f, 0x31, 0x70, 0xf0, 0x48, 0x12, 0x80, 0xd6, + 0x80, 0x46, 0xeb, 0x0d, 0x18, 0xa2, 0x4a, 0xbb, 0x40, 0x4d, 0x8f, 0x2c, 0xf2, 0x17, 0x55, 0xcd, + 0x4a, 0x09, 0xea, 0xb3, 0x22, 0xf9, 0x9a, 0x79, 0x34, 0x5f, 0x33, 0x8f, 0xe6, 0x9b, 0xcd, 0x05, + 0x57, 0xe6, 0x3e, 0xda, 0xf7, 0xc8, 0xa2, 0xec, 0x0a, 0x9f, 0xe8, 0x75, 0xab, 0x4e, 0x57, 0x11, + 0xd6, 0x26, 0x49, 0xa5, 0xbc, 0x47, 0xb7, 0x3d, 0xb2, 0x28, 0xf6, 0xaa, 0xf1, 0x2c, 0x7d, 0xbb, + 0x76, 0xea, 0x82, 0xf2, 0xbf, 0x45, 0x07, 0x4e, 0x75, 0xf0, 0xe0, 0xb6, 0xad, 0x1f, 0x43, 0xd5, + 0x7e, 0x37, 0xa9, 0xf6, 0x1f, 0x8e, 0x35, 0xf7, 0x98, 0x33, 0x20, 0xb3, 0xff, 0xcc, 0x78, 0xde, + 0xc0, 0x17, 0x68, 0xd7, 0x23, 0xd7, 0x1c, 0x5b, 0xb6, 0x79, 0xc2, 0xe5, 0x70, 0x08, 0x59, 0x46, + 0x02, 0xb0, 0x5a, 0x6b, 0x5a, 0x9f, 0x26, 0x70, 0xbe, 0xf3, 0xa4, 0x81, 0x3f, 0xa2, 0xbd, 0x71, + 0x42, 0xd2, 0x6c, 0x4a, 0x39, 0x3e, 0x5d, 0x2b, 0x92, 0x82, 0x33, 0x9d, 0x27, 0xd1, 0xf6, 0x88, + 0xcf, 0xe8, 0x60, 0x9c, 0xc6, 0xf9, 0x21, 0x12, 0x84, 0x34, 0xd1, 0xe6, 0x49, 0xa3, 0xf5, 0x79, + 0x32, 0x44, 0xb5, 0x22, 0x43, 0x74, 0x38, 0x14, 0xbe, 0x3f, 0x00, 0xde, 0xbb, 0x71, 0xe1, 0x06, + 0x57, 0xf5, 0x3a, 0x96, 0x69, 0x67, 0x5b, 0x54, 0x15, 0xf7, 0x05, 0xdd, 0x55, 0xca, 0x98, 0x13, + 0xc6, 0xaf, 0x32, 0xfc, 0xa8, 0x6e, 0x5a, 0x49, 0x32, 0xf6, 0xf1, 0x3f, 0x2a, 0x64, 0x74, 0xef, + 0xe9, 0xcf, 0x65, 0xb7, 0xf1, 0x6b, 0xd9, 0x6d, 0xfc, 0x5e, 0x76, 0x1b, 0xdf, 0xff, 0x74, 0x77, + 0x50, 0xc7, 0xa7, 0x33, 0x3b, 0x0d, 0x93, 0xc0, 0x27, 0xa9, 0x9d, 0x7f, 0x96, 0xec, 0x48, 0x14, + 0xdf, 0x93, 0x49, 0xb3, 0xf8, 0x79, 0xf5, 0x37, 0x00, 0x00, 0xff, 0xff, 0xea, 0xa8, 0xe1, 0xc4, + 0xbb, 0x06, 0x00, 0x00, } diff --git a/glide.lock b/glide.lock index 904950cdc235c..146bee86ca2ee 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: 7bfb6e48e6cb30291a652b7d0e58ae695548b2f24385f733b2ace955ba454cdd -updated: 2017-11-21T11:40:10.984214493+08:00 +hash: f8a7e693da73594bf033fe2e6bc2f2a3060da1be1ae52fc81909658c8e55322d +updated: 2017-11-24T18:47:40.651508839+08:00 imports: - name: bitbucket.org/ww/goautoneg version: 75cd24fc2f2c2a2088577d12123ddee5f54e0675 @@ -128,7 +128,7 @@ imports: - leveldb/table - leveldb/util - name: github.com/pingcap/kvproto - version: 3c5b40fb2000acb6b3441d5695cb470a23e8f1b5 + version: e33073e1475021e04c795c3de5e1f4e28baa708a subpackages: - pkg/coprocessor - pkg/eraftpb @@ -207,7 +207,7 @@ imports: subpackages: - metrics - name: github.com/uber/tchannel-go - version: cc230a2942d078a8b01f4a79895dad62e6c572f1 + version: 7bcb33f4bb908c21374f8bfdc9d4b1ebcbb8dab0 subpackages: - atomic - thrift diff --git a/glide.yaml b/glide.yaml index 496bc43aee342..069f26022c528 100644 --- a/glide.yaml +++ b/glide.yaml @@ -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: diff --git a/store/tikv/mock-tikv/rpc.go b/store/tikv/mock-tikv/rpc.go index 907edf6b289f1..129da731171a0 100644 --- a/store/tikv/mock-tikv/rpc.go +++ b/store/tikv/mock-tikv/rpc.go @@ -109,7 +109,7 @@ 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{}, } } @@ -117,9 +117,9 @@ func (h *rpcHandler) checkRequestContext(ctx *kvrpcpb.Context) *errorpb.Error { // 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()), }, } } @@ -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, }, } @@ -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, }, @@ -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, }, } } diff --git a/store/tikv/region_request_test.go b/store/tikv/region_request_test.go index 8eb9b98bbe6d8..8d6ffb91d2e2f 100644 --- a/store/tikv/region_request_test.go +++ b/store/tikv/region_request_test.go @@ -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"