From 62787d526ba958d56f9236c6d7220779b26b1278 Mon Sep 17 00:00:00 2001 From: ekexium Date: Wed, 27 Sep 2023 23:55:50 +0800 Subject: [PATCH] debug: add ts in Raft Message Signed-off-by: ekexium --- include/eraftpb.proto | 1 + pkg/eraftpb/eraftpb.pb.go | 163 +++++++++++++++++++++++--------------- pkg/kvrpcpb/kvrpcpb.pb.go | 10 +-- pkg/tracepb/tracepb.pb.go | 1 - 4 files changed, 104 insertions(+), 71 deletions(-) diff --git a/include/eraftpb.proto b/include/eraftpb.proto index daf1c6297..1ea418a62 100644 --- a/include/eraftpb.proto +++ b/include/eraftpb.proto @@ -80,6 +80,7 @@ message Message { uint64 reject_hint = 11; bytes context = 12; uint64 priority = 14; + uint64 ts = 15; } message HardState { diff --git a/pkg/eraftpb/eraftpb.pb.go b/pkg/eraftpb/eraftpb.pb.go index 3ae74aa0a..2e131e765 100644 --- a/pkg/eraftpb/eraftpb.pb.go +++ b/pkg/eraftpb/eraftpb.pb.go @@ -430,6 +430,7 @@ type Message struct { 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"` Priority uint64 `protobuf:"varint,14,opt,name=priority,proto3" json:"priority,omitempty"` + Ts uint64 `protobuf:"varint,15,opt,name=ts,proto3" json:"ts,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -566,6 +567,13 @@ func (m *Message) GetPriority() uint64 { return 0 } +func (m *Message) GetTs() uint64 { + if m != nil { + return m.Ts + } + return 0 +} + type HardState struct { Term uint64 `protobuf:"varint,1,opt,name=term,proto3" json:"term,omitempty"` Vote uint64 `protobuf:"varint,2,opt,name=vote,proto3" json:"vote,omitempty"` @@ -956,71 +964,71 @@ func init() { func init() { proto.RegisterFile("eraftpb.proto", fileDescriptor_acd9f78e51523dd8) } var fileDescriptor_acd9f78e51523dd8 = []byte{ - // 1013 bytes of a gzipped FileDescriptorProto + // 1020 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcd, 0x6e, 0xe4, 0x44, - 0x10, 0x8e, 0x3d, 0x93, 0xb1, 0xa7, 0xe6, 0x27, 0x9d, 0x26, 0x64, 0x9d, 0x95, 0x12, 0x46, 0xc3, - 0x81, 0x21, 0x12, 0x8b, 0x36, 0x2b, 0x24, 0x0e, 0x70, 0xc8, 0x46, 0x2b, 0x25, 0x22, 0x13, 0x16, - 0x27, 0x9b, 0xeb, 0xc8, 0xb1, 0x2b, 0x8e, 0x61, 0xdc, 0x6d, 0xba, 0x7b, 0x42, 0xf2, 0x08, 0x48, - 0x3c, 0x00, 0x07, 0x1e, 0x01, 0x78, 0x0e, 0x8e, 0x3c, 0x02, 0x0a, 0x2f, 0x82, 0xba, 0xdd, 0xf6, - 0x78, 0x92, 0x3d, 0x71, 0xab, 0xfa, 0x5c, 0x55, 0xfd, 0xd5, 0x57, 0xd5, 0x2d, 0xc3, 0x00, 0x45, - 0x74, 0xad, 0x8a, 0xab, 0x17, 0x85, 0xe0, 0x8a, 0x53, 0xcf, 0xba, 0xe3, 0x3f, 0x1c, 0x58, 0x7f, - 0xc3, 0x94, 0xb8, 0xa7, 0x2f, 0x01, 0x50, 0x1b, 0x33, 0x75, 0x5f, 0x60, 0xe0, 0x8c, 0x9c, 0xc9, - 0xf0, 0x80, 0xbe, 0xa8, 0xd2, 0x4c, 0xcc, 0xc5, 0x7d, 0x81, 0x61, 0x17, 0x2b, 0x93, 0x52, 0x68, - 0x2b, 0x14, 0x79, 0xe0, 0x8e, 0x9c, 0x49, 0x3b, 0x34, 0x36, 0xdd, 0x82, 0xf5, 0x8c, 0x25, 0x78, - 0x17, 0xb4, 0x0c, 0x58, 0x3a, 0x3a, 0x32, 0x89, 0x54, 0x14, 0xb4, 0x47, 0xce, 0xa4, 0x1f, 0x1a, - 0x9b, 0x06, 0xe0, 0xc5, 0x9c, 0x29, 0xbc, 0x53, 0x41, 0xc7, 0xc0, 0x95, 0x4b, 0x77, 0xc0, 0x97, - 0xf7, 0x2c, 0x9e, 0xcd, 0x79, 0x1a, 0xac, 0x8f, 0x9c, 0x89, 0x1f, 0x7a, 0xda, 0x3f, 0xe5, 0xe9, - 0x98, 0x03, 0x39, 0x67, 0x51, 0x21, 0x6f, 0xb8, 0x9a, 0xa2, 0x8a, 0x4c, 0xa1, 0x97, 0x00, 0x31, - 0x67, 0xd7, 0x33, 0xa9, 0x22, 0x55, 0x32, 0xef, 0x35, 0x98, 0x1f, 0x71, 0x76, 0x7d, 0xae, 0xbf, - 0x84, 0xdd, 0xb8, 0x32, 0x97, 0x2c, 0xdd, 0x47, 0x2c, 0x4d, 0x3f, 0xad, 0x65, 0x3f, 0xe3, 0x77, - 0xe0, 0x57, 0x07, 0xd6, 0x5d, 0x38, 0x8d, 0x2e, 0xbe, 0x00, 0x3f, 0xb7, 0x44, 0x4c, 0xb1, 0xde, - 0xc1, 0x4e, 0x7d, 0xf4, 0x63, 0xa6, 0x61, 0x1d, 0x3a, 0xfe, 0xb3, 0x05, 0xde, 0x14, 0xa5, 0x8c, - 0x52, 0xa4, 0x9f, 0x83, 0x9f, 0xcb, 0xb4, 0xa9, 0xfb, 0x56, 0x5d, 0xc2, 0xc6, 0x18, 0xe5, 0xbd, - 0x5c, 0xa6, 0x46, 0xf7, 0x21, 0xb8, 0x8a, 0x5b, 0xea, 0xae, 0xe2, 0x9a, 0xd7, 0xb5, 0xe0, 0x35, - 0x6f, 0x6d, 0xd7, 0xbd, 0xb4, 0x1b, 0xb3, 0xd9, 0x01, 0x7f, 0xce, 0xd3, 0x99, 0xc1, 0xd7, 0x0d, - 0xee, 0xcd, 0x79, 0x7a, 0xb1, 0x32, 0xb6, 0x4e, 0x53, 0x90, 0x09, 0x78, 0x7a, 0xda, 0x19, 0xca, - 0xc0, 0x1b, 0xb5, 0x26, 0xbd, 0x83, 0xe1, 0xea, 0x42, 0x84, 0xd5, 0x67, 0xba, 0x0d, 0x9d, 0x98, - 0xe7, 0x79, 0xa6, 0x02, 0xdf, 0x14, 0xb0, 0x1e, 0xfd, 0x0c, 0x7c, 0x69, 0x55, 0x08, 0xba, 0x46, - 0x9e, 0xcd, 0x27, 0xf2, 0x84, 0x75, 0x08, 0xfd, 0x14, 0x88, 0xc0, 0x1f, 0x17, 0x28, 0xd5, 0xac, - 0x4e, 0x1b, 0x98, 0x82, 0x1b, 0x16, 0xaf, 0x87, 0xb1, 0x0d, 0x1d, 0x81, 0xdf, 0x63, 0xac, 0x02, - 0x30, 0x2b, 0x62, 0x3d, 0xfa, 0x11, 0xf4, 0x4a, 0x6b, 0x76, 0x93, 0x31, 0x15, 0xf4, 0x4c, 0x36, - 0x94, 0xd0, 0x71, 0xc6, 0x54, 0x73, 0xef, 0xfa, 0xab, 0x7b, 0xf7, 0x1c, 0xfc, 0x42, 0x64, 0x5c, - 0x64, 0xea, 0x3e, 0x18, 0x9a, 0xbc, 0xda, 0x1f, 0x7f, 0x03, 0xdd, 0xe3, 0x48, 0x24, 0xe5, 0xfa, - 0x54, 0xe2, 0x3a, 0x0d, 0x71, 0x29, 0xb4, 0x6f, 0xb9, 0xc2, 0xea, 0x32, 0x68, 0xbb, 0xa1, 0x4a, - 0xab, 0xa9, 0xca, 0xf8, 0x77, 0x07, 0xba, 0xf5, 0x5e, 0xea, 0x28, 0x1d, 0x2d, 0x64, 0xe0, 0x8c, - 0x5a, 0x3a, 0xaa, 0xf4, 0x34, 0x9d, 0x39, 0x46, 0x82, 0xe9, 0x2f, 0xae, 0xf9, 0x52, 0xfb, 0xf4, - 0x13, 0xd8, 0x28, 0xa3, 0x66, 0x7c, 0xa1, 0x52, 0x9e, 0xb1, 0x34, 0x68, 0x99, 0x90, 0x61, 0x09, - 0x7f, 0x6b, 0x51, 0xfa, 0x31, 0x0c, 0xaa, 0xa4, 0x19, 0xd3, 0x3d, 0xb7, 0x4d, 0x58, 0xbf, 0x02, - 0xcf, 0x74, 0xe3, 0xbb, 0x00, 0xd1, 0x42, 0xf1, 0xd9, 0x1c, 0xa3, 0x5b, 0xb4, 0x57, 0xae, 0xab, - 0x91, 0x53, 0x0d, 0x8c, 0x7f, 0x76, 0x00, 0x34, 0xdd, 0xa3, 0x9b, 0x88, 0xa5, 0x48, 0xbf, 0x84, - 0x5e, 0x6c, 0xac, 0x72, 0x65, 0x5d, 0xb3, 0xb2, 0xcf, 0x56, 0x2e, 0x5c, 0x19, 0x69, 0xb6, 0x16, - 0xe2, 0xda, 0xa6, 0xcf, 0xc0, 0x63, 0x3c, 0xc1, 0x59, 0x96, 0x54, 0x82, 0x68, 0xf7, 0x24, 0x69, - 0xce, 0xa4, 0xbd, 0x3a, 0x93, 0x21, 0xb8, 0x59, 0x62, 0x85, 0x76, 0xb3, 0x64, 0x8c, 0x40, 0x96, - 0x07, 0x9c, 0x67, 0x2c, 0x9d, 0x3f, 0x21, 0xe4, 0xfc, 0x2f, 0x42, 0x6e, 0x93, 0xd0, 0xf8, 0x37, - 0x07, 0xfa, 0xcb, 0xbc, 0xcb, 0x03, 0xfa, 0x35, 0x80, 0x12, 0x11, 0x93, 0x99, 0xca, 0x38, 0xb3, - 0x47, 0xec, 0xbe, 0xef, 0x88, 0x3a, 0x28, 0x6c, 0x24, 0xd0, 0x57, 0xe0, 0x95, 0xc7, 0x96, 0xa3, - 0x6c, 0xbe, 0x12, 0x8f, 0xdb, 0x09, 0xab, 0xc8, 0xa6, 0x2a, 0xad, 0x15, 0x55, 0xf6, 0x8f, 0xa1, - 0x5b, 0xbf, 0xc8, 0x74, 0x03, 0x7a, 0xc6, 0x39, 0xe3, 0x22, 0x8f, 0xe6, 0x64, 0x8d, 0x7e, 0x00, - 0x1b, 0x06, 0x58, 0x56, 0x26, 0x0e, 0xfd, 0x10, 0x36, 0x1f, 0x81, 0x97, 0x07, 0xc4, 0xdd, 0xff, - 0xa5, 0x05, 0xbd, 0xc6, 0x23, 0x43, 0x01, 0x3a, 0x53, 0x99, 0x1e, 0x2f, 0x0a, 0xb2, 0x46, 0x7b, - 0xe0, 0x4d, 0x65, 0xfa, 0x1a, 0x23, 0x45, 0x1c, 0x3a, 0x04, 0x98, 0xca, 0xf4, 0xad, 0xe0, 0x05, - 0x97, 0x48, 0x5c, 0x3a, 0x80, 0xee, 0x54, 0xa6, 0x87, 0x45, 0x81, 0x2c, 0x21, 0x2d, 0x5d, 0xbe, - 0x76, 0x43, 0x94, 0x05, 0x67, 0x12, 0x49, 0x9b, 0x52, 0x18, 0x4e, 0x65, 0x1a, 0x96, 0x77, 0xf7, - 0x92, 0x2b, 0x24, 0xeb, 0xf4, 0x39, 0x6c, 0xaf, 0x62, 0x75, 0x7c, 0x47, 0xf7, 0x32, 0x95, 0x69, - 0x75, 0xc9, 0x89, 0x47, 0x09, 0xf4, 0x35, 0x1f, 0x8c, 0x84, 0xba, 0xd2, 0x44, 0x7c, 0x1a, 0xc0, - 0x56, 0x13, 0xa9, 0x93, 0xbb, 0xf6, 0xb0, 0x77, 0x4c, 0x60, 0x14, 0xdf, 0x44, 0x57, 0x73, 0x24, - 0x40, 0x37, 0x61, 0x60, 0x0b, 0xea, 0xcb, 0xb6, 0x90, 0xa4, 0x67, 0xc3, 0x8e, 0x6e, 0x30, 0xfe, - 0xe1, 0xbb, 0x05, 0x17, 0x8b, 0x9c, 0xf4, 0x2d, 0x7d, 0x33, 0xbc, 0x6b, 0x14, 0xa7, 0x18, 0x25, - 0x28, 0xc8, 0xc0, 0x66, 0x5f, 0x64, 0x39, 0xf2, 0x85, 0x3a, 0xe3, 0x3f, 0x91, 0xa1, 0x25, 0x14, - 0x62, 0x94, 0x9c, 0xe8, 0x37, 0x92, 0x6c, 0xd0, 0x2d, 0x20, 0x4d, 0x44, 0x13, 0x22, 0xc4, 0x56, - 0xb4, 0x5d, 0xbe, 0x15, 0x68, 0x9a, 0xdf, 0xa4, 0xbb, 0xb0, 0xf3, 0x04, 0xae, 0x5b, 0xa0, 0xfb, - 0x5f, 0xc1, 0xd6, 0xfb, 0x76, 0x89, 0xfa, 0xd0, 0x3e, 0x5c, 0x28, 0x4e, 0xd6, 0x68, 0x1f, 0xfc, - 0x93, 0xbc, 0x98, 0x67, 0x71, 0xa6, 0xa7, 0xd2, 0x07, 0xff, 0xcd, 0x9d, 0xf5, 0xdc, 0xfd, 0x43, - 0x18, 0xae, 0x2e, 0xbb, 0x1e, 0xe1, 0x61, 0x92, 0x9c, 0xf1, 0x04, 0xc9, 0x9a, 0x1e, 0x61, 0x88, - 0x39, 0xbf, 0x45, 0xe3, 0x3b, 0x5a, 0x88, 0xc3, 0x24, 0x39, 0x2d, 0x5f, 0x02, 0x83, 0xb9, 0xaf, - 0xc9, 0x5f, 0x0f, 0x7b, 0xce, 0xdf, 0x0f, 0x7b, 0xce, 0x3f, 0x0f, 0x7b, 0xce, 0xaf, 0xff, 0xee, - 0xad, 0x5d, 0x75, 0xcc, 0x2f, 0xc3, 0xab, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xef, 0xba, 0xa7, - 0x87, 0x43, 0x08, 0x00, 0x00, + 0x10, 0x8e, 0x3d, 0x93, 0xb1, 0xa7, 0xe6, 0xaf, 0xd3, 0x84, 0xac, 0xb3, 0x52, 0xc2, 0x68, 0x38, + 0x30, 0x44, 0x62, 0xd1, 0x66, 0x85, 0xc4, 0x01, 0x0e, 0xd9, 0x68, 0xa5, 0x44, 0x64, 0xc2, 0xe2, + 0x64, 0x73, 0x1d, 0x39, 0x76, 0xc5, 0x31, 0x8c, 0xbb, 0x4d, 0x77, 0x4f, 0x48, 0x1e, 0x01, 0x89, + 0x07, 0xe0, 0xc0, 0x23, 0xc0, 0x2b, 0x70, 0xe6, 0xc8, 0x23, 0xa0, 0xf0, 0x22, 0xa8, 0xdb, 0x6d, + 0xc7, 0x93, 0xec, 0x89, 0x5b, 0xd5, 0xe7, 0xaa, 0xea, 0xaf, 0xbe, 0xaa, 0x6e, 0x19, 0x06, 0x28, + 0xa2, 0x2b, 0x55, 0x5c, 0xbe, 0x28, 0x04, 0x57, 0x9c, 0x7a, 0xd6, 0x9d, 0xfc, 0xe1, 0xc0, 0xfa, + 0x1b, 0xa6, 0xc4, 0x1d, 0x7d, 0x09, 0x80, 0xda, 0x98, 0xab, 0xbb, 0x02, 0x03, 0x67, 0xec, 0x4c, + 0x87, 0xfb, 0xf4, 0x45, 0x95, 0x66, 0x62, 0xce, 0xef, 0x0a, 0x0c, 0xbb, 0x58, 0x99, 0x94, 0x42, + 0x5b, 0xa1, 0xc8, 0x03, 0x77, 0xec, 0x4c, 0xdb, 0xa1, 0xb1, 0xe9, 0x26, 0xac, 0x67, 0x2c, 0xc1, + 0xdb, 0xa0, 0x65, 0xc0, 0xd2, 0xd1, 0x91, 0x49, 0xa4, 0xa2, 0xa0, 0x3d, 0x76, 0xa6, 0xfd, 0xd0, + 0xd8, 0x34, 0x00, 0x2f, 0xe6, 0x4c, 0xe1, 0xad, 0x0a, 0x3a, 0x06, 0xae, 0x5c, 0xba, 0x0d, 0xbe, + 0xbc, 0x63, 0xf1, 0x7c, 0xc1, 0xd3, 0x60, 0x7d, 0xec, 0x4c, 0xfd, 0xd0, 0xd3, 0xfe, 0x09, 0x4f, + 0x27, 0x1c, 0xc8, 0x19, 0x8b, 0x0a, 0x79, 0xcd, 0xd5, 0x0c, 0x55, 0x64, 0x0a, 0xbd, 0x04, 0x88, + 0x39, 0xbb, 0x9a, 0x4b, 0x15, 0xa9, 0x92, 0x79, 0xaf, 0xc1, 0xfc, 0x90, 0xb3, 0xab, 0x33, 0xfd, + 0x25, 0xec, 0xc6, 0x95, 0xf9, 0xc0, 0xd2, 0x7d, 0xc4, 0xd2, 0xf4, 0xd3, 0x7a, 0xe8, 0x67, 0xf2, + 0x0e, 0xfc, 0xea, 0xc0, 0xba, 0x0b, 0xa7, 0xd1, 0xc5, 0x17, 0xe0, 0xe7, 0x96, 0x88, 0x29, 0xd6, + 0xdb, 0xdf, 0xae, 0x8f, 0x7e, 0xcc, 0x34, 0xac, 0x43, 0x27, 0x7f, 0xb6, 0xc0, 0x9b, 0xa1, 0x94, + 0x51, 0x8a, 0xf4, 0x73, 0xf0, 0x73, 0x99, 0x36, 0x75, 0xdf, 0xac, 0x4b, 0xd8, 0x18, 0xa3, 0xbc, + 0x97, 0xcb, 0xd4, 0xe8, 0x3e, 0x04, 0x57, 0x71, 0x4b, 0xdd, 0x55, 0x5c, 0xf3, 0xba, 0x12, 0xbc, + 0xe6, 0xad, 0xed, 0xba, 0x97, 0x76, 0x63, 0x36, 0xdb, 0xe0, 0x2f, 0x78, 0x3a, 0x37, 0xf8, 0xba, + 0xc1, 0xbd, 0x05, 0x4f, 0xcf, 0x57, 0xc6, 0xd6, 0x69, 0x0a, 0x32, 0x05, 0x4f, 0x4f, 0x3b, 0x43, + 0x19, 0x78, 0xe3, 0xd6, 0xb4, 0xb7, 0x3f, 0x5c, 0x5d, 0x88, 0xb0, 0xfa, 0x4c, 0xb7, 0xa0, 0x13, + 0xf3, 0x3c, 0xcf, 0x54, 0xe0, 0x9b, 0x02, 0xd6, 0xa3, 0x9f, 0x81, 0x2f, 0xad, 0x0a, 0x41, 0xd7, + 0xc8, 0xb3, 0xf1, 0x44, 0x9e, 0xb0, 0x0e, 0xa1, 0x9f, 0x02, 0x11, 0xf8, 0xe3, 0x12, 0xa5, 0x9a, + 0xd7, 0x69, 0x03, 0x53, 0x70, 0x64, 0xf1, 0x7a, 0x18, 0x5b, 0xd0, 0x11, 0xf8, 0x3d, 0xc6, 0x2a, + 0x00, 0xb3, 0x22, 0xd6, 0xa3, 0x1f, 0x41, 0xaf, 0xb4, 0xe6, 0xd7, 0x19, 0x53, 0x41, 0xcf, 0x64, + 0x43, 0x09, 0x1d, 0x65, 0x4c, 0x35, 0xf7, 0xae, 0xbf, 0xba, 0x77, 0xcf, 0xc1, 0x2f, 0x44, 0xc6, + 0x45, 0xa6, 0xee, 0x82, 0xa1, 0xc9, 0xab, 0x7d, 0xa3, 0xb9, 0x0c, 0x46, 0x56, 0x73, 0x39, 0xf9, + 0x06, 0xba, 0x47, 0x91, 0x48, 0xca, 0x75, 0xaa, 0xc4, 0x76, 0x1a, 0x62, 0x53, 0x68, 0xdf, 0x70, + 0x85, 0xd5, 0xe5, 0xd0, 0x76, 0x43, 0xa5, 0x56, 0x53, 0xa5, 0xc9, 0xef, 0x0e, 0x74, 0xeb, 0x3d, + 0xd5, 0x51, 0x3a, 0x5a, 0xc8, 0xc0, 0x19, 0xb7, 0x74, 0x54, 0xe9, 0x69, 0x7a, 0x0b, 0x8c, 0x04, + 0xd3, 0x5f, 0x5c, 0xf3, 0xa5, 0xf6, 0xe9, 0x27, 0x30, 0x2a, 0xa3, 0xe6, 0x7c, 0xa9, 0x52, 0x9e, + 0xb1, 0x34, 0x68, 0x99, 0x90, 0x61, 0x09, 0x7f, 0x6b, 0x51, 0xfa, 0x31, 0x0c, 0xaa, 0xa4, 0x39, + 0xd3, 0x1a, 0xb4, 0x4d, 0x58, 0xbf, 0x02, 0x4f, 0xb5, 0x10, 0x3b, 0x00, 0xd1, 0x52, 0xf1, 0xf9, + 0x02, 0xa3, 0x1b, 0xb4, 0x57, 0xb0, 0xab, 0x91, 0x13, 0x0d, 0x4c, 0x7e, 0x76, 0x00, 0x34, 0xdd, + 0xc3, 0xeb, 0x88, 0xa5, 0x48, 0xbf, 0x84, 0x5e, 0x6c, 0xac, 0x72, 0x85, 0x5d, 0xb3, 0xc2, 0xcf, + 0x56, 0x2e, 0x60, 0x19, 0x69, 0xb6, 0x18, 0xe2, 0xda, 0xa6, 0xcf, 0xc0, 0x63, 0x3c, 0xc1, 0x79, + 0x96, 0x54, 0x82, 0x68, 0xf7, 0x38, 0x69, 0xce, 0xa8, 0xbd, 0x3a, 0xa3, 0x21, 0xb8, 0x59, 0x62, + 0x85, 0x76, 0xb3, 0x64, 0x82, 0x40, 0x1e, 0x0e, 0x38, 0xcb, 0x58, 0xba, 0x78, 0x42, 0xc8, 0xf9, + 0x5f, 0x84, 0xdc, 0x26, 0xa1, 0xc9, 0x6f, 0x0e, 0xf4, 0x1f, 0xf2, 0x2e, 0xf6, 0xe9, 0xd7, 0x00, + 0x4a, 0x44, 0x4c, 0x66, 0x2a, 0xe3, 0xcc, 0x1e, 0xb1, 0xf3, 0xbe, 0x23, 0xea, 0xa0, 0xb0, 0x91, + 0x40, 0x5f, 0x81, 0x57, 0x1e, 0x5b, 0x8e, 0xb2, 0xf9, 0x6a, 0x3c, 0x6e, 0x27, 0xac, 0x22, 0x9b, + 0xaa, 0xb4, 0x56, 0x54, 0xd9, 0x3b, 0x82, 0x6e, 0xfd, 0x42, 0xd3, 0x11, 0xf4, 0x8c, 0x73, 0xca, + 0x45, 0x1e, 0x2d, 0xc8, 0x1a, 0xfd, 0x00, 0x46, 0x06, 0x78, 0xa8, 0x4c, 0x1c, 0xfa, 0x21, 0x6c, + 0x3c, 0x02, 0x2f, 0xf6, 0x89, 0xbb, 0xf7, 0x4b, 0x0b, 0x7a, 0x8d, 0x47, 0x87, 0x02, 0x74, 0x66, + 0x32, 0x3d, 0x5a, 0x16, 0x64, 0x8d, 0xf6, 0xc0, 0x9b, 0xc9, 0xf4, 0x35, 0x46, 0x8a, 0x38, 0x74, + 0x08, 0x30, 0x93, 0xe9, 0x5b, 0xc1, 0x0b, 0x2e, 0x91, 0xb8, 0x74, 0x00, 0xdd, 0x99, 0x4c, 0x0f, + 0x8a, 0x02, 0x59, 0x42, 0x5a, 0xba, 0x7c, 0xed, 0x86, 0x28, 0x0b, 0xce, 0x24, 0x92, 0x36, 0xa5, + 0x30, 0x9c, 0xc9, 0x34, 0x2c, 0xef, 0xf2, 0x05, 0x57, 0x48, 0xd6, 0xe9, 0x73, 0xd8, 0x5a, 0xc5, + 0xea, 0xf8, 0x8e, 0xee, 0x65, 0x26, 0xd3, 0xea, 0xd2, 0x13, 0x8f, 0x12, 0xe8, 0x6b, 0x3e, 0x18, + 0x09, 0x75, 0xa9, 0x89, 0xf8, 0x34, 0x80, 0xcd, 0x26, 0x52, 0x27, 0x77, 0xed, 0x61, 0xef, 0x98, + 0xc0, 0x28, 0xbe, 0x8e, 0x2e, 0x17, 0x48, 0x80, 0x6e, 0xc0, 0xc0, 0x16, 0xd4, 0x97, 0x6d, 0x29, + 0x49, 0xcf, 0x86, 0x1d, 0x5e, 0x63, 0xfc, 0xc3, 0x77, 0x4b, 0x2e, 0x96, 0x39, 0xe9, 0x5b, 0xfa, + 0x66, 0x78, 0x57, 0x28, 0x4e, 0x30, 0x4a, 0x50, 0x90, 0x81, 0xcd, 0x3e, 0xcf, 0x72, 0xe4, 0x4b, + 0x75, 0xca, 0x7f, 0x22, 0x43, 0x4b, 0x28, 0xc4, 0x28, 0x39, 0xd6, 0x6f, 0x26, 0x19, 0xd1, 0x4d, + 0x20, 0x4d, 0x44, 0x13, 0x22, 0xc4, 0x56, 0xb4, 0x5d, 0xbe, 0x15, 0x68, 0x9a, 0xdf, 0xa0, 0x3b, + 0xb0, 0xfd, 0x04, 0xae, 0x5b, 0xa0, 0x7b, 0x5f, 0xc1, 0xe6, 0xfb, 0x76, 0x89, 0xfa, 0xd0, 0x3e, + 0x58, 0x2a, 0x4e, 0xd6, 0x68, 0x1f, 0xfc, 0xe3, 0xbc, 0x58, 0x64, 0x71, 0xa6, 0xa7, 0xd2, 0x07, + 0xff, 0xcd, 0xad, 0xf5, 0xdc, 0xbd, 0x03, 0x18, 0xae, 0x2e, 0xbb, 0x1e, 0xe1, 0x41, 0x92, 0x9c, + 0xf2, 0x04, 0xc9, 0x9a, 0x1e, 0x61, 0x88, 0x39, 0xbf, 0x41, 0xe3, 0x3b, 0x5a, 0x88, 0x83, 0x24, + 0x39, 0x29, 0x5f, 0x02, 0x83, 0xb9, 0xaf, 0xc9, 0x5f, 0xf7, 0xbb, 0xce, 0xdf, 0xf7, 0xbb, 0xce, + 0x3f, 0xf7, 0xbb, 0xce, 0xaf, 0xff, 0xee, 0xae, 0x5d, 0x76, 0xcc, 0x2f, 0xc4, 0xab, 0xff, 0x02, + 0x00, 0x00, 0xff, 0xff, 0xc1, 0x58, 0x43, 0x28, 0x53, 0x08, 0x00, 0x00, } func (m *Entry) Marshal() (dAtA []byte, err error) { @@ -1208,6 +1216,11 @@ func (m *Message) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if m.Ts != 0 { + i = encodeVarintEraftpb(dAtA, i, uint64(m.Ts)) + i-- + dAtA[i] = 0x78 + } if m.Priority != 0 { i = encodeVarintEraftpb(dAtA, i, uint64(m.Priority)) i-- @@ -1732,6 +1745,9 @@ func (m *Message) Size() (n int) { if m.Priority != 0 { n += 1 + sovEraftpb(uint64(m.Priority)) } + if m.Ts != 0 { + n += 1 + sovEraftpb(uint64(m.Ts)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -2661,6 +2677,25 @@ func (m *Message) Unmarshal(dAtA []byte) error { break } } + case 15: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Ts", wireType) + } + m.Ts = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowEraftpb + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Ts |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipEraftpb(dAtA[iNdEx:]) diff --git a/pkg/kvrpcpb/kvrpcpb.pb.go b/pkg/kvrpcpb/kvrpcpb.pb.go index ac2c9ced0..fe8a3b06d 100644 --- a/pkg/kvrpcpb/kvrpcpb.pb.go +++ b/pkg/kvrpcpb/kvrpcpb.pb.go @@ -1901,10 +1901,9 @@ type CheckTxnStatusResponse struct { RegionError *errorpb.Error `protobuf:"bytes,1,opt,name=region_error,json=regionError,proto3" json:"region_error,omitempty"` Error *KeyError `protobuf:"bytes,2,opt,name=error,proto3" json:"error,omitempty"` // Three kinds of transaction status: - // - // locked: lock_ttl > 0 - // committed: commit_version > 0 - // rollbacked: lock_ttl = 0 && commit_version = 0 + // locked: lock_ttl > 0 + // committed: commit_version > 0 + // rollbacked: lock_ttl = 0 && commit_version = 0 LockTtl uint64 `protobuf:"varint,3,opt,name=lock_ttl,json=lockTtl,proto3" json:"lock_ttl,omitempty"` CommitVersion uint64 `protobuf:"varint,4,opt,name=commit_version,json=commitVersion,proto3" json:"commit_version,omitempty"` // The action performed by TiKV (and why if the action is to rollback). @@ -3518,7 +3517,7 @@ type FlashbackToVersionRequest struct { Version uint64 `protobuf:"varint,2,opt,name=version,proto3" json:"version,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"` - // The `start_ts“ and `commit_ts` which the newly written MVCC version will use. + // The `start_ts`` and `commit_ts` which the newly written MVCC version will use. // Please make sure the `start_ts` is the same one in `PrepareFlashbackToVersionRequest`. StartTs uint64 `protobuf:"varint,5,opt,name=start_ts,json=startTs,proto3" json:"start_ts,omitempty"` CommitTs uint64 `protobuf:"varint,6,opt,name=commit_ts,json=commitTs,proto3" json:"commit_ts,omitempty"` @@ -9415,7 +9414,6 @@ func (m *RawChecksumResponse) GetTotalBytes() uint64 { type CompactError struct { // Types that are valid to be assigned to Error: - // // *CompactError_ErrInvalidStartKey // *CompactError_ErrPhysicalTableNotExist // *CompactError_ErrCompactInProgress diff --git a/pkg/tracepb/tracepb.pb.go b/pkg/tracepb/tracepb.pb.go index 55cf091a7..e5b4919fe 100644 --- a/pkg/tracepb/tracepb.pb.go +++ b/pkg/tracepb/tracepb.pb.go @@ -68,7 +68,6 @@ var xxx_messageInfo_TraceRecordRequest proto.InternalMessageInfo type TraceRecord struct { // Types that are valid to be assigned to RecordOneof: - // // *TraceRecord_Report // *TraceRecord_NotifyCollect RecordOneof isTraceRecord_RecordOneof `protobuf_oneof:"record_oneof"`