From 7e329e0c9e322cb1aad084db67267d4d5508081f Mon Sep 17 00:00:00 2001 From: Neil Shen Date: Thu, 31 Jan 2019 13:25:32 +0800 Subject: [PATCH] errorpb: rename StaleEpoch to EpochNotMatch (#344) Signed-off-by: Neil Shen --- pkg/errorpb/errorpb.pb.go | 192 ++++++++++---------- proto/errorpb.proto | 8 +- src/coprocessor.rs | 2 +- src/debugpb.rs | 4 +- src/errorpb.rs | 367 +++++++++++++++++++------------------- src/import_kvpb.rs | 2 +- src/import_sstpb.rs | 2 +- src/kvrpcpb.rs | 4 +- src/lib.rs | 10 +- src/metapb.rs | 4 +- src/tikvpb.rs | 2 +- 11 files changed, 300 insertions(+), 297 deletions(-) diff --git a/pkg/errorpb/errorpb.pb.go b/pkg/errorpb/errorpb.pb.go index 6e8253f16..e658563ae 100644 --- a/pkg/errorpb/errorpb.pb.go +++ b/pkg/errorpb/errorpb.pb.go @@ -38,7 +38,7 @@ func (m *NotLeader) Reset() { *m = NotLeader{} } func (m *NotLeader) String() string { return proto.CompactTextString(m) } func (*NotLeader) ProtoMessage() {} func (*NotLeader) Descriptor() ([]byte, []int) { - return fileDescriptor_errorpb_a8ddf3d29af5a9c2, []int{0} + return fileDescriptor_errorpb_4b40b0c6817fafa5, []int{0} } func (m *NotLeader) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -93,7 +93,7 @@ func (m *StoreNotMatch) Reset() { *m = StoreNotMatch{} } func (m *StoreNotMatch) String() string { return proto.CompactTextString(m) } func (*StoreNotMatch) ProtoMessage() {} func (*StoreNotMatch) Descriptor() ([]byte, []int) { - return fileDescriptor_errorpb_a8ddf3d29af5a9c2, []int{1} + return fileDescriptor_errorpb_4b40b0c6817fafa5, []int{1} } func (m *StoreNotMatch) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -147,7 +147,7 @@ func (m *RegionNotFound) Reset() { *m = RegionNotFound{} } func (m *RegionNotFound) String() string { return proto.CompactTextString(m) } func (*RegionNotFound) ProtoMessage() {} func (*RegionNotFound) Descriptor() ([]byte, []int) { - return fileDescriptor_errorpb_a8ddf3d29af5a9c2, []int{2} + return fileDescriptor_errorpb_4b40b0c6817fafa5, []int{2} } func (m *RegionNotFound) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -197,7 +197,7 @@ func (m *KeyNotInRegion) Reset() { *m = KeyNotInRegion{} } func (m *KeyNotInRegion) String() string { return proto.CompactTextString(m) } func (*KeyNotInRegion) ProtoMessage() {} func (*KeyNotInRegion) Descriptor() ([]byte, []int) { - return fileDescriptor_errorpb_a8ddf3d29af5a9c2, []int{3} + return fileDescriptor_errorpb_4b40b0c6817fafa5, []int{3} } func (m *KeyNotInRegion) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -254,25 +254,25 @@ func (m *KeyNotInRegion) GetEndKey() []byte { return nil } -type StaleEpoch struct { - NewRegions []*metapb.Region `protobuf:"bytes,1,rep,name=new_regions,json=newRegions" json:"new_regions,omitempty"` +type EpochNotMatch struct { + CurrentRegions []*metapb.Region `protobuf:"bytes,1,rep,name=current_regions,json=currentRegions" json:"current_regions,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *StaleEpoch) Reset() { *m = StaleEpoch{} } -func (m *StaleEpoch) String() string { return proto.CompactTextString(m) } -func (*StaleEpoch) ProtoMessage() {} -func (*StaleEpoch) Descriptor() ([]byte, []int) { - return fileDescriptor_errorpb_a8ddf3d29af5a9c2, []int{4} +func (m *EpochNotMatch) Reset() { *m = EpochNotMatch{} } +func (m *EpochNotMatch) String() string { return proto.CompactTextString(m) } +func (*EpochNotMatch) ProtoMessage() {} +func (*EpochNotMatch) Descriptor() ([]byte, []int) { + return fileDescriptor_errorpb_4b40b0c6817fafa5, []int{4} } -func (m *StaleEpoch) XXX_Unmarshal(b []byte) error { +func (m *EpochNotMatch) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *StaleEpoch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *EpochNotMatch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_StaleEpoch.Marshal(b, m, deterministic) + return xxx_messageInfo_EpochNotMatch.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalTo(b) @@ -282,21 +282,21 @@ func (m *StaleEpoch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (dst *StaleEpoch) XXX_Merge(src proto.Message) { - xxx_messageInfo_StaleEpoch.Merge(dst, src) +func (dst *EpochNotMatch) XXX_Merge(src proto.Message) { + xxx_messageInfo_EpochNotMatch.Merge(dst, src) } -func (m *StaleEpoch) XXX_Size() int { +func (m *EpochNotMatch) XXX_Size() int { return m.Size() } -func (m *StaleEpoch) XXX_DiscardUnknown() { - xxx_messageInfo_StaleEpoch.DiscardUnknown(m) +func (m *EpochNotMatch) XXX_DiscardUnknown() { + xxx_messageInfo_EpochNotMatch.DiscardUnknown(m) } -var xxx_messageInfo_StaleEpoch proto.InternalMessageInfo +var xxx_messageInfo_EpochNotMatch proto.InternalMessageInfo -func (m *StaleEpoch) GetNewRegions() []*metapb.Region { +func (m *EpochNotMatch) GetCurrentRegions() []*metapb.Region { if m != nil { - return m.NewRegions + return m.CurrentRegions } return nil } @@ -313,7 +313,7 @@ func (m *ServerIsBusy) Reset() { *m = ServerIsBusy{} } func (m *ServerIsBusy) String() string { return proto.CompactTextString(m) } func (*ServerIsBusy) ProtoMessage() {} func (*ServerIsBusy) Descriptor() ([]byte, []int) { - return fileDescriptor_errorpb_a8ddf3d29af5a9c2, []int{5} + return fileDescriptor_errorpb_4b40b0c6817fafa5, []int{5} } func (m *ServerIsBusy) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -366,7 +366,7 @@ func (m *StaleCommand) Reset() { *m = StaleCommand{} } func (m *StaleCommand) String() string { return proto.CompactTextString(m) } func (*StaleCommand) ProtoMessage() {} func (*StaleCommand) Descriptor() ([]byte, []int) { - return fileDescriptor_errorpb_a8ddf3d29af5a9c2, []int{6} + return fileDescriptor_errorpb_4b40b0c6817fafa5, []int{6} } func (m *StaleCommand) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -407,7 +407,7 @@ func (m *RaftEntryTooLarge) Reset() { *m = RaftEntryTooLarge{} } func (m *RaftEntryTooLarge) String() string { return proto.CompactTextString(m) } func (*RaftEntryTooLarge) ProtoMessage() {} func (*RaftEntryTooLarge) Descriptor() ([]byte, []int) { - return fileDescriptor_errorpb_a8ddf3d29af5a9c2, []int{7} + return fileDescriptor_errorpb_4b40b0c6817fafa5, []int{7} } func (m *RaftEntryTooLarge) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -455,7 +455,7 @@ type Error struct { 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"` - StaleEpoch *StaleEpoch `protobuf:"bytes,5,opt,name=stale_epoch,json=staleEpoch" json:"stale_epoch,omitempty"` + EpochNotMatch *EpochNotMatch `protobuf:"bytes,5,opt,name=epoch_not_match,json=epochNotMatch" json:"epoch_not_match,omitempty"` ServerIsBusy *ServerIsBusy `protobuf:"bytes,6,opt,name=server_is_busy,json=serverIsBusy" json:"server_is_busy,omitempty"` 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"` @@ -469,7 +469,7 @@ func (m *Error) Reset() { *m = Error{} } func (m *Error) String() string { return proto.CompactTextString(m) } func (*Error) ProtoMessage() {} func (*Error) Descriptor() ([]byte, []int) { - return fileDescriptor_errorpb_a8ddf3d29af5a9c2, []int{8} + return fileDescriptor_errorpb_4b40b0c6817fafa5, []int{8} } func (m *Error) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -526,9 +526,9 @@ func (m *Error) GetKeyNotInRegion() *KeyNotInRegion { return nil } -func (m *Error) GetStaleEpoch() *StaleEpoch { +func (m *Error) GetEpochNotMatch() *EpochNotMatch { if m != nil { - return m.StaleEpoch + return m.EpochNotMatch } return nil } @@ -566,7 +566,7 @@ func init() { proto.RegisterType((*StoreNotMatch)(nil), "errorpb.StoreNotMatch") proto.RegisterType((*RegionNotFound)(nil), "errorpb.RegionNotFound") proto.RegisterType((*KeyNotInRegion)(nil), "errorpb.KeyNotInRegion") - proto.RegisterType((*StaleEpoch)(nil), "errorpb.StaleEpoch") + proto.RegisterType((*EpochNotMatch)(nil), "errorpb.EpochNotMatch") proto.RegisterType((*ServerIsBusy)(nil), "errorpb.ServerIsBusy") proto.RegisterType((*StaleCommand)(nil), "errorpb.StaleCommand") proto.RegisterType((*RaftEntryTooLarge)(nil), "errorpb.RaftEntryTooLarge") @@ -709,7 +709,7 @@ func (m *KeyNotInRegion) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *StaleEpoch) Marshal() (dAtA []byte, err error) { +func (m *EpochNotMatch) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -719,13 +719,13 @@ func (m *StaleEpoch) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *StaleEpoch) MarshalTo(dAtA []byte) (int, error) { +func (m *EpochNotMatch) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int _ = l - if len(m.NewRegions) > 0 { - for _, msg := range m.NewRegions { + if len(m.CurrentRegions) > 0 { + for _, msg := range m.CurrentRegions { dAtA[i] = 0xa i++ i = encodeVarintErrorpb(dAtA, i, uint64(msg.Size())) @@ -877,11 +877,11 @@ func (m *Error) MarshalTo(dAtA []byte) (int, error) { } i += n4 } - if m.StaleEpoch != nil { + if m.EpochNotMatch != nil { dAtA[i] = 0x2a i++ - i = encodeVarintErrorpb(dAtA, i, uint64(m.StaleEpoch.Size())) - n5, err := m.StaleEpoch.MarshalTo(dAtA[i:]) + i = encodeVarintErrorpb(dAtA, i, uint64(m.EpochNotMatch.Size())) + n5, err := m.EpochNotMatch.MarshalTo(dAtA[i:]) if err != nil { return 0, err } @@ -1009,11 +1009,11 @@ func (m *KeyNotInRegion) Size() (n int) { return n } -func (m *StaleEpoch) Size() (n int) { +func (m *EpochNotMatch) Size() (n int) { var l int _ = l - if len(m.NewRegions) > 0 { - for _, e := range m.NewRegions { + if len(m.CurrentRegions) > 0 { + for _, e := range m.CurrentRegions { l = e.Size() n += 1 + l + sovErrorpb(uint64(l)) } @@ -1083,8 +1083,8 @@ func (m *Error) Size() (n int) { l = m.KeyNotInRegion.Size() n += 1 + l + sovErrorpb(uint64(l)) } - if m.StaleEpoch != nil { - l = m.StaleEpoch.Size() + if m.EpochNotMatch != nil { + l = m.EpochNotMatch.Size() n += 1 + l + sovErrorpb(uint64(l)) } if m.ServerIsBusy != nil { @@ -1547,7 +1547,7 @@ func (m *KeyNotInRegion) Unmarshal(dAtA []byte) error { } return nil } -func (m *StaleEpoch) Unmarshal(dAtA []byte) error { +func (m *EpochNotMatch) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1570,15 +1570,15 @@ func (m *StaleEpoch) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: StaleEpoch: wiretype end group for non-group") + return fmt.Errorf("proto: EpochNotMatch: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: StaleEpoch: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: EpochNotMatch: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field NewRegions", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field CurrentRegions", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -1602,8 +1602,8 @@ func (m *StaleEpoch) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.NewRegions = append(m.NewRegions, &metapb.Region{}) - if err := m.NewRegions[len(m.NewRegions)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.CurrentRegions = append(m.CurrentRegions, &metapb.Region{}) + if err := m.CurrentRegions[len(m.CurrentRegions)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -2027,7 +2027,7 @@ func (m *Error) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 5: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field StaleEpoch", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field EpochNotMatch", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -2051,10 +2051,10 @@ func (m *Error) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.StaleEpoch == nil { - m.StaleEpoch = &StaleEpoch{} + if m.EpochNotMatch == nil { + m.EpochNotMatch = &EpochNotMatch{} } - if err := m.StaleEpoch.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.EpochNotMatch.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -2317,48 +2317,48 @@ var ( ErrIntOverflowErrorpb = fmt.Errorf("proto: integer overflow") ) -func init() { proto.RegisterFile("errorpb.proto", fileDescriptor_errorpb_a8ddf3d29af5a9c2) } - -var fileDescriptor_errorpb_a8ddf3d29af5a9c2 = []byte{ - // 633 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x54, 0x5f, 0x6f, 0xda, 0x3e, - 0x14, 0xfd, 0xa5, 0x7f, 0xa0, 0xb9, 0x84, 0xb4, 0xf5, 0xaf, 0x6b, 0xa3, 0x56, 0x45, 0x55, 0x34, - 0x4d, 0xbc, 0x8c, 0x6a, 0xdd, 0x9e, 0x36, 0x6d, 0xd2, 0x3a, 0x31, 0x09, 0xd1, 0xb2, 0xc9, 0xec, - 0x3d, 0x32, 0xe4, 0x42, 0x23, 0xc0, 0xee, 0x6c, 0xd3, 0x2a, 0xfd, 0x22, 0xdb, 0x47, 0xda, 0xe3, - 0x3e, 0xc2, 0xd4, 0x7d, 0x91, 0xc9, 0x4e, 0x80, 0x84, 0x87, 0x3e, 0x61, 0x1f, 0xdf, 0x73, 0x73, - 0x7c, 0xcf, 0x31, 0x50, 0x47, 0x29, 0x85, 0xbc, 0x1d, 0xb4, 0x6e, 0xa5, 0xd0, 0x82, 0x54, 0xf3, - 0xed, 0xb1, 0x37, 0x43, 0xcd, 0x16, 0xf0, 0xf1, 0xc1, 0x58, 0x8c, 0x85, 0x5d, 0x9e, 0x9b, 0x55, - 0x86, 0x86, 0x3d, 0x70, 0x7b, 0x42, 0x5f, 0x21, 0x8b, 0x51, 0x92, 0x13, 0x70, 0x25, 0x8e, 0x13, - 0xc1, 0xa3, 0x24, 0x0e, 0x9c, 0x33, 0xa7, 0xb9, 0x45, 0x77, 0x32, 0xa0, 0x13, 0x93, 0xe7, 0x50, - 0x99, 0xda, 0xb2, 0x60, 0xe3, 0xcc, 0x69, 0xd6, 0x2e, 0xbc, 0x56, 0xde, 0xfe, 0x2b, 0xa2, 0xa4, - 0xf9, 0x59, 0xc8, 0xa0, 0xde, 0xd7, 0x42, 0x62, 0x4f, 0xe8, 0x6b, 0xa6, 0x87, 0x37, 0xa4, 0x09, - 0x7b, 0x12, 0xbf, 0xcf, 0x51, 0xe9, 0x48, 0x99, 0x83, 0x55, 0x6b, 0x3f, 0xc7, 0x6d, 0x7d, 0x27, - 0x26, 0x2f, 0x60, 0x97, 0x0d, 0xf5, 0x9c, 0x4d, 0x57, 0x85, 0x1b, 0xb6, 0xb0, 0x9e, 0xc1, 0x79, - 0x5d, 0xf8, 0x12, 0x7c, 0x6a, 0x45, 0xf5, 0x84, 0xfe, 0x2c, 0xe6, 0x3c, 0x7e, 0x52, 0x77, 0x38, - 0x07, 0xbf, 0x8b, 0x69, 0x4f, 0xe8, 0x0e, 0xcf, 0x68, 0x64, 0x0f, 0x36, 0x27, 0x98, 0xda, 0x42, - 0x8f, 0x9a, 0x65, 0xb9, 0xc1, 0xc6, 0xda, 0xc5, 0x4f, 0xc0, 0x55, 0x9a, 0x49, 0x1d, 0x19, 0xd2, - 0xa6, 0x25, 0xed, 0x58, 0xa0, 0x8b, 0x29, 0x39, 0x82, 0x2a, 0xf2, 0xd8, 0x1e, 0x6d, 0xd9, 0xa3, - 0x0a, 0xf2, 0xb8, 0x8b, 0x69, 0xf8, 0x1e, 0xa0, 0xaf, 0xd9, 0x14, 0xdb, 0xb7, 0x62, 0x78, 0x43, - 0xce, 0xa1, 0xc6, 0xf1, 0x3e, 0xca, 0x7a, 0xaa, 0xc0, 0x39, 0xdb, 0x6c, 0xd6, 0x2e, 0xfc, 0xc5, - 0x04, 0x33, 0x5d, 0x14, 0x38, 0xde, 0x67, 0x4b, 0x15, 0xb6, 0xc1, 0xeb, 0xa3, 0xbc, 0x43, 0xd9, - 0x51, 0x97, 0x73, 0x95, 0x92, 0x43, 0xa8, 0x48, 0x64, 0x4a, 0x70, 0x2b, 0xdb, 0xa5, 0xf9, 0x8e, - 0x9c, 0x02, 0x0c, 0xd8, 0x70, 0x22, 0x46, 0xa3, 0x68, 0xa6, 0x72, 0xe9, 0x6e, 0x8e, 0x5c, 0xab, - 0xd0, 0x07, 0xcf, 0xaa, 0xf8, 0x24, 0x66, 0x33, 0xc6, 0xe3, 0xf0, 0x0b, 0xec, 0x53, 0x36, 0xd2, - 0x6d, 0xae, 0x65, 0xfa, 0x4d, 0x88, 0x2b, 0x26, 0xc7, 0xf8, 0xb4, 0xed, 0xa7, 0x00, 0x68, 0xaa, - 0x23, 0x95, 0x3c, 0xe0, 0xe2, 0x03, 0x16, 0xe9, 0x27, 0x0f, 0x18, 0xfe, 0xd8, 0x82, 0xed, 0xb6, - 0xc9, 0x1b, 0x09, 0xa0, 0x3a, 0x43, 0xa5, 0xd8, 0x18, 0x73, 0x89, 0x8b, 0x2d, 0x79, 0x05, 0xc0, - 0x85, 0x8e, 0x4a, 0xe9, 0x21, 0xad, 0x45, 0x68, 0x97, 0xf1, 0xa3, 0x2e, 0x5f, 0x26, 0xf1, 0xa3, - 0x49, 0x8d, 0x95, 0x64, 0x98, 0x23, 0xe3, 0xb2, 0x1d, 0x7d, 0xed, 0xe2, 0x68, 0x49, 0x2c, 0x87, - 0xc0, 0xc4, 0xa9, 0x14, 0x8a, 0x4b, 0xd8, 0x9f, 0x60, 0x6a, 0xf9, 0x09, 0xcf, 0x27, 0x6f, 0x3d, - 0x2a, 0xf6, 0x28, 0x27, 0x83, 0xfa, 0x93, 0x72, 0x52, 0xde, 0x40, 0x4d, 0x99, 0xf1, 0x45, 0x68, - 0x5c, 0x0c, 0xb6, 0x2d, 0xfb, 0xff, 0x25, 0x7b, 0x65, 0x30, 0x05, 0xb5, 0x32, 0xfb, 0x1d, 0xf8, - 0xca, 0x7a, 0x17, 0x25, 0x2a, 0x1a, 0xcc, 0x55, 0x1a, 0x54, 0x2c, 0xf1, 0xd9, 0x8a, 0x58, 0xb0, - 0x96, 0x7a, 0xaa, 0x68, 0xf4, 0x5b, 0xa8, 0x67, 0x9f, 0x1c, 0x66, 0x96, 0x05, 0xd5, 0x75, 0x6e, - 0xc1, 0x4f, 0xea, 0xa9, 0xc2, 0x8e, 0x7c, 0x80, 0xdd, 0xec, 0xe9, 0x98, 0x4b, 0xcf, 0xcc, 0xf3, - 0x0b, 0x76, 0x2c, 0xfb, 0xb0, 0xc0, 0x2e, 0x3c, 0x4e, 0x5a, 0x57, 0xa5, 0xb7, 0xda, 0x85, 0x03, - 0xc9, 0x46, 0x3a, 0xca, 0x0c, 0xd7, 0x42, 0x44, 0x53, 0x13, 0x90, 0xc0, 0xb5, 0x4d, 0x8e, 0x57, - 0x93, 0x5f, 0x8f, 0x10, 0xdd, 0x97, 0xeb, 0xd0, 0x65, 0xf8, 0xeb, 0xb1, 0xe1, 0xfc, 0x7e, 0x6c, - 0x38, 0x7f, 0x1e, 0x1b, 0xce, 0xcf, 0xbf, 0x8d, 0xff, 0x60, 0x4f, 0xc8, 0x71, 0x4b, 0x27, 0x93, - 0xbb, 0xd6, 0xe4, 0xce, 0xfe, 0xfb, 0x0c, 0x2a, 0xf6, 0xe7, 0xf5, 0xbf, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x85, 0xfd, 0x82, 0x54, 0xc2, 0x04, 0x00, 0x00, +func init() { proto.RegisterFile("errorpb.proto", fileDescriptor_errorpb_4b40b0c6817fafa5) } + +var fileDescriptor_errorpb_4b40b0c6817fafa5 = []byte{ + // 637 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, 0x24, 0xdb, 0xa2, 0xb1, 0x45, 0x9b, 0x56, 0x4d, 0x11, 0x42, + 0xbd, 0xa1, 0x88, 0x71, 0x81, 0x04, 0x12, 0x12, 0x43, 0x45, 0x54, 0xdd, 0x0a, 0x72, 0xb9, 0x8f, + 0xdc, 0xe6, 0xb4, 0x8b, 0xda, 0xda, 0xc3, 0x76, 0x26, 0x65, 0x4f, 0xc2, 0x53, 0xf0, 0x1c, 0x5c, + 0xf2, 0x08, 0xa8, 0xbc, 0x08, 0xb2, 0x93, 0xa6, 0x4d, 0x91, 0x76, 0x55, 0x9f, 0xcf, 0xe7, 0xfb, + 0x7a, 0xec, 0xef, 0x73, 0xc0, 0x45, 0x21, 0xb8, 0xb8, 0x1b, 0xb6, 0xef, 0x04, 0x57, 0xdc, 0xaf, + 0x17, 0xe5, 0xa9, 0x33, 0x47, 0x45, 0x97, 0xf0, 0xe9, 0xd1, 0x84, 0x4f, 0xb8, 0x59, 0xbe, 0xd4, + 0xab, 0x1c, 0x0d, 0xfb, 0x60, 0xf7, 0xb9, 0xba, 0x46, 0x1a, 0xa3, 0xf0, 0xcf, 0xc0, 0x16, 0x38, + 0x49, 0x38, 0x8b, 0x92, 0x38, 0xb0, 0x2e, 0xac, 0xd6, 0x0e, 0xd9, 0xcb, 0x81, 0x6e, 0xec, 0x3f, + 0x83, 0xda, 0xcc, 0xb4, 0x05, 0x5b, 0x17, 0x56, 0xab, 0x71, 0xe9, 0xb4, 0x0b, 0xf9, 0xaf, 0x88, + 0x82, 0x14, 0x7b, 0x21, 0x05, 0x77, 0xa0, 0xb8, 0xc0, 0x3e, 0x57, 0x37, 0x54, 0x8d, 0x6e, 0xfd, + 0x16, 0x1c, 0x08, 0xfc, 0x9e, 0xa2, 0x54, 0x91, 0xd4, 0x1b, 0x2b, 0x69, 0xaf, 0xc0, 0x4d, 0x7f, + 0x37, 0xf6, 0x9f, 0xc3, 0x3e, 0x1d, 0xa9, 0x94, 0xce, 0x56, 0x8d, 0x5b, 0xa6, 0xd1, 0xcd, 0xe1, + 0xa2, 0x2f, 0x7c, 0x01, 0x1e, 0x31, 0x43, 0xf5, 0xb9, 0xfa, 0xc4, 0x53, 0x16, 0x3f, 0x3a, 0x77, + 0x98, 0x82, 0xd7, 0xc3, 0xac, 0xcf, 0x55, 0x97, 0xe5, 0x34, 0xff, 0x00, 0xb6, 0xa7, 0x98, 0x99, + 0x46, 0x87, 0xe8, 0x65, 0x55, 0x60, 0x6b, 0xe3, 0xe0, 0x67, 0x60, 0x4b, 0x45, 0x85, 0x8a, 0x34, + 0x69, 0xdb, 0x90, 0xf6, 0x0c, 0xd0, 0xc3, 0xcc, 0x3f, 0x81, 0x3a, 0xb2, 0xd8, 0x6c, 0xed, 0x98, + 0xad, 0x1a, 0xb2, 0xb8, 0x87, 0x59, 0xf8, 0x19, 0xdc, 0xce, 0x1d, 0x1f, 0xdd, 0x96, 0x17, 0xf1, + 0x06, 0xf6, 0x47, 0xa9, 0x10, 0xc8, 0x54, 0x94, 0x4b, 0xcb, 0xc0, 0xba, 0xd8, 0x6e, 0x35, 0x2e, + 0xbd, 0xe5, 0x45, 0xe6, 0xe3, 0x11, 0xaf, 0x68, 0xcb, 0x4b, 0x19, 0x76, 0xc0, 0x19, 0xa0, 0xb8, + 0x47, 0xd1, 0x95, 0x57, 0xa9, 0xcc, 0xfc, 0x63, 0xa8, 0x09, 0xa4, 0x92, 0x33, 0x73, 0x02, 0x9b, + 0x14, 0x95, 0x7f, 0x0e, 0x30, 0xa4, 0xa3, 0x29, 0x1f, 0x8f, 0xa3, 0xb9, 0x2c, 0x4e, 0x61, 0x17, + 0xc8, 0x8d, 0x0c, 0x3d, 0x70, 0x06, 0x8a, 0xce, 0xf0, 0x23, 0x9f, 0xcf, 0x29, 0x8b, 0xc3, 0x2f, + 0x70, 0x48, 0xe8, 0x58, 0x75, 0x98, 0x12, 0xd9, 0x37, 0xce, 0xaf, 0xa9, 0x98, 0xe0, 0xe3, 0x09, + 0x38, 0x07, 0x40, 0xdd, 0x1d, 0xc9, 0xe4, 0x01, 0x97, 0x7f, 0x60, 0x90, 0x41, 0xf2, 0x80, 0xe1, + 0xcf, 0x1d, 0xd8, 0xed, 0xe8, 0xe8, 0xf9, 0x01, 0xd4, 0xe7, 0x28, 0x25, 0x9d, 0x60, 0x31, 0xe2, + 0xb2, 0xf4, 0x5f, 0x01, 0x30, 0xae, 0xa2, 0x4a, 0x90, 0xfc, 0xf6, 0x32, 0xbf, 0x65, 0x12, 0x89, + 0xcd, 0xca, 0x50, 0x7e, 0xd0, 0x01, 0x32, 0x23, 0x69, 0xe6, 0x58, 0x1b, 0x6e, 0x5c, 0x68, 0x5c, + 0x9e, 0x94, 0xc4, 0x6a, 0x1e, 0x74, 0xb2, 0x2a, 0xf9, 0xb8, 0x82, 0xc3, 0x29, 0x66, 0x86, 0x9f, + 0xb0, 0xe2, 0xf6, 0x8d, 0x5d, 0xeb, 0x1a, 0xd5, 0x90, 0x10, 0x6f, 0x5a, 0x0d, 0xcd, 0x7b, 0xd8, + 0x47, 0xed, 0xa7, 0x51, 0x99, 0x6b, 0x47, 0x83, 0x5d, 0xa3, 0x70, 0x5c, 0x2a, 0x54, 0xfc, 0x26, + 0x2e, 0x56, 0xec, 0x7f, 0x07, 0x9e, 0x34, 0x2e, 0x46, 0x89, 0x8c, 0x86, 0xa9, 0xcc, 0x82, 0x9a, + 0xa1, 0x3f, 0x2d, 0xe9, 0xeb, 0x26, 0x13, 0x47, 0xae, 0x5b, 0xfe, 0x16, 0x5c, 0xa9, 0xbd, 0x8b, + 0x46, 0xb9, 0x79, 0x41, 0x7d, 0x93, 0xbb, 0xe6, 0x2c, 0x71, 0xe4, 0x5a, 0xa5, 0x07, 0xcf, 0xdf, + 0xd3, 0x6a, 0xf0, 0xbd, 0x8d, 0xc1, 0x2b, 0x2f, 0x96, 0xb8, 0xb2, 0xf2, 0x80, 0x7b, 0x70, 0x24, + 0xe8, 0x58, 0x45, 0xb9, 0xf5, 0x8a, 0xf3, 0x68, 0xa6, 0xa3, 0x12, 0xd8, 0x46, 0xe4, 0x74, 0xe5, + 0xc1, 0x66, 0x98, 0xc8, 0xa1, 0xf8, 0x0f, 0x6a, 0xe4, 0xc7, 0x30, 0x57, 0x73, 0x15, 0xfe, 0x5a, + 0x34, 0xad, 0xdf, 0x8b, 0xa6, 0xf5, 0x67, 0xd1, 0xb4, 0x7e, 0xfc, 0x6d, 0x3e, 0x81, 0x03, 0x2e, + 0x26, 0x6d, 0x95, 0x4c, 0xef, 0xdb, 0xd3, 0x7b, 0xf3, 0x7d, 0x1a, 0xd6, 0xcc, 0xcf, 0xeb, 0x7f, + 0x01, 0x00, 0x00, 0xff, 0xff, 0x51, 0x77, 0xa0, 0xcc, 0xe4, 0x04, 0x00, 0x00, } diff --git a/proto/errorpb.proto b/proto/errorpb.proto index 3e18a77ce..680aa5f68 100644 --- a/proto/errorpb.proto +++ b/proto/errorpb.proto @@ -31,8 +31,8 @@ message KeyNotInRegion { bytes end_key = 4; } -message StaleEpoch { - repeated metapb.Region new_regions = 1; +message EpochNotMatch { + repeated metapb.Region current_regions = 1; } message ServerIsBusy { @@ -49,11 +49,13 @@ message RaftEntryTooLarge { } message Error { + reserved "stale_epoch"; + string message = 1; NotLeader not_leader = 2; RegionNotFound region_not_found = 3; KeyNotInRegion key_not_in_region = 4; - StaleEpoch stale_epoch = 5; + EpochNotMatch epoch_not_match = 5; ServerIsBusy server_is_busy = 6; StaleCommand stale_command = 7; StoreNotMatch store_not_match = 8; diff --git a/src/coprocessor.rs b/src/coprocessor.rs index 6f892be9b..2dc80c53c 100644 --- a/src/coprocessor.rs +++ b/src/coprocessor.rs @@ -978,7 +978,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\ locked\x12\x1f\n\x0bother_error\x18\x04\x20\x01(\tR\notherError\x12+\n\ \x05range\x18\x05\x20\x01(\x0b2\x15.coprocessor.KeyRangeR\x05range\x127\ \n\x0cexec_details\x18\x06\x20\x01(\x0b2\x14.kvrpcpb.ExecDetailsR\x0bexe\ - cDetailsB\x1e\n\x10org.tikv.kvproto\xe0\xe2\x1e\x01\xd0\xe2\x1e\x01\xc8\ + cDetailsB\x1e\n\x10org.tikv.kvproto\xd0\xe2\x1e\x01\xe0\xe2\x1e\x01\xc8\ \xe2\x1e\x01J\xef\x0b\n\x06\x12\x04\0\0!\x01\n\x08\n\x01\x0c\x12\x03\0\0\ \x12\n\x08\n\x01\x02\x12\x03\x01\x08\x13\n\t\n\x02\x03\0\x12\x03\x03\x07\ \x16\n\t\n\x02\x03\x01\x12\x03\x04\x07\x16\n\t\n\x02\x03\x02\x12\x03\x05\ diff --git a/src/debugpb.rs b/src/debugpb.rs index f267df03b..93d880629 100644 --- a/src/debugpb.rs +++ b/src/debugpb.rs @@ -5749,8 +5749,8 @@ static file_descriptor_proto_data: &'static [u8] = b"\ e\"\0\x12Y\n\x10ModifyTikvConfig\x12\x20.debugpb.ModifyTikvConfigRequest\ \x1a!.debugpb.ModifyTikvConfigResponse\"\0\x12b\n\x13GetRegionProperties\ \x12#.debugpb.GetRegionPropertiesRequest\x1a$.debugpb.GetRegionPropertie\ - sResponse\"\0B\x1e\n\x10org.tikv.kvproto\xc8\xe2\x1e\x01\xd0\xe2\x1e\x01\ - \xe0\xe2\x1e\x01J\xe29\n\x07\x12\x05\0\0\xe3\x01\x01\n\x08\n\x01\x0c\x12\ + sResponse\"\0B\x1e\n\x10org.tikv.kvproto\xd0\xe2\x1e\x01\xe0\xe2\x1e\x01\ + \xc8\xe2\x1e\x01J\xe29\n\x07\x12\x05\0\0\xe3\x01\x01\n\x08\n\x01\x0c\x12\ \x03\0\0\x12\n\x08\n\x01\x02\x12\x03\x01\x08\x0f\n\t\n\x02\x03\0\x12\x03\ \x03\x07\x16\n\t\n\x02\x03\x01\x12\x03\x04\x07\x16\n\t\n\x02\x03\x02\x12\ \x03\x05\x07\x1c\n\t\n\x02\x03\x03\x12\x03\x06\x07\x1d\n\x08\n\x01\x08\ diff --git a/src/errorpb.rs b/src/errorpb.rs index b26edbd31..709541777 100644 --- a/src/errorpb.rs +++ b/src/errorpb.rs @@ -864,48 +864,48 @@ impl ::protobuf::reflect::ProtobufValue for KeyNotInRegion { } #[derive(PartialEq,Clone,Default)] -pub struct StaleEpoch { +pub struct EpochNotMatch { // message fields - pub new_regions: ::protobuf::RepeatedField, + pub current_regions: ::protobuf::RepeatedField, // special fields pub unknown_fields: ::protobuf::UnknownFields, cached_size: ::protobuf::CachedSize, } -impl StaleEpoch { - pub fn new() -> StaleEpoch { +impl EpochNotMatch { + pub fn new() -> EpochNotMatch { ::std::default::Default::default() } - // repeated .metapb.Region new_regions = 1; + // repeated .metapb.Region current_regions = 1; - pub fn clear_new_regions(&mut self) { - self.new_regions.clear(); + pub fn clear_current_regions(&mut self) { + self.current_regions.clear(); } // Param is passed by value, moved - pub fn set_new_regions(&mut self, v: ::protobuf::RepeatedField) { - self.new_regions = v; + pub fn set_current_regions(&mut self, v: ::protobuf::RepeatedField) { + self.current_regions = v; } // Mutable pointer to the field. - pub fn mut_new_regions(&mut self) -> &mut ::protobuf::RepeatedField { - &mut self.new_regions + pub fn mut_current_regions(&mut self) -> &mut ::protobuf::RepeatedField { + &mut self.current_regions } // Take field - pub fn take_new_regions(&mut self) -> ::protobuf::RepeatedField { - ::std::mem::replace(&mut self.new_regions, ::protobuf::RepeatedField::new()) + pub fn take_current_regions(&mut self) -> ::protobuf::RepeatedField { + ::std::mem::replace(&mut self.current_regions, ::protobuf::RepeatedField::new()) } - pub fn get_new_regions(&self) -> &[super::metapb::Region] { - &self.new_regions + pub fn get_current_regions(&self) -> &[super::metapb::Region] { + &self.current_regions } } -impl ::protobuf::Message for StaleEpoch { +impl ::protobuf::Message for EpochNotMatch { fn is_initialized(&self) -> bool { - for v in &self.new_regions { + for v in &self.current_regions { if !v.is_initialized() { return false; } @@ -918,7 +918,7 @@ impl ::protobuf::Message for StaleEpoch { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.new_regions)?; + ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.current_regions)?; }, _ => { ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; @@ -932,7 +932,7 @@ impl ::protobuf::Message for StaleEpoch { #[allow(unused_variables)] fn compute_size(&self) -> u32 { let mut my_size = 0; - for value in &self.new_regions { + for value in &self.current_regions { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; }; @@ -942,7 +942,7 @@ impl ::protobuf::Message for StaleEpoch { } fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { - for v in &self.new_regions { + for v in &self.current_regions { os.write_tag(1, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; @@ -977,8 +977,8 @@ impl ::protobuf::Message for StaleEpoch { Self::descriptor_static() } - fn new() -> StaleEpoch { - StaleEpoch::new() + fn new() -> EpochNotMatch { + EpochNotMatch::new() } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { @@ -990,12 +990,12 @@ impl ::protobuf::Message for StaleEpoch { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "new_regions", - |m: &StaleEpoch| { &m.new_regions }, - |m: &mut StaleEpoch| { &mut m.new_regions }, + "current_regions", + |m: &EpochNotMatch| { &m.current_regions }, + |m: &mut EpochNotMatch| { &mut m.current_regions }, )); - ::protobuf::reflect::MessageDescriptor::new::( - "StaleEpoch", + ::protobuf::reflect::MessageDescriptor::new::( + "EpochNotMatch", fields, file_descriptor_proto() ) @@ -1003,31 +1003,31 @@ impl ::protobuf::Message for StaleEpoch { } } - fn default_instance() -> &'static StaleEpoch { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { + fn default_instance() -> &'static EpochNotMatch { + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const StaleEpoch, + ptr: 0 as *const EpochNotMatch, }; unsafe { - instance.get(StaleEpoch::new) + instance.get(EpochNotMatch::new) } } } -impl ::protobuf::Clear for StaleEpoch { +impl ::protobuf::Clear for EpochNotMatch { fn clear(&mut self) { - self.clear_new_regions(); + self.clear_current_regions(); self.unknown_fields.clear(); } } -impl ::std::fmt::Debug for StaleEpoch { +impl ::std::fmt::Debug for EpochNotMatch { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } -impl ::protobuf::reflect::ProtobufValue for StaleEpoch { +impl ::protobuf::reflect::ProtobufValue for EpochNotMatch { fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { ::protobuf::reflect::ProtobufValueRef::Message(self) } @@ -1549,7 +1549,7 @@ pub struct Error { pub not_leader: ::protobuf::SingularPtrField, pub region_not_found: ::protobuf::SingularPtrField, pub key_not_in_region: ::protobuf::SingularPtrField, - pub stale_epoch: ::protobuf::SingularPtrField, + pub epoch_not_match: ::protobuf::SingularPtrField, pub server_is_busy: ::protobuf::SingularPtrField, pub stale_command: ::protobuf::SingularPtrField, pub store_not_match: ::protobuf::SingularPtrField, @@ -1689,37 +1689,37 @@ impl Error { self.key_not_in_region.as_ref().unwrap_or_else(|| KeyNotInRegion::default_instance()) } - // .errorpb.StaleEpoch stale_epoch = 5; + // .errorpb.EpochNotMatch epoch_not_match = 5; - pub fn clear_stale_epoch(&mut self) { - self.stale_epoch.clear(); + pub fn clear_epoch_not_match(&mut self) { + self.epoch_not_match.clear(); } - pub fn has_stale_epoch(&self) -> bool { - self.stale_epoch.is_some() + pub fn has_epoch_not_match(&self) -> bool { + self.epoch_not_match.is_some() } // Param is passed by value, moved - pub fn set_stale_epoch(&mut self, v: StaleEpoch) { - self.stale_epoch = ::protobuf::SingularPtrField::some(v); + pub fn set_epoch_not_match(&mut self, v: EpochNotMatch) { + self.epoch_not_match = ::protobuf::SingularPtrField::some(v); } // Mutable pointer to the field. // If field is not initialized, it is initialized with default value first. - pub fn mut_stale_epoch(&mut self) -> &mut StaleEpoch { - if self.stale_epoch.is_none() { - self.stale_epoch.set_default(); + pub fn mut_epoch_not_match(&mut self) -> &mut EpochNotMatch { + if self.epoch_not_match.is_none() { + self.epoch_not_match.set_default(); } - self.stale_epoch.as_mut().unwrap() + self.epoch_not_match.as_mut().unwrap() } // Take field - pub fn take_stale_epoch(&mut self) -> StaleEpoch { - self.stale_epoch.take().unwrap_or_else(|| StaleEpoch::new()) + pub fn take_epoch_not_match(&mut self) -> EpochNotMatch { + self.epoch_not_match.take().unwrap_or_else(|| EpochNotMatch::new()) } - pub fn get_stale_epoch(&self) -> &StaleEpoch { - self.stale_epoch.as_ref().unwrap_or_else(|| StaleEpoch::default_instance()) + pub fn get_epoch_not_match(&self) -> &EpochNotMatch { + self.epoch_not_match.as_ref().unwrap_or_else(|| EpochNotMatch::default_instance()) } // .errorpb.ServerIsBusy server_is_busy = 6; @@ -1872,7 +1872,7 @@ impl ::protobuf::Message for Error { return false; } }; - for v in &self.stale_epoch { + for v in &self.epoch_not_match { if !v.is_initialized() { return false; } @@ -1917,7 +1917,7 @@ impl ::protobuf::Message for Error { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.key_not_in_region)?; }, 5 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.stale_epoch)?; + ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.epoch_not_match)?; }, 6 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.server_is_busy)?; @@ -1958,7 +1958,7 @@ impl ::protobuf::Message for Error { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; } - if let Some(ref v) = self.stale_epoch.as_ref() { + if let Some(ref v) = self.epoch_not_match.as_ref() { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; } @@ -2002,7 +2002,7 @@ impl ::protobuf::Message for Error { os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; } - if let Some(ref v) = self.stale_epoch.as_ref() { + if let Some(ref v) = self.epoch_not_match.as_ref() { os.write_tag(5, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; @@ -2089,10 +2089,10 @@ impl ::protobuf::Message for Error { |m: &Error| { &m.key_not_in_region }, |m: &mut Error| { &mut m.key_not_in_region }, )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "stale_epoch", - |m: &Error| { &m.stale_epoch }, - |m: &mut Error| { &mut m.stale_epoch }, + fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( + "epoch_not_match", + |m: &Error| { &m.epoch_not_match }, + |m: &mut Error| { &mut m.epoch_not_match }, )); fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( "server_is_busy", @@ -2140,7 +2140,7 @@ impl ::protobuf::Clear for Error { self.clear_not_leader(); self.clear_region_not_found(); self.clear_key_not_in_region(); - self.clear_stale_epoch(); + self.clear_epoch_not_match(); self.clear_server_is_busy(); self.clear_stale_command(); self.clear_store_not_match(); @@ -2171,129 +2171,130 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x04R\x08regionId\"u\n\x0eKeyNotInRegion\x12\x10\n\x03key\x18\x01\x20\ \x01(\x0cR\x03key\x12\x1b\n\tregion_id\x18\x02\x20\x01(\x04R\x08regionId\ \x12\x1b\n\tstart_key\x18\x03\x20\x01(\x0cR\x08startKey\x12\x17\n\x07end\ - _key\x18\x04\x20\x01(\x0cR\x06endKey\"=\n\nStaleEpoch\x12/\n\x0bnew_regi\ - ons\x18\x01\x20\x03(\x0b2\x0e.metapb.RegionR\nnewRegions\"E\n\x0cServerI\ - sBusy\x12\x16\n\x06reason\x18\x01\x20\x01(\tR\x06reason\x12\x1d\n\nbacko\ - ff_ms\x18\x02\x20\x01(\x04R\tbackoffMs\"\x0e\n\x0cStaleCommand\"O\n\x11R\ - aftEntryTooLarge\x12\x1b\n\tregion_id\x18\x01\x20\x01(\x04R\x08regionId\ - \x12\x1d\n\nentry_size\x18\x02\x20\x01(\x04R\tentrySize\"\x97\x04\n\x05E\ - rror\x12\x18\n\x07message\x18\x01\x20\x01(\tR\x07message\x121\n\nnot_lea\ - der\x18\x02\x20\x01(\x0b2\x12.errorpb.NotLeaderR\tnotLeader\x12A\n\x10re\ - gion_not_found\x18\x03\x20\x01(\x0b2\x17.errorpb.RegionNotFoundR\x0eregi\ - onNotFound\x12B\n\x11key_not_in_region\x18\x04\x20\x01(\x0b2\x17.errorpb\ - .KeyNotInRegionR\x0ekeyNotInRegion\x124\n\x0bstale_epoch\x18\x05\x20\x01\ - (\x0b2\x13.errorpb.StaleEpochR\nstaleEpoch\x12;\n\x0eserver_is_busy\x18\ - \x06\x20\x01(\x0b2\x15.errorpb.ServerIsBusyR\x0cserverIsBusy\x12:\n\rsta\ - le_command\x18\x07\x20\x01(\x0b2\x15.errorpb.StaleCommandR\x0cstaleComma\ - nd\x12>\n\x0fstore_not_match\x18\x08\x20\x01(\x0b2\x16.errorpb.StoreNotM\ - atchR\rstoreNotMatch\x12K\n\x14raft_entry_too_large\x18\t\x20\x01(\x0b2\ - \x1a.errorpb.RaftEntryTooLargeR\x11raftEntryTooLargeB\x1e\n\x10org.tikv.\ - kvproto\xc8\xe2\x1e\x01\xe0\xe2\x1e\x01\xd0\xe2\x1e\x01J\x9b\x11\n\x06\ - \x12\x04\0\0<\x01\n\x08\n\x01\x0c\x12\x03\0\0\x12\n\x08\n\x01\x02\x12\ - \x03\x01\x08\x0f\n\t\n\x02\x03\0\x12\x03\x03\x07\x15\n\t\n\x02\x03\x01\ - \x12\x03\x04\x07\x1d\n\x08\n\x01\x08\x12\x03\x06\0(\n\x0b\n\x04\x08\xe7\ - \x07\0\x12\x03\x06\0(\n\x0c\n\x05\x08\xe7\x07\0\x02\x12\x03\x06\x07\x20\ - \n\r\n\x06\x08\xe7\x07\0\x02\0\x12\x03\x06\x07\x20\n\x0e\n\x07\x08\xe7\ - \x07\0\x02\0\x01\x12\x03\x06\x08\x1f\n\x0c\n\x05\x08\xe7\x07\0\x03\x12\ - \x03\x06#'\n\x08\n\x01\x08\x12\x03\x07\0$\n\x0b\n\x04\x08\xe7\x07\x01\ - \x12\x03\x07\0$\n\x0c\n\x05\x08\xe7\x07\x01\x02\x12\x03\x07\x07\x1c\n\r\ - \n\x06\x08\xe7\x07\x01\x02\0\x12\x03\x07\x07\x1c\n\x0e\n\x07\x08\xe7\x07\ - \x01\x02\0\x01\x12\x03\x07\x08\x1b\n\x0c\n\x05\x08\xe7\x07\x01\x03\x12\ - \x03\x07\x1f#\n\x08\n\x01\x08\x12\x03\x08\0*\n\x0b\n\x04\x08\xe7\x07\x02\ - \x12\x03\x08\0*\n\x0c\n\x05\x08\xe7\x07\x02\x02\x12\x03\x08\x07\"\n\r\n\ - \x06\x08\xe7\x07\x02\x02\0\x12\x03\x08\x07\"\n\x0e\n\x07\x08\xe7\x07\x02\ - \x02\0\x01\x12\x03\x08\x08!\n\x0c\n\x05\x08\xe7\x07\x02\x03\x12\x03\x08%\ - )\n\x08\n\x01\x08\x12\x03\n\0)\n\x0b\n\x04\x08\xe7\x07\x03\x12\x03\n\0)\ - \n\x0c\n\x05\x08\xe7\x07\x03\x02\x12\x03\n\x07\x13\n\r\n\x06\x08\xe7\x07\ - \x03\x02\0\x12\x03\n\x07\x13\n\x0e\n\x07\x08\xe7\x07\x03\x02\0\x01\x12\ - \x03\n\x07\x13\n\x0c\n\x05\x08\xe7\x07\x03\x07\x12\x03\n\x16(\n\n\n\x02\ - \x04\0\x12\x04\x0c\0\x0f\x01\n\n\n\x03\x04\0\x01\x12\x03\x0c\x08\x11\n\ - \x0b\n\x04\x04\0\x02\0\x12\x03\r\x04\x19\n\r\n\x05\x04\0\x02\0\x04\x12\ - \x04\r\x04\x0c\x13\n\x0c\n\x05\x04\0\x02\0\x05\x12\x03\r\x04\n\n\x0c\n\ - \x05\x04\0\x02\0\x01\x12\x03\r\x0b\x14\n\x0c\n\x05\x04\0\x02\0\x03\x12\ - \x03\r\x17\x18\n\x0b\n\x04\x04\0\x02\x01\x12\x03\x0e\x04\x1b\n\r\n\x05\ - \x04\0\x02\x01\x04\x12\x04\x0e\x04\r\x19\n\x0c\n\x05\x04\0\x02\x01\x06\ - \x12\x03\x0e\x04\x0f\n\x0c\n\x05\x04\0\x02\x01\x01\x12\x03\x0e\x10\x16\n\ - \x0c\n\x05\x04\0\x02\x01\x03\x12\x03\x0e\x19\x1a\n\n\n\x02\x04\x01\x12\ - \x04\x11\0\x14\x01\n\n\n\x03\x04\x01\x01\x12\x03\x11\x08\x15\n\x0b\n\x04\ - \x04\x01\x02\0\x12\x03\x12\x04\x20\n\r\n\x05\x04\x01\x02\0\x04\x12\x04\ - \x12\x04\x11\x17\n\x0c\n\x05\x04\x01\x02\0\x05\x12\x03\x12\x04\n\n\x0c\n\ - \x05\x04\x01\x02\0\x01\x12\x03\x12\x0b\x1b\n\x0c\n\x05\x04\x01\x02\0\x03\ - \x12\x03\x12\x1e\x1f\n\x0b\n\x04\x04\x01\x02\x01\x12\x03\x13\x04\x1f\n\r\ - \n\x05\x04\x01\x02\x01\x04\x12\x04\x13\x04\x12\x20\n\x0c\n\x05\x04\x01\ - \x02\x01\x05\x12\x03\x13\x04\n\n\x0c\n\x05\x04\x01\x02\x01\x01\x12\x03\ - \x13\x0b\x1a\n\x0c\n\x05\x04\x01\x02\x01\x03\x12\x03\x13\x1d\x1e\n\n\n\ - \x02\x04\x02\x12\x04\x16\0\x18\x01\n\n\n\x03\x04\x02\x01\x12\x03\x16\x08\ - \x16\n\x0b\n\x04\x04\x02\x02\0\x12\x03\x17\x04\x19\n\r\n\x05\x04\x02\x02\ - \0\x04\x12\x04\x17\x04\x16\x18\n\x0c\n\x05\x04\x02\x02\0\x05\x12\x03\x17\ - \x04\n\n\x0c\n\x05\x04\x02\x02\0\x01\x12\x03\x17\x0b\x14\n\x0c\n\x05\x04\ - \x02\x02\0\x03\x12\x03\x17\x17\x18\n\n\n\x02\x04\x03\x12\x04\x1a\0\x1f\ - \x01\n\n\n\x03\x04\x03\x01\x12\x03\x1a\x08\x16\n\x0b\n\x04\x04\x03\x02\0\ - \x12\x03\x1b\x04\x12\n\r\n\x05\x04\x03\x02\0\x04\x12\x04\x1b\x04\x1a\x18\ - \n\x0c\n\x05\x04\x03\x02\0\x05\x12\x03\x1b\x04\t\n\x0c\n\x05\x04\x03\x02\ - \0\x01\x12\x03\x1b\n\r\n\x0c\n\x05\x04\x03\x02\0\x03\x12\x03\x1b\x10\x11\ - \n\x0b\n\x04\x04\x03\x02\x01\x12\x03\x1c\x04\x19\n\r\n\x05\x04\x03\x02\ - \x01\x04\x12\x04\x1c\x04\x1b\x12\n\x0c\n\x05\x04\x03\x02\x01\x05\x12\x03\ - \x1c\x04\n\n\x0c\n\x05\x04\x03\x02\x01\x01\x12\x03\x1c\x0b\x14\n\x0c\n\ - \x05\x04\x03\x02\x01\x03\x12\x03\x1c\x17\x18\n\x0b\n\x04\x04\x03\x02\x02\ - \x12\x03\x1d\x04\x18\n\r\n\x05\x04\x03\x02\x02\x04\x12\x04\x1d\x04\x1c\ - \x19\n\x0c\n\x05\x04\x03\x02\x02\x05\x12\x03\x1d\x04\t\n\x0c\n\x05\x04\ - \x03\x02\x02\x01\x12\x03\x1d\n\x13\n\x0c\n\x05\x04\x03\x02\x02\x03\x12\ - \x03\x1d\x16\x17\n\x0b\n\x04\x04\x03\x02\x03\x12\x03\x1e\x04\x16\n\r\n\ - \x05\x04\x03\x02\x03\x04\x12\x04\x1e\x04\x1d\x18\n\x0c\n\x05\x04\x03\x02\ - \x03\x05\x12\x03\x1e\x04\t\n\x0c\n\x05\x04\x03\x02\x03\x01\x12\x03\x1e\n\ - \x11\n\x0c\n\x05\x04\x03\x02\x03\x03\x12\x03\x1e\x14\x15\n\n\n\x02\x04\ - \x04\x12\x04!\0#\x01\n\n\n\x03\x04\x04\x01\x12\x03!\x08\x12\n\x0b\n\x04\ - \x04\x04\x02\0\x12\x03\"\x04+\n\x0c\n\x05\x04\x04\x02\0\x04\x12\x03\"\ - \x04\x0c\n\x0c\n\x05\x04\x04\x02\0\x06\x12\x03\"\r\x1a\n\x0c\n\x05\x04\ - \x04\x02\0\x01\x12\x03\"\x1b&\n\x0c\n\x05\x04\x04\x02\0\x03\x12\x03\")*\ - \n\n\n\x02\x04\x05\x12\x04%\0(\x01\n\n\n\x03\x04\x05\x01\x12\x03%\x08\ - \x14\n\x0b\n\x04\x04\x05\x02\0\x12\x03&\x04\x16\n\r\n\x05\x04\x05\x02\0\ - \x04\x12\x04&\x04%\x16\n\x0c\n\x05\x04\x05\x02\0\x05\x12\x03&\x04\n\n\ - \x0c\n\x05\x04\x05\x02\0\x01\x12\x03&\x0b\x11\n\x0c\n\x05\x04\x05\x02\0\ - \x03\x12\x03&\x14\x15\n\x0b\n\x04\x04\x05\x02\x01\x12\x03'\x04\x1a\n\r\n\ - \x05\x04\x05\x02\x01\x04\x12\x04'\x04&\x16\n\x0c\n\x05\x04\x05\x02\x01\ - \x05\x12\x03'\x04\n\n\x0c\n\x05\x04\x05\x02\x01\x01\x12\x03'\x0b\x15\n\ - \x0c\n\x05\x04\x05\x02\x01\x03\x12\x03'\x18\x19\n\n\n\x02\x04\x06\x12\ - \x04*\0+\x01\n\n\n\x03\x04\x06\x01\x12\x03*\x08\x14\n\n\n\x02\x04\x07\ - \x12\x04-\00\x01\n\n\n\x03\x04\x07\x01\x12\x03-\x08\x19\n\x0b\n\x04\x04\ - \x07\x02\0\x12\x03.\x04\x19\n\r\n\x05\x04\x07\x02\0\x04\x12\x04.\x04-\ - \x1b\n\x0c\n\x05\x04\x07\x02\0\x05\x12\x03.\x04\n\n\x0c\n\x05\x04\x07\ - \x02\0\x01\x12\x03.\x0b\x14\n\x0c\n\x05\x04\x07\x02\0\x03\x12\x03.\x17\ - \x18\n\x0b\n\x04\x04\x07\x02\x01\x12\x03/\x04\x1a\n\r\n\x05\x04\x07\x02\ - \x01\x04\x12\x04/\x04.\x19\n\x0c\n\x05\x04\x07\x02\x01\x05\x12\x03/\x04\ - \n\n\x0c\n\x05\x04\x07\x02\x01\x01\x12\x03/\x0b\x15\n\x0c\n\x05\x04\x07\ - \x02\x01\x03\x12\x03/\x18\x19\n\n\n\x02\x04\x08\x12\x042\0<\x01\n\n\n\ - \x03\x04\x08\x01\x12\x032\x08\r\n\x0b\n\x04\x04\x08\x02\0\x12\x033\x04\ - \x17\n\r\n\x05\x04\x08\x02\0\x04\x12\x043\x042\x0f\n\x0c\n\x05\x04\x08\ - \x02\0\x05\x12\x033\x04\n\n\x0c\n\x05\x04\x08\x02\0\x01\x12\x033\x0b\x12\ - \n\x0c\n\x05\x04\x08\x02\0\x03\x12\x033\x15\x16\n\x0b\n\x04\x04\x08\x02\ - \x01\x12\x034\x04\x1d\n\r\n\x05\x04\x08\x02\x01\x04\x12\x044\x043\x17\n\ - \x0c\n\x05\x04\x08\x02\x01\x06\x12\x034\x04\r\n\x0c\n\x05\x04\x08\x02\ - \x01\x01\x12\x034\x0e\x18\n\x0c\n\x05\x04\x08\x02\x01\x03\x12\x034\x1b\ - \x1c\n\x0b\n\x04\x04\x08\x02\x02\x12\x035\x04(\n\r\n\x05\x04\x08\x02\x02\ - \x04\x12\x045\x044\x1d\n\x0c\n\x05\x04\x08\x02\x02\x06\x12\x035\x04\x12\ - \n\x0c\n\x05\x04\x08\x02\x02\x01\x12\x035\x13#\n\x0c\n\x05\x04\x08\x02\ - \x02\x03\x12\x035&'\n\x0b\n\x04\x04\x08\x02\x03\x12\x036\x04)\n\r\n\x05\ - \x04\x08\x02\x03\x04\x12\x046\x045(\n\x0c\n\x05\x04\x08\x02\x03\x06\x12\ - \x036\x04\x12\n\x0c\n\x05\x04\x08\x02\x03\x01\x12\x036\x13$\n\x0c\n\x05\ - \x04\x08\x02\x03\x03\x12\x036'(\n\x0b\n\x04\x04\x08\x02\x04\x12\x037\x04\ - \x1f\n\r\n\x05\x04\x08\x02\x04\x04\x12\x047\x046)\n\x0c\n\x05\x04\x08\ - \x02\x04\x06\x12\x037\x04\x0e\n\x0c\n\x05\x04\x08\x02\x04\x01\x12\x037\ - \x0f\x1a\n\x0c\n\x05\x04\x08\x02\x04\x03\x12\x037\x1d\x1e\n\x0b\n\x04\ - \x04\x08\x02\x05\x12\x038\x04$\n\r\n\x05\x04\x08\x02\x05\x04\x12\x048\ - \x047\x1f\n\x0c\n\x05\x04\x08\x02\x05\x06\x12\x038\x04\x10\n\x0c\n\x05\ - \x04\x08\x02\x05\x01\x12\x038\x11\x1f\n\x0c\n\x05\x04\x08\x02\x05\x03\ - \x12\x038\"#\n\x0b\n\x04\x04\x08\x02\x06\x12\x039\x04#\n\r\n\x05\x04\x08\ - \x02\x06\x04\x12\x049\x048$\n\x0c\n\x05\x04\x08\x02\x06\x06\x12\x039\x04\ - \x10\n\x0c\n\x05\x04\x08\x02\x06\x01\x12\x039\x11\x1e\n\x0c\n\x05\x04\ - \x08\x02\x06\x03\x12\x039!\"\n\x0b\n\x04\x04\x08\x02\x07\x12\x03:\x04&\n\ - \r\n\x05\x04\x08\x02\x07\x04\x12\x04:\x049#\n\x0c\n\x05\x04\x08\x02\x07\ - \x06\x12\x03:\x04\x11\n\x0c\n\x05\x04\x08\x02\x07\x01\x12\x03:\x12!\n\ - \x0c\n\x05\x04\x08\x02\x07\x03\x12\x03:$%\n\x0b\n\x04\x04\x08\x02\x08\ - \x12\x03;\x04/\n\r\n\x05\x04\x08\x02\x08\x04\x12\x04;\x04:&\n\x0c\n\x05\ - \x04\x08\x02\x08\x06\x12\x03;\x04\x15\n\x0c\n\x05\x04\x08\x02\x08\x01\ - \x12\x03;\x16*\n\x0c\n\x05\x04\x08\x02\x08\x03\x12\x03;-.b\x06proto3\ + _key\x18\x04\x20\x01(\x0cR\x06endKey\"H\n\rEpochNotMatch\x127\n\x0fcurre\ + nt_regions\x18\x01\x20\x03(\x0b2\x0e.metapb.RegionR\x0ecurrentRegions\"E\ + \n\x0cServerIsBusy\x12\x16\n\x06reason\x18\x01\x20\x01(\tR\x06reason\x12\ + \x1d\n\nbackoff_ms\x18\x02\x20\x01(\x04R\tbackoffMs\"\x0e\n\x0cStaleComm\ + and\"O\n\x11RaftEntryTooLarge\x12\x1b\n\tregion_id\x18\x01\x20\x01(\x04R\ + \x08regionId\x12\x1d\n\nentry_size\x18\x02\x20\x01(\x04R\tentrySize\"\ + \xae\x04\n\x05Error\x12\x18\n\x07message\x18\x01\x20\x01(\tR\x07message\ + \x121\n\nnot_leader\x18\x02\x20\x01(\x0b2\x12.errorpb.NotLeaderR\tnotLea\ + der\x12A\n\x10region_not_found\x18\x03\x20\x01(\x0b2\x17.errorpb.RegionN\ + otFoundR\x0eregionNotFound\x12B\n\x11key_not_in_region\x18\x04\x20\x01(\ + \x0b2\x17.errorpb.KeyNotInRegionR\x0ekeyNotInRegion\x12>\n\x0fepoch_not_\ + match\x18\x05\x20\x01(\x0b2\x16.errorpb.EpochNotMatchR\repochNotMatch\ + \x12;\n\x0eserver_is_busy\x18\x06\x20\x01(\x0b2\x15.errorpb.ServerIsBusy\ + R\x0cserverIsBusy\x12:\n\rstale_command\x18\x07\x20\x01(\x0b2\x15.errorp\ + b.StaleCommandR\x0cstaleCommand\x12>\n\x0fstore_not_match\x18\x08\x20\ + \x01(\x0b2\x16.errorpb.StoreNotMatchR\rstoreNotMatch\x12K\n\x14raft_entr\ + y_too_large\x18\t\x20\x01(\x0b2\x1a.errorpb.RaftEntryTooLargeR\x11raftEn\ + tryTooLargeR\x0bstale_epochB\x1e\n\x10org.tikv.kvproto\xd0\xe2\x1e\x01\ + \xc8\xe2\x1e\x01\xe0\xe2\x1e\x01J\xb4\x11\n\x06\x12\x04\0\0>\x01\n\x08\n\ + \x01\x0c\x12\x03\0\0\x12\n\x08\n\x01\x02\x12\x03\x01\x08\x0f\n\t\n\x02\ + \x03\0\x12\x03\x03\x07\x15\n\t\n\x02\x03\x01\x12\x03\x04\x07\x1d\n\x08\n\ + \x01\x08\x12\x03\x06\0(\n\x0b\n\x04\x08\xe7\x07\0\x12\x03\x06\0(\n\x0c\n\ + \x05\x08\xe7\x07\0\x02\x12\x03\x06\x07\x20\n\r\n\x06\x08\xe7\x07\0\x02\0\ + \x12\x03\x06\x07\x20\n\x0e\n\x07\x08\xe7\x07\0\x02\0\x01\x12\x03\x06\x08\ + \x1f\n\x0c\n\x05\x08\xe7\x07\0\x03\x12\x03\x06#'\n\x08\n\x01\x08\x12\x03\ + \x07\0$\n\x0b\n\x04\x08\xe7\x07\x01\x12\x03\x07\0$\n\x0c\n\x05\x08\xe7\ + \x07\x01\x02\x12\x03\x07\x07\x1c\n\r\n\x06\x08\xe7\x07\x01\x02\0\x12\x03\ + \x07\x07\x1c\n\x0e\n\x07\x08\xe7\x07\x01\x02\0\x01\x12\x03\x07\x08\x1b\n\ + \x0c\n\x05\x08\xe7\x07\x01\x03\x12\x03\x07\x1f#\n\x08\n\x01\x08\x12\x03\ + \x08\0*\n\x0b\n\x04\x08\xe7\x07\x02\x12\x03\x08\0*\n\x0c\n\x05\x08\xe7\ + \x07\x02\x02\x12\x03\x08\x07\"\n\r\n\x06\x08\xe7\x07\x02\x02\0\x12\x03\ + \x08\x07\"\n\x0e\n\x07\x08\xe7\x07\x02\x02\0\x01\x12\x03\x08\x08!\n\x0c\ + \n\x05\x08\xe7\x07\x02\x03\x12\x03\x08%)\n\x08\n\x01\x08\x12\x03\n\0)\n\ + \x0b\n\x04\x08\xe7\x07\x03\x12\x03\n\0)\n\x0c\n\x05\x08\xe7\x07\x03\x02\ + \x12\x03\n\x07\x13\n\r\n\x06\x08\xe7\x07\x03\x02\0\x12\x03\n\x07\x13\n\ + \x0e\n\x07\x08\xe7\x07\x03\x02\0\x01\x12\x03\n\x07\x13\n\x0c\n\x05\x08\ + \xe7\x07\x03\x07\x12\x03\n\x16(\n\n\n\x02\x04\0\x12\x04\x0c\0\x0f\x01\n\ + \n\n\x03\x04\0\x01\x12\x03\x0c\x08\x11\n\x0b\n\x04\x04\0\x02\0\x12\x03\r\ + \x04\x19\n\r\n\x05\x04\0\x02\0\x04\x12\x04\r\x04\x0c\x13\n\x0c\n\x05\x04\ + \0\x02\0\x05\x12\x03\r\x04\n\n\x0c\n\x05\x04\0\x02\0\x01\x12\x03\r\x0b\ + \x14\n\x0c\n\x05\x04\0\x02\0\x03\x12\x03\r\x17\x18\n\x0b\n\x04\x04\0\x02\ + \x01\x12\x03\x0e\x04\x1b\n\r\n\x05\x04\0\x02\x01\x04\x12\x04\x0e\x04\r\ + \x19\n\x0c\n\x05\x04\0\x02\x01\x06\x12\x03\x0e\x04\x0f\n\x0c\n\x05\x04\0\ + \x02\x01\x01\x12\x03\x0e\x10\x16\n\x0c\n\x05\x04\0\x02\x01\x03\x12\x03\ + \x0e\x19\x1a\n\n\n\x02\x04\x01\x12\x04\x11\0\x14\x01\n\n\n\x03\x04\x01\ + \x01\x12\x03\x11\x08\x15\n\x0b\n\x04\x04\x01\x02\0\x12\x03\x12\x04\x20\n\ + \r\n\x05\x04\x01\x02\0\x04\x12\x04\x12\x04\x11\x17\n\x0c\n\x05\x04\x01\ + \x02\0\x05\x12\x03\x12\x04\n\n\x0c\n\x05\x04\x01\x02\0\x01\x12\x03\x12\ + \x0b\x1b\n\x0c\n\x05\x04\x01\x02\0\x03\x12\x03\x12\x1e\x1f\n\x0b\n\x04\ + \x04\x01\x02\x01\x12\x03\x13\x04\x1f\n\r\n\x05\x04\x01\x02\x01\x04\x12\ + \x04\x13\x04\x12\x20\n\x0c\n\x05\x04\x01\x02\x01\x05\x12\x03\x13\x04\n\n\ + \x0c\n\x05\x04\x01\x02\x01\x01\x12\x03\x13\x0b\x1a\n\x0c\n\x05\x04\x01\ + \x02\x01\x03\x12\x03\x13\x1d\x1e\n\n\n\x02\x04\x02\x12\x04\x16\0\x18\x01\ + \n\n\n\x03\x04\x02\x01\x12\x03\x16\x08\x16\n\x0b\n\x04\x04\x02\x02\0\x12\ + \x03\x17\x04\x19\n\r\n\x05\x04\x02\x02\0\x04\x12\x04\x17\x04\x16\x18\n\ + \x0c\n\x05\x04\x02\x02\0\x05\x12\x03\x17\x04\n\n\x0c\n\x05\x04\x02\x02\0\ + \x01\x12\x03\x17\x0b\x14\n\x0c\n\x05\x04\x02\x02\0\x03\x12\x03\x17\x17\ + \x18\n\n\n\x02\x04\x03\x12\x04\x1a\0\x1f\x01\n\n\n\x03\x04\x03\x01\x12\ + \x03\x1a\x08\x16\n\x0b\n\x04\x04\x03\x02\0\x12\x03\x1b\x04\x12\n\r\n\x05\ + \x04\x03\x02\0\x04\x12\x04\x1b\x04\x1a\x18\n\x0c\n\x05\x04\x03\x02\0\x05\ + \x12\x03\x1b\x04\t\n\x0c\n\x05\x04\x03\x02\0\x01\x12\x03\x1b\n\r\n\x0c\n\ + \x05\x04\x03\x02\0\x03\x12\x03\x1b\x10\x11\n\x0b\n\x04\x04\x03\x02\x01\ + \x12\x03\x1c\x04\x19\n\r\n\x05\x04\x03\x02\x01\x04\x12\x04\x1c\x04\x1b\ + \x12\n\x0c\n\x05\x04\x03\x02\x01\x05\x12\x03\x1c\x04\n\n\x0c\n\x05\x04\ + \x03\x02\x01\x01\x12\x03\x1c\x0b\x14\n\x0c\n\x05\x04\x03\x02\x01\x03\x12\ + \x03\x1c\x17\x18\n\x0b\n\x04\x04\x03\x02\x02\x12\x03\x1d\x04\x18\n\r\n\ + \x05\x04\x03\x02\x02\x04\x12\x04\x1d\x04\x1c\x19\n\x0c\n\x05\x04\x03\x02\ + \x02\x05\x12\x03\x1d\x04\t\n\x0c\n\x05\x04\x03\x02\x02\x01\x12\x03\x1d\n\ + \x13\n\x0c\n\x05\x04\x03\x02\x02\x03\x12\x03\x1d\x16\x17\n\x0b\n\x04\x04\ + \x03\x02\x03\x12\x03\x1e\x04\x16\n\r\n\x05\x04\x03\x02\x03\x04\x12\x04\ + \x1e\x04\x1d\x18\n\x0c\n\x05\x04\x03\x02\x03\x05\x12\x03\x1e\x04\t\n\x0c\ + \n\x05\x04\x03\x02\x03\x01\x12\x03\x1e\n\x11\n\x0c\n\x05\x04\x03\x02\x03\ + \x03\x12\x03\x1e\x14\x15\n\n\n\x02\x04\x04\x12\x04!\0#\x01\n\n\n\x03\x04\ + \x04\x01\x12\x03!\x08\x15\n\x0b\n\x04\x04\x04\x02\0\x12\x03\"\x04/\n\x0c\ + \n\x05\x04\x04\x02\0\x04\x12\x03\"\x04\x0c\n\x0c\n\x05\x04\x04\x02\0\x06\ + \x12\x03\"\r\x1a\n\x0c\n\x05\x04\x04\x02\0\x01\x12\x03\"\x1b*\n\x0c\n\ + \x05\x04\x04\x02\0\x03\x12\x03\"-.\n\n\n\x02\x04\x05\x12\x04%\0(\x01\n\n\ + \n\x03\x04\x05\x01\x12\x03%\x08\x14\n\x0b\n\x04\x04\x05\x02\0\x12\x03&\ + \x04\x16\n\r\n\x05\x04\x05\x02\0\x04\x12\x04&\x04%\x16\n\x0c\n\x05\x04\ + \x05\x02\0\x05\x12\x03&\x04\n\n\x0c\n\x05\x04\x05\x02\0\x01\x12\x03&\x0b\ + \x11\n\x0c\n\x05\x04\x05\x02\0\x03\x12\x03&\x14\x15\n\x0b\n\x04\x04\x05\ + \x02\x01\x12\x03'\x04\x1a\n\r\n\x05\x04\x05\x02\x01\x04\x12\x04'\x04&\ + \x16\n\x0c\n\x05\x04\x05\x02\x01\x05\x12\x03'\x04\n\n\x0c\n\x05\x04\x05\ + \x02\x01\x01\x12\x03'\x0b\x15\n\x0c\n\x05\x04\x05\x02\x01\x03\x12\x03'\ + \x18\x19\n\n\n\x02\x04\x06\x12\x04*\0+\x01\n\n\n\x03\x04\x06\x01\x12\x03\ + *\x08\x14\n\n\n\x02\x04\x07\x12\x04-\00\x01\n\n\n\x03\x04\x07\x01\x12\ + \x03-\x08\x19\n\x0b\n\x04\x04\x07\x02\0\x12\x03.\x04\x19\n\r\n\x05\x04\ + \x07\x02\0\x04\x12\x04.\x04-\x1b\n\x0c\n\x05\x04\x07\x02\0\x05\x12\x03.\ + \x04\n\n\x0c\n\x05\x04\x07\x02\0\x01\x12\x03.\x0b\x14\n\x0c\n\x05\x04\ + \x07\x02\0\x03\x12\x03.\x17\x18\n\x0b\n\x04\x04\x07\x02\x01\x12\x03/\x04\ + \x1a\n\r\n\x05\x04\x07\x02\x01\x04\x12\x04/\x04.\x19\n\x0c\n\x05\x04\x07\ + \x02\x01\x05\x12\x03/\x04\n\n\x0c\n\x05\x04\x07\x02\x01\x01\x12\x03/\x0b\ + \x15\n\x0c\n\x05\x04\x07\x02\x01\x03\x12\x03/\x18\x19\n\n\n\x02\x04\x08\ + \x12\x042\0>\x01\n\n\n\x03\x04\x08\x01\x12\x032\x08\r\n\n\n\x03\x04\x08\ + \n\x12\x033\r\x1b\n\x0b\n\x04\x04\x08\n\0\x12\x033\r\x1a\n\x0b\n\x04\x04\ + \x08\x02\0\x12\x035\x04\x17\n\r\n\x05\x04\x08\x02\0\x04\x12\x045\x043\ + \x1b\n\x0c\n\x05\x04\x08\x02\0\x05\x12\x035\x04\n\n\x0c\n\x05\x04\x08\ + \x02\0\x01\x12\x035\x0b\x12\n\x0c\n\x05\x04\x08\x02\0\x03\x12\x035\x15\ + \x16\n\x0b\n\x04\x04\x08\x02\x01\x12\x036\x04\x1d\n\r\n\x05\x04\x08\x02\ + \x01\x04\x12\x046\x045\x17\n\x0c\n\x05\x04\x08\x02\x01\x06\x12\x036\x04\ + \r\n\x0c\n\x05\x04\x08\x02\x01\x01\x12\x036\x0e\x18\n\x0c\n\x05\x04\x08\ + \x02\x01\x03\x12\x036\x1b\x1c\n\x0b\n\x04\x04\x08\x02\x02\x12\x037\x04(\ + \n\r\n\x05\x04\x08\x02\x02\x04\x12\x047\x046\x1d\n\x0c\n\x05\x04\x08\x02\ + \x02\x06\x12\x037\x04\x12\n\x0c\n\x05\x04\x08\x02\x02\x01\x12\x037\x13#\ + \n\x0c\n\x05\x04\x08\x02\x02\x03\x12\x037&'\n\x0b\n\x04\x04\x08\x02\x03\ + \x12\x038\x04)\n\r\n\x05\x04\x08\x02\x03\x04\x12\x048\x047(\n\x0c\n\x05\ + \x04\x08\x02\x03\x06\x12\x038\x04\x12\n\x0c\n\x05\x04\x08\x02\x03\x01\ + \x12\x038\x13$\n\x0c\n\x05\x04\x08\x02\x03\x03\x12\x038'(\n\x0b\n\x04\ + \x04\x08\x02\x04\x12\x039\x04&\n\r\n\x05\x04\x08\x02\x04\x04\x12\x049\ + \x048)\n\x0c\n\x05\x04\x08\x02\x04\x06\x12\x039\x04\x11\n\x0c\n\x05\x04\ + \x08\x02\x04\x01\x12\x039\x12!\n\x0c\n\x05\x04\x08\x02\x04\x03\x12\x039$\ + %\n\x0b\n\x04\x04\x08\x02\x05\x12\x03:\x04$\n\r\n\x05\x04\x08\x02\x05\ + \x04\x12\x04:\x049&\n\x0c\n\x05\x04\x08\x02\x05\x06\x12\x03:\x04\x10\n\ + \x0c\n\x05\x04\x08\x02\x05\x01\x12\x03:\x11\x1f\n\x0c\n\x05\x04\x08\x02\ + \x05\x03\x12\x03:\"#\n\x0b\n\x04\x04\x08\x02\x06\x12\x03;\x04#\n\r\n\x05\ + \x04\x08\x02\x06\x04\x12\x04;\x04:$\n\x0c\n\x05\x04\x08\x02\x06\x06\x12\ + \x03;\x04\x10\n\x0c\n\x05\x04\x08\x02\x06\x01\x12\x03;\x11\x1e\n\x0c\n\ + \x05\x04\x08\x02\x06\x03\x12\x03;!\"\n\x0b\n\x04\x04\x08\x02\x07\x12\x03\ + <\x04&\n\r\n\x05\x04\x08\x02\x07\x04\x12\x04<\x04;#\n\x0c\n\x05\x04\x08\ + \x02\x07\x06\x12\x03<\x04\x11\n\x0c\n\x05\x04\x08\x02\x07\x01\x12\x03<\ + \x12!\n\x0c\n\x05\x04\x08\x02\x07\x03\x12\x03<$%\n\x0b\n\x04\x04\x08\x02\ + \x08\x12\x03=\x04/\n\r\n\x05\x04\x08\x02\x08\x04\x12\x04=\x04<&\n\x0c\n\ + \x05\x04\x08\x02\x08\x06\x12\x03=\x04\x15\n\x0c\n\x05\x04\x08\x02\x08\ + \x01\x12\x03=\x16*\n\x0c\n\x05\x04\x08\x02\x08\x03\x12\x03=-.b\x06proto3\ "; static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy { diff --git a/src/import_kvpb.rs b/src/import_kvpb.rs index 9cc90638e..d5471322a 100644 --- a/src/import_kvpb.rs +++ b/src/import_kvpb.rs @@ -3433,7 +3433,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \0\x12X\n\rCleanupEngine\x12!.import_kvpb.CleanupEngineRequest\x1a\".imp\ ort_kvpb.CleanupEngineResponse\"\0\x12[\n\x0eCompactCluster\x12\".import\ _kvpb.CompactClusterRequest\x1a#.import_kvpb.CompactClusterResponse\"\0B\ - \x1e\n\x10org.tikv.kvproto\xe0\xe2\x1e\x01\xc8\xe2\x1e\x01\xd0\xe2\x1e\ + \x1e\n\x10org.tikv.kvproto\xe0\xe2\x1e\x01\xd0\xe2\x1e\x01\xc8\xe2\x1e\ \x01J\xe6!\n\x07\x12\x05\0\0\x84\x01\x01\n\x08\n\x01\x0c\x12\x03\0\0\x12\ \n\x08\n\x01\x02\x12\x03\x02\x08\x13\n\t\n\x02\x03\0\x12\x03\x04\x07\x1b\ \n\t\n\x02\x03\x01\x12\x03\x05\x07\x1d\n\x08\n\x01\x08\x12\x03\x07\0$\n\ diff --git a/src/import_sstpb.rs b/src/import_sstpb.rs index 70b641875..f494d2aea 100644 --- a/src/import_sstpb.rs +++ b/src/import_sstpb.rs @@ -2149,7 +2149,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x12E\n\x06Ingest\x12\x1b.import_sstpb.IngestRequest\x1a\x1c.import_sstp\ b.IngestResponse\"\0\x12H\n\x07Compact\x12\x1c.import_sstpb.CompactReque\ st\x1a\x1d.import_sstpb.CompactResponse\"\0B\x1e\n\x10org.tikv.kvproto\ - \xd0\xe2\x1e\x01\xe0\xe2\x1e\x01\xc8\xe2\x1e\x01J\xaa\x1b\n\x06\x12\x04\ + \xc8\xe2\x1e\x01\xe0\xe2\x1e\x01\xd0\xe2\x1e\x01J\xaa\x1b\n\x06\x12\x04\ \0\0`\x01\n\x08\n\x01\x0c\x12\x03\0\0\x12\n\x08\n\x01\x02\x12\x03\x02\ \x08\x14\n\t\n\x02\x03\0\x12\x03\x04\x07\x15\n\t\n\x02\x03\x01\x12\x03\ \x05\x07\x16\n\t\n\x02\x03\x02\x12\x03\x06\x07\x16\n\t\n\x02\x03\x03\x12\ diff --git a/src/kvrpcpb.rs b/src/kvrpcpb.rs index 79168ed35..1ce21304d 100644 --- a/src/kvrpcpb.rs +++ b/src/kvrpcpb.rs @@ -18389,8 +18389,8 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x10\0\x12\x07\n\x03Low\x10\x01\x12\x08\n\x04High\x10\x02*\x20\n\x0eIsol\ ationLevel\x12\x06\n\x02SI\x10\0\x12\x06\n\x02RC\x10\x01*.\n\x02Op\x12\ \x07\n\x03Put\x10\0\x12\x07\n\x03Del\x10\x01\x12\x08\n\x04Lock\x10\x02\ - \x12\x0c\n\x08Rollback\x10\x03B\x1e\n\x10org.tikv.kvproto\xe0\xe2\x1e\ - \x01\xd0\xe2\x1e\x01\xc8\xe2\x1e\x01J\xa5\x9a\x01\n\x07\x12\x05\0\0\xcb\ + \x12\x0c\n\x08Rollback\x10\x03B\x1e\n\x10org.tikv.kvproto\xd0\xe2\x1e\ + \x01\xe0\xe2\x1e\x01\xc8\xe2\x1e\x01J\xa5\x9a\x01\n\x07\x12\x05\0\0\xcb\ \x03\x01\n\x08\n\x01\x0c\x12\x03\0\0\x12\n\x08\n\x01\x02\x12\x03\x01\x08\ \x0f\n\t\n\x02\x03\0\x12\x03\x03\x07\x15\n\t\n\x02\x03\x01\x12\x03\x04\ \x07\x16\n\t\n\x02\x03\x02\x12\x03\x05\x07\x1d\n\x08\n\x01\x08\x12\x03\ diff --git a/src/lib.rs b/src/lib.rs index adc01a331..9395a9edb 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -6,18 +6,18 @@ extern crate raft; use raft::eraftpb; pub mod coprocessor; -pub mod debugpb; pub mod debugpb_grpc; +pub mod debugpb; pub mod errorpb; -pub mod import_kvpb; pub mod import_kvpb_grpc; -pub mod import_sstpb; +pub mod import_kvpb; pub mod import_sstpb_grpc; +pub mod import_sstpb; pub mod kvrpcpb; pub mod metapb; -pub mod pdpb; pub mod pdpb_grpc; +pub mod pdpb; pub mod raft_cmdpb; pub mod raft_serverpb; -pub mod tikvpb; pub mod tikvpb_grpc; +pub mod tikvpb; diff --git a/src/metapb.rs b/src/metapb.rs index 4c62b55fa..e75817b09 100644 --- a/src/metapb.rs +++ b/src/metapb.rs @@ -1577,8 +1577,8 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x12\x0e\n\x02id\x18\x01\x20\x01(\x04R\x02id\x12\x19\n\x08store_id\x18\ \x02\x20\x01(\x04R\x07storeId\x12\x1d\n\nis_learner\x18\x03\x20\x01(\x08\ R\tisLearner*0\n\nStoreState\x12\x06\n\x02Up\x10\0\x12\x0b\n\x07Offline\ - \x10\x01\x12\r\n\tTombstone\x10\x02B\x1e\n\x10org.tikv.kvproto\xe0\xe2\ - \x1e\x01\xc8\xe2\x1e\x01\xd0\xe2\x1e\x01J\xa9\x12\n\x06\x12\x04\0\0<\x01\ + \x10\x01\x12\r\n\tTombstone\x10\x02B\x1e\n\x10org.tikv.kvproto\xd0\xe2\ + \x1e\x01\xe0\xe2\x1e\x01\xc8\xe2\x1e\x01J\xa9\x12\n\x06\x12\x04\0\0<\x01\ \n\x08\n\x01\x0c\x12\x03\0\0\x12\n\x08\n\x01\x02\x12\x03\x01\x08\x0e\n\t\ \n\x02\x03\0\x12\x03\x03\x07\x1d\n\x08\n\x01\x08\x12\x03\x05\0(\n\x0b\n\ \x04\x08\xe7\x07\0\x12\x03\x05\0(\n\x0c\n\x05\x08\xe7\x07\0\x02\x12\x03\ diff --git a/src/tikvpb.rs b/src/tikvpb.rs index c4f4d8932..762cfaa85 100644 --- a/src/tikvpb.rs +++ b/src/tikvpb.rs @@ -4365,7 +4365,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x12\x20.kvrpcpb.MvccGetByStartTsRequest\x1a!.kvrpcpb.MvccGetByStartTsRe\ sponse\"\0\x12R\n\rBatchCommands\x12\x1c.tikvpb.BatchCommandsRequest\x1a\ \x1d.tikvpb.BatchCommandsResponse\"\0(\x010\x01B\x1e\n\x10org.tikv.kvpro\ - to\xe0\xe2\x1e\x01\xd0\xe2\x1e\x01\xc8\xe2\x1e\x01J\xa6.\n\x07\x12\x05\0\ + to\xd0\xe2\x1e\x01\xe0\xe2\x1e\x01\xc8\xe2\x1e\x01J\xa6.\n\x07\x12\x05\0\ \0\x88\x01\x01\n\x08\n\x01\x0c\x12\x03\0\0\x12\n\x08\n\x01\x02\x12\x03\ \x01\x08\x0e\n\t\n\x02\x03\0\x12\x03\x03\x07\x1a\n\t\n\x02\x03\x01\x12\ \x03\x04\x07\x16\n\t\n\x02\x03\x02\x12\x03\x05\x07\x1c\n\t\n\x02\x03\x03\