From 3565b63df5045aa37e6fbcdf8ee670e99a94a3ba Mon Sep 17 00:00:00 2001 From: iamlinjunhong <1030420200@qq.com> Date: Fri, 27 Dec 2024 11:14:47 +0800 Subject: [PATCH] Revert "abort lock table when tn restart (#20915)" This reverts commit 4803a23b26e8738cfabbfed255f64ce7669964c6. --- pkg/lockservice/lock_table_allocator.go | 13 +- pkg/lockservice/lock_table_allocator_test.go | 4 +- pkg/lockservice/lock_table_keeper.go | 2 - pkg/lockservice/service.go | 2 - pkg/lockservice/types.go | 2 +- pkg/pb/lock/lock.pb.go | 325 ++++++++----------- proto/lock.proto | 2 - 7 files changed, 132 insertions(+), 218 deletions(-) diff --git a/pkg/lockservice/lock_table_allocator.go b/pkg/lockservice/lock_table_allocator.go index 2f6e6900f0307..0131b65c4cdb3 100644 --- a/pkg/lockservice/lock_table_allocator.go +++ b/pkg/lockservice/lock_table_allocator.go @@ -117,15 +117,12 @@ func (l *lockTableAllocator) Get( return l.registerBind(binds, group, tableID, originTableID, sharding) } -func (l *lockTableAllocator) KeepLockTableBind( - serviceID string, - version uint64, -) bool { +func (l *lockTableAllocator) KeepLockTableBind(serviceID string) bool { b := l.getServiceBinds(serviceID) if b == nil { return false } - return b.active() && (version == 0 || version == l.version) + return b.active() } func (l *lockTableAllocator) AddCannotCommit(values []pb.OrphanTxn) [][]byte { @@ -838,16 +835,12 @@ func (l *lockTableAllocator) handleKeepLockTableBind( req *pb.Request, resp *pb.Response, cs morpc.ClientSession) { - resp.KeepLockTableBind.OK = l.KeepLockTableBind( - req.KeepLockTableBind.ServiceID, - req.KeepLockTableBind.Version, - ) + resp.KeepLockTableBind.OK = l.KeepLockTableBind(req.KeepLockTableBind.ServiceID) if !resp.KeepLockTableBind.OK { // resp.KeepLockTableBind.Status = pb.Status_ServiceCanRestart writeResponse(l.logger, cancel, resp, nil, cs) return } - resp.KeepLockTableBind.Version = l.version b := l.getServiceBinds(req.KeepLockTableBind.ServiceID) if b.isStatus(pb.Status_ServiceLockEnable) { if req.KeepLockTableBind.Status != pb.Status_ServiceLockEnable { diff --git a/pkg/lockservice/lock_table_allocator_test.go b/pkg/lockservice/lock_table_allocator_test.go index 8cd12c9d36f15..0356dcef98266 100644 --- a/pkg/lockservice/lock_table_allocator_test.go +++ b/pkg/lockservice/lock_table_allocator_test.go @@ -201,9 +201,7 @@ func TestKeepaliveBind(t *testing.T) { time.Sleep(time.Millisecond * 20) } - assert.True(t, a.KeepLockTableBind("s1", 0)) - - assert.False(t, a.KeepLockTableBind("s1", 1)) + assert.True(t, a.KeepLockTableBind("s1")) }) } diff --git a/pkg/lockservice/lock_table_keeper.go b/pkg/lockservice/lock_table_keeper.go index 91ca6a98ba599..71e677eca864a 100644 --- a/pkg/lockservice/lock_table_keeper.go +++ b/pkg/lockservice/lock_table_keeper.go @@ -184,7 +184,6 @@ func (k *lockTableKeeper) doKeepLockTableBind(ctx context.Context) { req.Method = pb.Method_KeepLockTableBind req.KeepLockTableBind.ServiceID = k.serviceID req.KeepLockTableBind.Status = k.service.getStatus() - req.KeepLockTableBind.Version = k.service.tnVersion if !k.service.isStatus(pb.Status_ServiceLockEnable) { req.KeepLockTableBind.LockTables = k.service.topGroupTables() req.KeepLockTableBind.TxnIDs = k.service.activeTxnHolder.getAllTxnID() @@ -201,7 +200,6 @@ func (k *lockTableKeeper) doKeepLockTableBind(ctx context.Context) { defer releaseResponse(resp) if resp.KeepLockTableBind.OK { - k.service.tnVersion = resp.KeepLockTableBind.Version switch resp.KeepLockTableBind.Status { case pb.Status_ServiceLockEnable: if !k.service.isStatus(pb.Status_ServiceLockEnable) { diff --git a/pkg/lockservice/service.go b/pkg/lockservice/service.go index d10ecdcf82f24..1991ada66e1fa 100644 --- a/pkg/lockservice/service.go +++ b/pkg/lockservice/service.go @@ -56,7 +56,6 @@ type service struct { stopOnce sync.Once fetchWhoWaitingListC chan who logger *log.MOLogger - tnVersion uint64 remote struct { client Client @@ -97,7 +96,6 @@ func NewLockService( stopper.WithLogger(getLogger(cfg.ServiceID).RawLogger())), fetchWhoWaitingListC: make(chan who, 10240), logger: getLogger(cfg.ServiceID), - tnVersion: 0, } for _, opt := range opts { diff --git a/pkg/lockservice/types.go b/pkg/lockservice/types.go index 346dd6827cf3a..23ea0c8918a1a 100644 --- a/pkg/lockservice/types.go +++ b/pkg/lockservice/types.go @@ -182,7 +182,7 @@ type LockTableAllocator interface { // KeepLockTableBind once a cn is bound to a Table, a heartbeat needs to be sent // periodically to keep the binding in place. If no heartbeat is sent for a long // period of time to maintain the binding, the binding will become invalid. - KeepLockTableBind(serviceID string, version uint64) bool + KeepLockTableBind(serviceID string) bool // Valid check for changes in the binding relationship of a specific lock-table. Valid(serviceID string, txnID []byte, binds []pb.LockTable) ([]uint64, error) // AddCannotCommit add cannot commit txn. diff --git a/pkg/pb/lock/lock.pb.go b/pkg/pb/lock/lock.pb.go index 7cb6aa2e032b7..8285cf62b3b0b 100644 --- a/pkg/pb/lock/lock.pb.go +++ b/pkg/pb/lock/lock.pb.go @@ -1469,7 +1469,6 @@ type KeepLockTableBindRequest struct { Status Status `protobuf:"varint,2,opt,name=Status,proto3,enum=lock.Status" json:"Status,omitempty"` TxnIDs [][]byte `protobuf:"bytes,3,rep,name=TxnIDs,proto3" json:"TxnIDs,omitempty"` LockTables []LockTable `protobuf:"bytes,4,rep,name=LockTables,proto3" json:"LockTables"` - Version uint64 `protobuf:"varint,5,opt,name=Version,proto3" json:"Version,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1536,18 +1535,10 @@ func (m *KeepLockTableBindRequest) GetLockTables() []LockTable { return nil } -func (m *KeepLockTableBindRequest) GetVersion() uint64 { - if m != nil { - return m.Version - } - return 0 -} - // KeepLockTableBindResponse keep lock table bind response. TN -> CN type KeepLockTableBindResponse struct { OK bool `protobuf:"varint,1,opt,name=OK,proto3" json:"OK,omitempty"` Status Status `protobuf:"varint,2,opt,name=Status,proto3,enum=lock.Status" json:"Status,omitempty"` - Version uint64 `protobuf:"varint,3,opt,name=Version,proto3" json:"Version,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1600,13 +1591,6 @@ func (m *KeepLockTableBindResponse) GetStatus() Status { return Status_ServiceLockEnable } -func (m *KeepLockTableBindResponse) GetVersion() uint64 { - if m != nil { - return m.Version - } - return 0 -} - // SetRestartServiceRequest set restart lock service request from allocator request. operator -> TN type SetRestartServiceRequest struct { ServiceID string `protobuf:"bytes,1,opt,name=ServiceID,proto3" json:"ServiceID,omitempty"` @@ -2771,134 +2755,133 @@ func init() { func init() { proto.RegisterFile("lock.proto", fileDescriptor_164ad2988c7acaf1) } var fileDescriptor_164ad2988c7acaf1 = []byte{ - // 2022 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x59, 0xdd, 0x72, 0xdb, 0xc6, - 0x15, 0x16, 0x48, 0x8a, 0x3f, 0x87, 0x7f, 0xd0, 0x4a, 0x96, 0x21, 0x37, 0x95, 0x59, 0x8c, 0x33, - 0xc3, 0x28, 0x8d, 0x35, 0x96, 0xeb, 0x24, 0x75, 0x1a, 0x4f, 0x6d, 0xca, 0x56, 0x14, 0x5b, 0x56, - 0x66, 0x49, 0xbb, 0x33, 0xbd, 0x83, 0xc8, 0xb5, 0x84, 0x11, 0x09, 0xb0, 0x20, 0xa8, 0x9f, 0x07, - 0xe8, 0x4c, 0x9f, 0xa0, 0xd7, 0xbd, 0xcc, 0x7b, 0xb4, 0x33, 0xcd, 0x65, 0x66, 0x7a, 0xdf, 0x69, - 0xdd, 0x57, 0xe8, 0x03, 0x74, 0xce, 0xee, 0x82, 0xd8, 0xc5, 0x8f, 0x18, 0xf7, 0x0e, 0x7b, 0xce, - 0xd9, 0xf3, 0x87, 0xb3, 0xdf, 0x9e, 0x03, 0x00, 0x8c, 0xfd, 0xe1, 0xf9, 0xfd, 0x69, 0xe0, 0x87, - 0x3e, 0x29, 0xe1, 0xf3, 0x9d, 0xcf, 0x4e, 0xdd, 0xf0, 0x6c, 0x7e, 0x72, 0x7f, 0xe8, 0x4f, 0x76, - 0x4f, 0xfd, 0x53, 0x7f, 0x97, 0x33, 0x4f, 0xe6, 0xef, 0xf8, 0x8a, 0x2f, 0xf8, 0x93, 0xd8, 0x74, - 0xa7, 0x1d, 0xba, 0x13, 0x36, 0x0b, 0x9d, 0xc9, 0x54, 0x10, 0xec, 0xff, 0x16, 0xa0, 0xfe, 0xca, - 0x1f, 0x9e, 0x1f, 0x4f, 0x43, 0xd7, 0xf7, 0x66, 0xe4, 0x21, 0xd4, 0x0f, 0x02, 0xc7, 0x9b, 0x8f, - 0x9d, 0xc0, 0x0d, 0xaf, 0x2d, 0xa3, 0x63, 0x74, 0x5b, 0x7b, 0x6b, 0xf7, 0xb9, 0x5d, 0x85, 0x41, - 0x55, 0x29, 0x62, 0x43, 0xe9, 0xc8, 0x1f, 0x31, 0xab, 0xc0, 0xa5, 0x5b, 0x42, 0x1a, 0xb5, 0x22, - 0x95, 0x72, 0x1e, 0xe9, 0x42, 0xf9, 0x3b, 0x7f, 0xec, 0x0e, 0xaf, 0xad, 0x22, 0x97, 0x32, 0x85, - 0xd4, 0xef, 0x1c, 0x37, 0x14, 0x74, 0x2a, 0xf9, 0xe4, 0x23, 0xa8, 0xbd, 0xf0, 0x83, 0x4b, 0x27, - 0x18, 0x0d, 0x7c, 0xab, 0xd4, 0x31, 0xba, 0x35, 0x1a, 0x13, 0x48, 0x17, 0xda, 0x03, 0xe7, 0x64, - 0xcc, 0xf6, 0xd9, 0xbb, 0xde, 0x99, 0xe3, 0x9d, 0xb2, 0x91, 0xb5, 0xda, 0x31, 0xba, 0x55, 0x9a, - 0x24, 0xa3, 0x1e, 0xca, 0xc2, 0xe0, 0x1a, 0x4d, 0x58, 0xe5, 0x8e, 0xd1, 0x2d, 0xd2, 0x98, 0x40, - 0x36, 0x60, 0xf5, 0x20, 0xf0, 0xe7, 0x53, 0xab, 0xd2, 0x31, 0xba, 0x4d, 0x2a, 0x16, 0x64, 0x07, - 0xaa, 0xfd, 0x33, 0x27, 0x18, 0xb9, 0xde, 0xa9, 0x55, 0x55, 0xa3, 0x89, 0xa8, 0x74, 0xc1, 0x27, - 0x8f, 0x01, 0xfa, 0x9e, 0x33, 0xed, 0x9f, 0xf9, 0xe1, 0x60, 0x66, 0xd5, 0x3a, 0x46, 0xb7, 0xbe, - 0xb7, 0x71, 0x3f, 0x4e, 0xf0, 0x20, 0x7a, 0x7a, 0x56, 0xfa, 0xe1, 0x9f, 0x77, 0x57, 0xa8, 0x22, - 0x6d, 0xff, 0xc3, 0x80, 0x1a, 0x26, 0x88, 0xfb, 0x8c, 0xbe, 0xf0, 0x07, 0x9e, 0xee, 0x12, 0x15, - 0x0b, 0xf4, 0xbf, 0xcf, 0x82, 0x0b, 0x77, 0xc8, 0x0e, 0xf7, 0x79, 0x6a, 0x6b, 0x34, 0x26, 0x10, - 0x0b, 0x2a, 0x6f, 0x59, 0x30, 0x73, 0x7d, 0x8f, 0x27, 0xb4, 0x44, 0xa3, 0x25, 0x6a, 0x7b, 0xeb, - 0x8c, 0xdd, 0x11, 0xcf, 0x5d, 0x95, 0x8a, 0x45, 0x1c, 0xef, 0x6a, 0x5e, 0xbc, 0xe5, 0x25, 0xf1, - 0x76, 0xa0, 0x7e, 0x1c, 0xb8, 0xa7, 0xae, 0x27, 0x7c, 0xad, 0x70, 0xab, 0x2a, 0xc9, 0xfe, 0xbe, - 0x06, 0x15, 0xca, 0xfe, 0x30, 0x67, 0xb3, 0x50, 0x64, 0x9f, 0x3f, 0x1e, 0xee, 0xcb, 0xb8, 0x62, - 0x02, 0x79, 0xa8, 0x84, 0xcf, 0x63, 0xab, 0xef, 0xb5, 0xe3, 0xb2, 0xe1, 0x64, 0x99, 0x35, 0x25, - 0x4d, 0xf7, 0xa0, 0x7c, 0xc4, 0xc2, 0x33, 0x7f, 0x24, 0x4b, 0xa8, 0x21, 0x76, 0x08, 0x1a, 0x95, - 0x3c, 0xf2, 0x29, 0x94, 0x70, 0x0b, 0x8f, 0xbe, 0x1e, 0x95, 0x2e, 0x52, 0xa4, 0x75, 0xa9, 0x97, - 0x0b, 0x91, 0x07, 0x50, 0x7e, 0xe3, 0xa1, 0x04, 0x4f, 0x4b, 0x7d, 0x6f, 0x5d, 0x88, 0x0b, 0x9a, - 0xbe, 0x41, 0x0a, 0x92, 0xaf, 0x01, 0x0e, 0x58, 0x38, 0xb8, 0xf2, 0xb8, 0x95, 0x32, 0xdf, 0x76, - 0x5b, 0x1e, 0x90, 0x05, 0x5d, 0xdf, 0xaa, 0x6c, 0x20, 0x87, 0xd0, 0x3a, 0x60, 0x21, 0x96, 0xa0, - 0xeb, 0x9d, 0xbe, 0x72, 0x67, 0x21, 0x4f, 0x64, 0x7d, 0xef, 0x67, 0x0b, 0x15, 0x0a, 0x4f, 0x57, - 0x93, 0xd8, 0x48, 0x7e, 0x05, 0x95, 0x03, 0x16, 0x3e, 0x73, 0xbd, 0x11, 0xaf, 0x55, 0xac, 0xbe, - 0x48, 0x07, 0x12, 0xf5, 0xcd, 0x91, 0x28, 0xa1, 0xb0, 0xf6, 0x92, 0xb1, 0x69, 0x9c, 0x67, 0xdc, - 0x2f, 0xaa, 0x77, 0x5b, 0xec, 0x4f, 0xb1, 0x75, 0x4d, 0xe9, 0xed, 0x18, 0x14, 0x12, 0x29, 0x9b, - 0xf8, 0x21, 0xe3, 0x79, 0x01, 0x35, 0x28, 0x9d, 0x97, 0x08, 0x4a, 0x67, 0x92, 0x57, 0xd0, 0xe6, - 0x05, 0xeb, 0x84, 0x4c, 0x16, 0xbb, 0x55, 0xe7, 0xba, 0x3e, 0x12, 0xba, 0x12, 0x4c, 0x5d, 0x59, - 0x72, 0x2b, 0xe9, 0x41, 0xa3, 0xe7, 0x78, 0x9e, 0x1f, 0xf6, 0xfc, 0xc9, 0xc4, 0x0d, 0xad, 0x06, - 0x57, 0xb5, 0x25, 0x54, 0xa9, 0x1c, 0x5d, 0x8f, 0xb6, 0x09, 0x95, 0x1c, 0xb0, 0xf0, 0xe9, 0x30, - 0x74, 0x2f, 0xd8, 0xe0, 0xca, 0xb3, 0x9a, 0xaa, 0x12, 0x95, 0x93, 0x50, 0xa2, 0xb2, 0x30, 0xed, - 0x7d, 0x16, 0x52, 0x44, 0x84, 0x20, 0x8c, 0x22, 0x6b, 0xa9, 0x69, 0x4f, 0xb1, 0x13, 0x69, 0x4f, - 0xf1, 0x51, 0x67, 0xcf, 0xf1, 0x12, 0x3a, 0xdb, 0xaa, 0xce, 0x14, 0x3b, 0xa1, 0x33, 0xc5, 0x27, - 0x6f, 0x80, 0x50, 0x36, 0x71, 0x5c, 0x6f, 0x70, 0xe5, 0x1d, 0x7a, 0x91, 0x52, 0x93, 0x2b, 0xbd, - 0x2b, 0x94, 0xa6, 0xf9, 0xba, 0xd6, 0x0c, 0x05, 0xe4, 0xb7, 0x50, 0xef, 0x9d, 0xb1, 0xe1, 0xf9, - 0x71, 0x30, 0x3d, 0x73, 0x3c, 0x6b, 0x8d, 0xeb, 0xb3, 0xa4, 0x93, 0x31, 0x43, 0x57, 0xa4, 0x6e, - 0xc1, 0xc2, 0xa0, 0x6c, 0x36, 0x9f, 0xb0, 0x43, 0xef, 0x02, 0xdf, 0x72, 0xef, 0xb5, 0x45, 0xd4, - 0xc2, 0x48, 0x30, 0x13, 0x85, 0x91, 0xe0, 0xda, 0x7f, 0xab, 0x41, 0x95, 0xb2, 0xd9, 0xd4, 0xf7, - 0x66, 0x6c, 0x09, 0x56, 0xc5, 0xb0, 0x53, 0xb8, 0x01, 0x76, 0x36, 0x60, 0xf5, 0x79, 0x10, 0xf8, - 0x01, 0xc7, 0xa6, 0x06, 0x15, 0x0b, 0xf2, 0x09, 0x54, 0x5e, 0xb3, 0x4b, 0x7e, 0xc4, 0x4a, 0x99, - 0x28, 0x47, 0x23, 0x3e, 0xf9, 0xa5, 0xc4, 0x2d, 0x01, 0x44, 0x44, 0xc5, 0x2d, 0xe1, 0xa6, 0x06, - 0x5c, 0x7b, 0x0b, 0xe0, 0x2a, 0xab, 0x47, 0x3f, 0x02, 0x2e, 0x6d, 0x47, 0x84, 0x5c, 0x4f, 0x34, - 0xe4, 0xaa, 0xa8, 0xaf, 0x40, 0x45, 0x2e, 0x6d, 0xaf, 0x0a, 0x5d, 0xdf, 0xa6, 0xa0, 0xab, 0xaa, - 0xbe, 0x80, 0x24, 0x74, 0x69, 0x7a, 0x92, 0xd8, 0xf5, 0x28, 0xc6, 0x2e, 0x81, 0x3d, 0xb7, 0x12, - 0xd8, 0xa5, 0xed, 0x5e, 0x80, 0x57, 0x3f, 0x0b, 0xbc, 0x40, 0x2d, 0xce, 0x0c, 0xf0, 0xd2, 0x54, - 0x65, 0xa0, 0xd7, 0xb7, 0x29, 0xf4, 0xd2, 0x10, 0x27, 0x89, 0x5e, 0x7a, 0x5c, 0x09, 0xf8, 0x3a, - 0x4a, 0xc3, 0x97, 0xc0, 0x9c, 0x9f, 0xe7, 0xc0, 0x97, 0xa6, 0x2d, 0x85, 0x5f, 0xfb, 0x09, 0xfc, - 0x12, 0xd0, 0x73, 0x27, 0x0b, 0xbf, 0x34, 0x45, 0x3a, 0x80, 0xed, 0x27, 0x00, 0xac, 0xa5, 0x6a, - 0xd1, 0x01, 0x4c, 0xd7, 0xa2, 0x21, 0x58, 0x3f, 0x0b, 0xc1, 0xda, 0x6a, 0xee, 0x33, 0x10, 0x4c, - 0xcf, 0x7d, 0x1a, 0xc2, 0xfa, 0x59, 0x10, 0xa6, 0xa1, 0x4d, 0x06, 0x84, 0xe9, 0x4a, 0xd3, 0x18, - 0xf6, 0x36, 0x13, 0xc3, 0x04, 0xe6, 0x74, 0xf2, 0x31, 0x4c, 0x53, 0x9b, 0x05, 0x62, 0x4f, 0x75, - 0x10, 0x23, 0xda, 0x65, 0xa2, 0x82, 0x98, 0xa6, 0x49, 0x43, 0xb1, 0xa3, 0x34, 0x8a, 0xad, 0xab, - 0xf5, 0x91, 0x42, 0x31, 0xbd, 0x3e, 0x92, 0x30, 0xf6, 0x27, 0x43, 0xb4, 0xef, 0x51, 0xd7, 0x85, - 0x9d, 0xe4, 0x95, 0x27, 0x51, 0xac, 0x41, 0xc5, 0x62, 0x49, 0x27, 0x49, 0xa0, 0x44, 0xfd, 0xcb, - 0x99, 0x55, 0xec, 0x14, 0xbb, 0x0d, 0xca, 0x9f, 0xc9, 0x03, 0xa8, 0xc8, 0x89, 0x20, 0xdd, 0x47, - 0x49, 0x46, 0x74, 0x34, 0xe5, 0xd2, 0x7e, 0x0c, 0x0d, 0xf5, 0x7c, 0x90, 0x1d, 0x28, 0xa3, 0xb7, - 0xe3, 0x90, 0xfb, 0x52, 0x8f, 0x60, 0x53, 0xd0, 0x22, 0x64, 0x12, 0x2b, 0xfb, 0x2b, 0x58, 0x4b, - 0xf5, 0x4e, 0x39, 0xb1, 0x98, 0x50, 0xa4, 0xfe, 0x25, 0x8f, 0xa2, 0x41, 0xf1, 0xd1, 0x76, 0x80, - 0xa4, 0xe1, 0x4b, 0x76, 0xc1, 0x73, 0xd1, 0x53, 0xaf, 0x52, 0xb1, 0x20, 0x8f, 0xa0, 0xae, 0xe2, - 0x57, 0xa1, 0x53, 0xec, 0xd6, 0xf7, 0x9a, 0xf1, 0x28, 0x32, 0xb8, 0xf2, 0xa2, 0xb7, 0xa6, 0xc8, - 0xd9, 0x4f, 0xe0, 0x56, 0x66, 0x63, 0x46, 0x3e, 0x86, 0x22, 0x1e, 0x28, 0x11, 0x61, 0xa6, 0x1e, - 0xe4, 0xdb, 0xc7, 0xb0, 0x99, 0x8d, 0x8e, 0x49, 0x87, 0x8c, 0x9f, 0xe8, 0xd0, 0xd7, 0x50, 0x91, - 0xdc, 0xfc, 0x57, 0xde, 0x0b, 0x98, 0x13, 0xb2, 0xd1, 0xb1, 0x17, 0xbd, 0xf2, 0x05, 0xc1, 0xfe, - 0xb3, 0x01, 0x4d, 0xad, 0xc7, 0xcd, 0xd1, 0xf2, 0x39, 0x54, 0x05, 0x84, 0x0c, 0xfa, 0xb2, 0x4b, - 0xbf, 0x69, 0xc0, 0x59, 0xc8, 0x92, 0x2f, 0xa0, 0x76, 0x34, 0x0f, 0x1d, 0x51, 0x40, 0x45, 0x1e, - 0x93, 0xec, 0xac, 0x9f, 0x5f, 0x85, 0x81, 0x13, 0xf1, 0xa2, 0x16, 0x7f, 0x21, 0x6b, 0x9b, 0xd0, - 0xd2, 0xaf, 0x30, 0xfb, 0x7b, 0x83, 0xdf, 0x3a, 0x4a, 0x1b, 0xaa, 0x97, 0xb3, 0x91, 0x2c, 0xe7, - 0xc5, 0x30, 0x55, 0x50, 0x87, 0xa9, 0xc5, 0xf8, 0x53, 0xcc, 0x1b, 0x7f, 0x4a, 0x1f, 0x36, 0xfe, - 0xac, 0xa6, 0xc7, 0x9f, 0x17, 0xd0, 0x4e, 0x5c, 0x5f, 0xff, 0xd7, 0x9c, 0x63, 0xff, 0xdd, 0x00, - 0x2b, 0xaf, 0x07, 0x5f, 0x12, 0xfc, 0x3d, 0x28, 0xf7, 0x43, 0x27, 0x9c, 0xcf, 0xf4, 0x5e, 0x45, - 0xd0, 0xa8, 0xe4, 0x91, 0x4d, 0x28, 0xf3, 0xf7, 0x1b, 0x9d, 0x79, 0xb9, 0x22, 0x8f, 0x00, 0x16, - 0x36, 0xf1, 0xe0, 0x17, 0xf3, 0xdd, 0x55, 0x04, 0xd5, 0x51, 0x74, 0x55, 0x1b, 0x45, 0xed, 0x73, - 0xd8, 0xca, 0xbd, 0x8f, 0x49, 0x0b, 0x0a, 0xc7, 0x2f, 0x79, 0x08, 0x55, 0x5a, 0x38, 0x7e, 0xf9, - 0x13, 0x7d, 0xcf, 0x9d, 0x7b, 0xed, 0x2f, 0xc1, 0xca, 0x6b, 0xa1, 0x6f, 0xce, 0x9a, 0xfd, 0x29, - 0x6c, 0xe5, 0x5e, 0x5d, 0x49, 0x37, 0xd1, 0x4c, 0x5e, 0x57, 0xbd, 0xdc, 0x4c, 0xee, 0x65, 0x96, - 0x32, 0xf3, 0x6b, 0xd8, 0xca, 0xed, 0xb3, 0x97, 0xd8, 0x79, 0x0c, 0x77, 0xf2, 0xaf, 0x37, 0xd1, - 0xec, 0x4a, 0xae, 0x04, 0xc7, 0x98, 0x60, 0x3f, 0x82, 0x5b, 0x99, 0xd3, 0xda, 0x12, 0x93, 0x5d, - 0xd8, 0xcc, 0x6e, 0x93, 0x52, 0x71, 0x7d, 0x0e, 0x9b, 0xd9, 0x23, 0xdc, 0x12, 0x0b, 0x9f, 0xc0, - 0xed, 0x9c, 0xde, 0x29, 0x65, 0x82, 0xc2, 0x7a, 0xc6, 0x68, 0x47, 0xbe, 0x82, 0xa6, 0xb8, 0x84, - 0xf1, 0xaa, 0x88, 0xc1, 0x56, 0x16, 0xf8, 0x82, 0x25, 0x0b, 0x5c, 0x97, 0xb5, 0x7f, 0x03, 0x1b, - 0x59, 0xed, 0x16, 0xb9, 0x07, 0x4d, 0x41, 0x41, 0x68, 0x16, 0x19, 0xc5, 0x13, 0xa5, 0x13, 0xed, - 0x87, 0xb0, 0x9e, 0x31, 0x27, 0x2e, 0x89, 0xf8, 0x09, 0x6c, 0x64, 0xf5, 0x66, 0xf1, 0xf7, 0x1d, - 0x43, 0xfd, 0xbe, 0x63, 0x8a, 0x9b, 0xa8, 0xc0, 0xcd, 0xf3, 0x4b, 0x67, 0x1f, 0x48, 0x7a, 0xb2, - 0x5a, 0x82, 0x1f, 0x0b, 0x2d, 0x46, 0xa4, 0xe5, 0x33, 0x58, 0xcf, 0x68, 0x6d, 0x10, 0x42, 0x64, - 0x17, 0x24, 0xbc, 0x90, 0x2b, 0xfb, 0x0b, 0xa8, 0x2d, 0x12, 0x87, 0x67, 0x35, 0x6a, 0xbe, 0x84, - 0xa5, 0x68, 0x99, 0xe1, 0xed, 0x1f, 0x8b, 0x51, 0xbf, 0x40, 0x1e, 0x40, 0x15, 0x4b, 0x88, 0x5f, - 0x5d, 0xc6, 0x4d, 0x98, 0xb9, 0x10, 0x43, 0x70, 0xfe, 0xc6, 0x99, 0xf5, 0x7c, 0xef, 0xdd, 0xd8, - 0x1d, 0x86, 0xdc, 0xff, 0x2a, 0x55, 0x49, 0xf8, 0xa2, 0xbe, 0x71, 0x66, 0xdf, 0x05, 0xec, 0x42, - 0xb6, 0xd2, 0x45, 0x2e, 0xa3, 0x13, 0xc9, 0x97, 0x50, 0x5b, 0xdc, 0x6a, 0xb2, 0xf3, 0xb9, 0xe9, - 0xc6, 0x8b, 0x85, 0x3f, 0xe0, 0xbb, 0x64, 0x07, 0xea, 0x91, 0x57, 0x2f, 0xd9, 0x35, 0x9f, 0xdf, - 0x1a, 0x54, 0x25, 0xa9, 0x12, 0x98, 0xa5, 0x8a, 0x2e, 0x81, 0x99, 0xdd, 0x06, 0x40, 0xaf, 0xb1, - 0x07, 0x60, 0x01, 0x1f, 0xc3, 0x1a, 0x54, 0xa1, 0x60, 0xe6, 0xc5, 0x93, 0xf8, 0x30, 0xd9, 0xa4, - 0xd1, 0x12, 0x77, 0xbe, 0x66, 0x97, 0x98, 0xb8, 0xa7, 0x23, 0x31, 0x3a, 0x55, 0xa9, 0x42, 0xb1, - 0xfb, 0xd0, 0xd4, 0xee, 0x68, 0x7c, 0x55, 0xe7, 0xec, 0x5a, 0xf6, 0x05, 0xf8, 0x88, 0x0d, 0xe3, - 0xec, 0xdc, 0x9d, 0xca, 0x2c, 0xf3, 0x67, 0x2c, 0xab, 0x80, 0x4d, 0xc7, 0xce, 0x90, 0x0d, 0x7c, - 0x39, 0x02, 0xc7, 0x04, 0x3c, 0xf4, 0xd9, 0xe3, 0xf9, 0x92, 0x23, 0xb0, 0x05, 0xb7, 0x73, 0x1a, - 0xe2, 0x9d, 0x5f, 0x68, 0x1f, 0xaa, 0x49, 0x85, 0xb7, 0x85, 0xe6, 0x0a, 0xa9, 0xc1, 0x2a, 0xc5, - 0x3c, 0x9b, 0xc6, 0xce, 0xc7, 0xa2, 0x8e, 0xf8, 0xe7, 0xe7, 0x26, 0xd4, 0x9e, 0x5f, 0x0d, 0xc7, - 0xf3, 0x99, 0x7b, 0xc1, 0xcc, 0x15, 0x02, 0x50, 0xc6, 0x8b, 0x9d, 0x8d, 0x4c, 0x63, 0xe7, 0x1e, - 0x40, 0xfc, 0x15, 0x9a, 0x54, 0xa1, 0x84, 0x2b, 0x73, 0x85, 0x34, 0xa0, 0xfa, 0xc2, 0x99, 0x85, - 0x2f, 0x1c, 0x77, 0x6c, 0x1a, 0x3b, 0x77, 0xe3, 0x56, 0x01, 0x65, 0x5e, 0xfb, 0x1e, 0x13, 0xd6, - 0x9e, 0x5d, 0xa3, 0x61, 0x63, 0xe7, 0xaf, 0x85, 0xe8, 0x3b, 0x01, 0xf2, 0xd1, 0xb0, 0xb0, 0x23, - 0xfa, 0x19, 0xd3, 0x20, 0x2d, 0x75, 0xfc, 0x36, 0x0b, 0x84, 0x24, 0xc7, 0x69, 0xb3, 0x88, 0x34, - 0x1d, 0x47, 0xcd, 0x12, 0xa9, 0x2f, 0x46, 0x65, 0x73, 0x95, 0xdc, 0xca, 0x18, 0x80, 0xcd, 0x32, - 0x69, 0x43, 0x5d, 0x7e, 0x22, 0xe7, 0x9b, 0x2a, 0x64, 0x0d, 0x9a, 0x92, 0x20, 0xed, 0x57, 0xc9, - 0x7a, 0x6a, 0x34, 0x35, 0x6b, 0xc4, 0xd4, 0x07, 0x4c, 0x13, 0x90, 0xa2, 0xc2, 0x8e, 0x59, 0x47, - 0x9b, 0xa9, 0xeb, 0xd1, 0x6c, 0x90, 0xcd, 0xac, 0x29, 0xcb, 0x6c, 0xa2, 0x78, 0xea, 0x9a, 0x33, - 0x5b, 0xe8, 0xa2, 0x02, 0x24, 0x66, 0x1b, 0xfd, 0x49, 0xbc, 0x5c, 0xd3, 0xdc, 0x61, 0x51, 0x13, - 0x20, 0xac, 0xf2, 0xcd, 0x18, 0xd2, 0x73, 0x0f, 0xa3, 0x35, 0x57, 0xd0, 0xaa, 0x42, 0x96, 0xd9, - 0x33, 0x0d, 0x45, 0xfc, 0x0d, 0x4f, 0x70, 0x7f, 0x3e, 0x1c, 0x9a, 0x05, 0x85, 0x1c, 0xfb, 0x64, - 0x16, 0x9f, 0xf5, 0x7e, 0xfc, 0xf7, 0xb6, 0xf1, 0xc3, 0xfb, 0x6d, 0xe3, 0xc7, 0xf7, 0xdb, 0xc6, - 0xbf, 0xde, 0x6f, 0xaf, 0xfc, 0xe5, 0x3f, 0xdb, 0xc6, 0xef, 0xd5, 0x9f, 0x29, 0x13, 0x27, 0x0c, - 0xdc, 0x2b, 0x9f, 0xb7, 0x77, 0xd1, 0xc2, 0x63, 0xbb, 0xd3, 0xf3, 0xd3, 0xdd, 0xe9, 0xc9, 0x2e, - 0xa6, 0xf4, 0xa4, 0xcc, 0x7f, 0xa1, 0x3c, 0xfc, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf1, 0xba, - 0xa2, 0x1f, 0x96, 0x19, 0x00, 0x00, + // 2014 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x59, 0xcd, 0x72, 0x1b, 0xc7, + 0x11, 0xe6, 0x02, 0x20, 0x7e, 0x1a, 0x7f, 0xcb, 0x21, 0x45, 0x2d, 0x15, 0x87, 0x42, 0xb6, 0xe4, + 0x2a, 0x98, 0x8e, 0xc5, 0x12, 0x15, 0xd9, 0x8e, 0x1c, 0xab, 0x22, 0x81, 0x12, 0x4d, 0x4b, 0x14, + 0x9d, 0x01, 0xa4, 0x54, 0xe5, 0xb6, 0x04, 0x46, 0xe4, 0x16, 0x81, 0x5d, 0x64, 0xb1, 0xe0, 0xcf, + 0x03, 0xa4, 0x2a, 0x4f, 0x90, 0x73, 0x8e, 0xbe, 0xe4, 0x29, 0x92, 0x83, 0x8f, 0xae, 0xca, 0x3d, + 0x95, 0x28, 0xaf, 0x90, 0x07, 0x48, 0xf5, 0xcc, 0x2c, 0x76, 0x66, 0x7f, 0x08, 0xdb, 0xb7, 0x9d, + 0xee, 0x9e, 0xfe, 0xdb, 0xde, 0xaf, 0xbb, 0x01, 0x80, 0xb1, 0x3f, 0x3c, 0xbf, 0x3f, 0x0d, 0xfc, + 0xd0, 0x27, 0x25, 0x7c, 0xbe, 0xf3, 0xc9, 0xa9, 0x1b, 0x9e, 0xcd, 0x4f, 0xee, 0x0f, 0xfd, 0xc9, + 0xee, 0xa9, 0x7f, 0xea, 0xef, 0x72, 0xe6, 0xc9, 0xfc, 0x1d, 0x3f, 0xf1, 0x03, 0x7f, 0x12, 0x97, + 0xee, 0xb4, 0x43, 0x77, 0xc2, 0x66, 0xa1, 0x33, 0x99, 0x0a, 0x82, 0xfd, 0xbf, 0x02, 0xd4, 0x5f, + 0xf9, 0xc3, 0xf3, 0xe3, 0x69, 0xe8, 0xfa, 0xde, 0x8c, 0x3c, 0x84, 0xfa, 0x41, 0xe0, 0x78, 0xf3, + 0xb1, 0x13, 0xb8, 0xe1, 0xb5, 0x65, 0x74, 0x8c, 0x6e, 0x6b, 0x6f, 0xed, 0x3e, 0xb7, 0xab, 0x30, + 0xa8, 0x2a, 0x45, 0x6c, 0x28, 0x1d, 0xf9, 0x23, 0x66, 0x15, 0xb8, 0x74, 0x4b, 0x48, 0xa3, 0x56, + 0xa4, 0x52, 0xce, 0x23, 0x5d, 0x28, 0x7f, 0xe3, 0x8f, 0xdd, 0xe1, 0xb5, 0x55, 0xe4, 0x52, 0xa6, + 0x90, 0xfa, 0xbd, 0xe3, 0x86, 0x82, 0x4e, 0x25, 0x9f, 0x7c, 0x00, 0xb5, 0x17, 0x7e, 0x70, 0xe9, + 0x04, 0xa3, 0x81, 0x6f, 0x95, 0x3a, 0x46, 0xb7, 0x46, 0x63, 0x02, 0xe9, 0x42, 0x7b, 0xe0, 0x9c, + 0x8c, 0xd9, 0x3e, 0x7b, 0xd7, 0x3b, 0x73, 0xbc, 0x53, 0x36, 0xb2, 0x56, 0x3b, 0x46, 0xb7, 0x4a, + 0x93, 0x64, 0xd4, 0x43, 0x59, 0x18, 0x5c, 0xa3, 0x09, 0xab, 0xdc, 0x31, 0xba, 0x45, 0x1a, 0x13, + 0xc8, 0x06, 0xac, 0x1e, 0x04, 0xfe, 0x7c, 0x6a, 0x55, 0x3a, 0x46, 0xb7, 0x49, 0xc5, 0x81, 0xec, + 0x40, 0xb5, 0x7f, 0xe6, 0x04, 0x23, 0xd7, 0x3b, 0xb5, 0xaa, 0x6a, 0x34, 0x11, 0x95, 0x2e, 0xf8, + 0xe4, 0x31, 0x40, 0xdf, 0x73, 0xa6, 0xfd, 0x33, 0x3f, 0x1c, 0xcc, 0xac, 0x5a, 0xc7, 0xe8, 0xd6, + 0xf7, 0x36, 0xee, 0xc7, 0x09, 0x1e, 0x44, 0x4f, 0xcf, 0x4a, 0xdf, 0xfd, 0xeb, 0xee, 0x0a, 0x55, + 0xa4, 0xed, 0x7f, 0x1a, 0x50, 0xc3, 0x04, 0x71, 0x9f, 0xd1, 0x17, 0xfe, 0xc0, 0xd3, 0x5d, 0xa2, + 0xe2, 0x80, 0xfe, 0xf7, 0x59, 0x70, 0xe1, 0x0e, 0xd9, 0xe1, 0x3e, 0x4f, 0x6d, 0x8d, 0xc6, 0x04, + 0x62, 0x41, 0xe5, 0x2d, 0x0b, 0x66, 0xae, 0xef, 0xf1, 0x84, 0x96, 0x68, 0x74, 0x44, 0x6d, 0x6f, + 0x9d, 0xb1, 0x3b, 0xe2, 0xb9, 0xab, 0x52, 0x71, 0x88, 0xe3, 0x5d, 0xcd, 0x8b, 0xb7, 0xbc, 0x24, + 0xde, 0x0e, 0xd4, 0x8f, 0x03, 0xf7, 0xd4, 0xf5, 0x84, 0xaf, 0x15, 0x6e, 0x55, 0x25, 0xd9, 0xdf, + 0xd6, 0xa0, 0x42, 0xd9, 0x1f, 0xe7, 0x6c, 0x16, 0x8a, 0xec, 0xf3, 0xc7, 0xc3, 0x7d, 0x19, 0x57, + 0x4c, 0x20, 0x0f, 0x95, 0xf0, 0x79, 0x6c, 0xf5, 0xbd, 0x76, 0x5c, 0x36, 0x9c, 0x2c, 0xb3, 0xa6, + 0xa4, 0xe9, 0x1e, 0x94, 0x8f, 0x58, 0x78, 0xe6, 0x8f, 0x64, 0x09, 0x35, 0xc4, 0x0d, 0x41, 0xa3, + 0x92, 0x47, 0x3e, 0x86, 0x12, 0x5e, 0xe1, 0xd1, 0xd7, 0xa3, 0xd2, 0x45, 0x8a, 0xb4, 0x2e, 0xf5, + 0x72, 0x21, 0xf2, 0x00, 0xca, 0x6f, 0x3c, 0x94, 0xe0, 0x69, 0xa9, 0xef, 0xad, 0x0b, 0x71, 0x41, + 0xd3, 0x2f, 0x48, 0x41, 0xf2, 0x25, 0xc0, 0x01, 0x0b, 0x07, 0x57, 0x1e, 0xb7, 0x52, 0xe6, 0xd7, + 0x6e, 0xcb, 0x0f, 0x64, 0x41, 0xd7, 0xaf, 0x2a, 0x17, 0xc8, 0x21, 0xb4, 0x0e, 0x58, 0x88, 0x25, + 0xe8, 0x7a, 0xa7, 0xaf, 0xdc, 0x59, 0xc8, 0x13, 0x59, 0xdf, 0xfb, 0xd9, 0x42, 0x85, 0xc2, 0xd3, + 0xd5, 0x24, 0x2e, 0x92, 0x5f, 0x41, 0xe5, 0x80, 0x85, 0xcf, 0x5c, 0x6f, 0xc4, 0x6b, 0x15, 0xab, + 0x2f, 0xd2, 0x81, 0x44, 0xfd, 0x72, 0x24, 0x4a, 0x28, 0xac, 0xbd, 0x64, 0x6c, 0x1a, 0xe7, 0x19, + 0xef, 0x8b, 0xea, 0xdd, 0x16, 0xf7, 0x53, 0x6c, 0x5d, 0x53, 0xfa, 0x3a, 0x06, 0x85, 0x44, 0xca, + 0x26, 0x7e, 0xc8, 0x78, 0x5e, 0x40, 0x0d, 0x4a, 0xe7, 0x25, 0x82, 0xd2, 0x99, 0xe4, 0x15, 0xb4, + 0x79, 0xc1, 0x3a, 0x21, 0x93, 0xc5, 0x6e, 0xd5, 0xb9, 0xae, 0x0f, 0x84, 0xae, 0x04, 0x53, 0x57, + 0x96, 0xbc, 0x4a, 0x7a, 0xd0, 0xe8, 0x39, 0x9e, 0xe7, 0x87, 0x3d, 0x7f, 0x32, 0x71, 0x43, 0xab, + 0xc1, 0x55, 0x6d, 0x09, 0x55, 0x2a, 0x47, 0xd7, 0xa3, 0x5d, 0x42, 0x25, 0x07, 0x2c, 0x7c, 0x3a, + 0x0c, 0xdd, 0x0b, 0x36, 0xb8, 0xf2, 0xac, 0xa6, 0xaa, 0x44, 0xe5, 0x24, 0x94, 0xa8, 0x2c, 0x4c, + 0x7b, 0x9f, 0x85, 0x14, 0x11, 0x21, 0x08, 0xa3, 0xc8, 0x5a, 0x6a, 0xda, 0x53, 0xec, 0x44, 0xda, + 0x53, 0x7c, 0xd4, 0xd9, 0x73, 0xbc, 0x84, 0xce, 0xb6, 0xaa, 0x33, 0xc5, 0x4e, 0xe8, 0x4c, 0xf1, + 0xc9, 0x1b, 0x20, 0x94, 0x4d, 0x1c, 0xd7, 0x1b, 0x5c, 0x79, 0x87, 0x5e, 0xa4, 0xd4, 0xe4, 0x4a, + 0xef, 0x0a, 0xa5, 0x69, 0xbe, 0xae, 0x35, 0x43, 0x01, 0xf9, 0x2d, 0xd4, 0x7b, 0x67, 0x6c, 0x78, + 0x7e, 0x1c, 0x4c, 0xcf, 0x1c, 0xcf, 0x5a, 0xe3, 0xfa, 0x2c, 0xe9, 0x64, 0xcc, 0xd0, 0x15, 0xa9, + 0x57, 0xb0, 0x30, 0x28, 0x9b, 0xcd, 0x27, 0xec, 0xd0, 0xbb, 0xc0, 0xb7, 0xdc, 0x7b, 0x6d, 0x11, + 0xb5, 0x30, 0x12, 0xcc, 0x44, 0x61, 0x24, 0xb8, 0xf6, 0x3f, 0x6a, 0x50, 0xa5, 0x6c, 0x36, 0xf5, + 0xbd, 0x19, 0x5b, 0x82, 0x55, 0x31, 0xec, 0x14, 0x6e, 0x80, 0x9d, 0x0d, 0x58, 0x7d, 0x1e, 0x04, + 0x7e, 0xc0, 0xb1, 0xa9, 0x41, 0xc5, 0x81, 0x7c, 0x04, 0x95, 0xd7, 0xec, 0x92, 0x7f, 0x62, 0xa5, + 0x4c, 0x94, 0xa3, 0x11, 0x9f, 0xfc, 0x52, 0xe2, 0x96, 0x00, 0x22, 0xa2, 0xe2, 0x96, 0x70, 0x53, + 0x03, 0xae, 0xbd, 0x05, 0x70, 0x95, 0xd5, 0x4f, 0x3f, 0x02, 0x2e, 0xed, 0x46, 0x84, 0x5c, 0x4f, + 0x34, 0xe4, 0xaa, 0xa8, 0xaf, 0x40, 0x45, 0x2e, 0xed, 0xae, 0x0a, 0x5d, 0x5f, 0xa7, 0xa0, 0xab, + 0xaa, 0xbe, 0x80, 0x24, 0x74, 0x69, 0x7a, 0x92, 0xd8, 0xf5, 0x28, 0xc6, 0x2e, 0x81, 0x3d, 0xb7, + 0x12, 0xd8, 0xa5, 0xdd, 0x5e, 0x80, 0x57, 0x3f, 0x0b, 0xbc, 0x40, 0x2d, 0xce, 0x0c, 0xf0, 0xd2, + 0x54, 0x65, 0xa0, 0xd7, 0xd7, 0x29, 0xf4, 0xd2, 0x10, 0x27, 0x89, 0x5e, 0x7a, 0x5c, 0x09, 0xf8, + 0x3a, 0x4a, 0xc3, 0x97, 0xc0, 0x9c, 0x9f, 0xe7, 0xc0, 0x97, 0xa6, 0x2d, 0x85, 0x5f, 0xfb, 0x09, + 0xfc, 0x12, 0xd0, 0x73, 0x27, 0x0b, 0xbf, 0x34, 0x45, 0x3a, 0x80, 0xed, 0x27, 0x00, 0xac, 0xa5, + 0x6a, 0xd1, 0x01, 0x4c, 0xd7, 0xa2, 0x21, 0x58, 0x3f, 0x0b, 0xc1, 0xda, 0x6a, 0xee, 0x33, 0x10, + 0x4c, 0xcf, 0x7d, 0x1a, 0xc2, 0xfa, 0x59, 0x10, 0xa6, 0xa1, 0x4d, 0x06, 0x84, 0xe9, 0x4a, 0xd3, + 0x18, 0xf6, 0x36, 0x13, 0xc3, 0x04, 0xe6, 0x74, 0xf2, 0x31, 0x4c, 0x53, 0x9b, 0x05, 0x62, 0x4f, + 0x75, 0x10, 0x23, 0x5a, 0x33, 0x51, 0x41, 0x4c, 0xd3, 0xa4, 0xa1, 0xd8, 0x51, 0x1a, 0xc5, 0xd6, + 0xd5, 0xfa, 0x48, 0xa1, 0x98, 0x5e, 0x1f, 0x49, 0x18, 0xfb, 0xb3, 0x21, 0xc6, 0xf7, 0x68, 0xea, + 0xc2, 0x49, 0xf2, 0xca, 0x93, 0x28, 0xd6, 0xa0, 0xe2, 0xb0, 0x64, 0x92, 0x24, 0x50, 0xa2, 0xfe, + 0xe5, 0xcc, 0x2a, 0x76, 0x8a, 0xdd, 0x06, 0xe5, 0xcf, 0xe4, 0x01, 0x54, 0xe4, 0x46, 0x90, 0x9e, + 0xa3, 0x24, 0x23, 0xfa, 0x34, 0xe5, 0xd1, 0x7e, 0x0c, 0x0d, 0xf5, 0xfb, 0x20, 0x3b, 0x50, 0x46, + 0x6f, 0xc7, 0x21, 0xf7, 0xa5, 0x1e, 0xc1, 0xa6, 0xa0, 0x45, 0xc8, 0x24, 0x4e, 0xf6, 0x17, 0xb0, + 0x96, 0x9a, 0x9d, 0x72, 0x62, 0x31, 0xa1, 0x48, 0xfd, 0x4b, 0x1e, 0x45, 0x83, 0xe2, 0xa3, 0xed, + 0x00, 0x49, 0xc3, 0x97, 0x9c, 0x82, 0xe7, 0x62, 0xa6, 0x5e, 0xa5, 0xe2, 0x40, 0x1e, 0x41, 0x5d, + 0xc5, 0xaf, 0x42, 0xa7, 0xd8, 0xad, 0xef, 0x35, 0xe3, 0x55, 0x64, 0x70, 0xe5, 0x45, 0x6f, 0x4d, + 0x91, 0xb3, 0x9f, 0xc0, 0xad, 0xcc, 0xc1, 0x8c, 0x7c, 0x08, 0x45, 0xfc, 0xa0, 0x44, 0x84, 0x99, + 0x7a, 0x90, 0x6f, 0x1f, 0xc3, 0x66, 0x36, 0x3a, 0x26, 0x1d, 0x32, 0x7e, 0xa0, 0x43, 0x5f, 0x42, + 0x45, 0x72, 0xf3, 0x5f, 0x79, 0x2f, 0x60, 0x4e, 0xc8, 0x46, 0xc7, 0x5e, 0xf4, 0xca, 0x17, 0x04, + 0xfb, 0x2f, 0x06, 0x34, 0xb5, 0x19, 0x37, 0x47, 0xcb, 0xa7, 0x50, 0x15, 0x10, 0x32, 0xe8, 0xcb, + 0x29, 0xfd, 0xa6, 0x05, 0x67, 0x21, 0x4b, 0x3e, 0x83, 0xda, 0xd1, 0x3c, 0x74, 0x44, 0x01, 0x15, + 0x79, 0x4c, 0x72, 0xb2, 0x7e, 0x7e, 0x15, 0x06, 0x4e, 0xc4, 0x8b, 0x46, 0xfc, 0x85, 0xac, 0x6d, + 0x42, 0x4b, 0x6f, 0x61, 0xf6, 0xb7, 0x06, 0xef, 0x3a, 0xca, 0x18, 0xaa, 0x97, 0xb3, 0x91, 0x2c, + 0xe7, 0xc5, 0x32, 0x55, 0x50, 0x97, 0xa9, 0xc5, 0xfa, 0x53, 0xcc, 0x5b, 0x7f, 0x4a, 0x3f, 0x6e, + 0xfd, 0x59, 0x4d, 0xaf, 0x3f, 0x2f, 0xa0, 0x9d, 0x68, 0x5f, 0x3f, 0x69, 0xcf, 0xb1, 0xff, 0x66, + 0x80, 0x95, 0x37, 0x83, 0x2f, 0x09, 0xfe, 0x1e, 0x94, 0xfb, 0xa1, 0x13, 0xce, 0x67, 0xfa, 0xac, + 0x22, 0x68, 0x54, 0xf2, 0xc8, 0x26, 0x94, 0xf9, 0xfb, 0x8d, 0xbe, 0x79, 0x79, 0x22, 0x8f, 0x00, + 0x16, 0x36, 0xf1, 0xc3, 0x2f, 0xe6, 0xbb, 0xab, 0x08, 0xda, 0xbf, 0x83, 0xad, 0xdc, 0xae, 0x4b, + 0x5a, 0x50, 0x38, 0x7e, 0xc9, 0x1d, 0xad, 0xd2, 0xc2, 0xf1, 0xcb, 0x1f, 0xe6, 0xa1, 0xfd, 0x39, + 0x58, 0x79, 0xe3, 0xf0, 0xcd, 0x19, 0xb0, 0x3f, 0x86, 0xad, 0xdc, 0x36, 0x94, 0x74, 0x06, 0xcd, + 0xe4, 0x4d, 0xc8, 0xcb, 0xcd, 0xe4, 0x36, 0xa6, 0x94, 0x99, 0x5f, 0xc3, 0x56, 0xee, 0xcc, 0xbc, + 0xc4, 0xce, 0x63, 0xb8, 0x93, 0xdf, 0xaa, 0xc4, 0xe0, 0x2a, 0xb9, 0x12, 0xe8, 0x62, 0x82, 0xfd, + 0x08, 0x6e, 0x65, 0x6e, 0x5e, 0x4b, 0x4c, 0x76, 0x61, 0x33, 0x7b, 0xe4, 0x49, 0xc5, 0xf5, 0x29, + 0x6c, 0x66, 0xaf, 0x63, 0x4b, 0x2c, 0x7c, 0x04, 0xb7, 0x73, 0xe6, 0xa0, 0x94, 0x09, 0x0a, 0xeb, + 0x19, 0x6b, 0x1a, 0xf9, 0x02, 0x9a, 0xa2, 0xa1, 0x22, 0xec, 0xc7, 0xc0, 0x29, 0x8b, 0x75, 0xc1, + 0x92, 0xc5, 0xaa, 0xcb, 0xda, 0xbf, 0x81, 0x8d, 0xac, 0xd1, 0x89, 0xdc, 0x83, 0xa6, 0xa0, 0x20, + 0xcc, 0x8a, 0x8c, 0xe2, 0xd7, 0xa1, 0x13, 0xed, 0x87, 0xb0, 0x9e, 0xb1, 0xf3, 0x2d, 0x89, 0xf8, + 0x09, 0x6c, 0x64, 0xcd, 0x59, 0xf1, 0x6f, 0x35, 0x86, 0xfa, 0x5b, 0x8d, 0x29, 0xba, 0x4a, 0x81, + 0x9b, 0xe7, 0x0d, 0x64, 0x1f, 0x48, 0x7a, 0x4b, 0x5a, 0x82, 0x05, 0x0b, 0x2d, 0x46, 0xa4, 0xe5, + 0x13, 0x58, 0xcf, 0x18, 0x53, 0x10, 0x0e, 0xe4, 0x44, 0x23, 0xbc, 0x90, 0x27, 0xfb, 0x33, 0xa8, + 0x2d, 0x12, 0x47, 0x2c, 0xa8, 0x44, 0x83, 0x94, 0xb0, 0x14, 0x1d, 0x33, 0xbc, 0xfd, 0x53, 0x31, + 0xea, 0xfd, 0xe4, 0x01, 0x54, 0xb1, 0x84, 0x78, 0x1b, 0x32, 0x6e, 0xc2, 0xbf, 0x85, 0x18, 0x02, + 0xed, 0x57, 0xce, 0xac, 0xe7, 0x7b, 0xef, 0xc6, 0xee, 0x30, 0xe4, 0xfe, 0x57, 0xa9, 0x4a, 0xc2, + 0x17, 0xf5, 0x95, 0x33, 0xfb, 0x26, 0x60, 0x17, 0x72, 0x2c, 0x2e, 0x72, 0x19, 0x9d, 0x48, 0x3e, + 0x87, 0xda, 0xa2, 0x43, 0xc9, 0x29, 0xe6, 0xa6, 0xee, 0x15, 0x0b, 0xff, 0x88, 0xdf, 0x18, 0x3b, + 0x50, 0x8f, 0xbc, 0x7a, 0xc9, 0xae, 0xf9, 0x2e, 0xd6, 0xa0, 0x2a, 0x49, 0x95, 0xc0, 0x2c, 0x55, + 0x74, 0x09, 0xcc, 0xec, 0x36, 0x00, 0x7a, 0x8d, 0xfd, 0x9c, 0x05, 0x7c, 0xa5, 0x6a, 0x50, 0x85, + 0x82, 0x99, 0x17, 0x4f, 0xe2, 0x47, 0xc6, 0x26, 0x8d, 0x8e, 0x78, 0xf3, 0x35, 0xbb, 0xc4, 0xc4, + 0x3d, 0x1d, 0x89, 0x35, 0xa8, 0x4a, 0x15, 0x8a, 0xdd, 0x87, 0xa6, 0xd6, 0x6f, 0xf1, 0x55, 0x9d, + 0xb3, 0x6b, 0xd9, 0xe3, 0xf1, 0x11, 0x87, 0xbf, 0xd9, 0xb9, 0x3b, 0x95, 0x59, 0xe6, 0xcf, 0x58, + 0x56, 0x01, 0x9b, 0x8e, 0x9d, 0x21, 0x1b, 0xf8, 0x72, 0x9d, 0x8d, 0x09, 0xf8, 0xd1, 0x67, 0xaf, + 0xda, 0x4b, 0x3e, 0x81, 0x2d, 0xb8, 0x9d, 0x33, 0xdc, 0xee, 0xfc, 0x42, 0xfb, 0xd1, 0x99, 0x54, + 0xf8, 0x88, 0x67, 0xae, 0x90, 0x1a, 0xac, 0x52, 0xcc, 0xb3, 0x69, 0xec, 0x7c, 0x28, 0xea, 0x88, + 0xff, 0x94, 0xdc, 0x84, 0xda, 0xf3, 0xab, 0xe1, 0x78, 0x3e, 0x73, 0x2f, 0x98, 0xb9, 0x42, 0x00, + 0xca, 0xd8, 0xa4, 0xd9, 0xc8, 0x34, 0x76, 0xee, 0x01, 0xc4, 0xbf, 0x28, 0x93, 0x2a, 0x94, 0xf0, + 0x64, 0xae, 0x90, 0x06, 0x54, 0x5f, 0x38, 0xb3, 0xf0, 0x85, 0xe3, 0x8e, 0x4d, 0x63, 0xe7, 0x6e, + 0xdc, 0xf6, 0x51, 0xe6, 0xb5, 0xef, 0x31, 0x61, 0xed, 0xd9, 0x35, 0x1a, 0x36, 0x76, 0xfe, 0x5e, + 0x88, 0x76, 0x7e, 0xe4, 0xa3, 0x61, 0x61, 0x47, 0xcc, 0x26, 0xa6, 0x41, 0x5a, 0xea, 0x2a, 0x6d, + 0x16, 0x08, 0x49, 0xae, 0xc6, 0x66, 0x11, 0x69, 0x3a, 0x8e, 0x9a, 0x25, 0x52, 0x5f, 0xac, 0xbd, + 0xe6, 0x2a, 0xb9, 0x95, 0xb1, 0xcc, 0x9a, 0x65, 0xd2, 0x86, 0xba, 0xfc, 0xb9, 0x9b, 0x5f, 0xaa, + 0x90, 0x35, 0x68, 0x4a, 0x82, 0xb4, 0x5f, 0x25, 0xeb, 0xa9, 0x35, 0xd3, 0xac, 0x11, 0x53, 0x5f, + 0x16, 0x4d, 0x40, 0x8a, 0x0a, 0x3b, 0x66, 0x1d, 0x6d, 0xa6, 0xda, 0xa3, 0xd9, 0x20, 0x9b, 0x59, + 0x1b, 0x93, 0xd9, 0x44, 0xf1, 0x54, 0x9b, 0x33, 0x5b, 0xe8, 0xa2, 0x02, 0x24, 0x66, 0x1b, 0xfd, + 0x49, 0xbc, 0x5c, 0xd3, 0xdc, 0x61, 0x51, 0xab, 0x17, 0x56, 0xf9, 0x65, 0x0c, 0xe9, 0xb9, 0x87, + 0xd1, 0x9a, 0x2b, 0x68, 0x55, 0x21, 0xcb, 0xec, 0x99, 0x86, 0x22, 0xfe, 0x86, 0x27, 0xb8, 0x3f, + 0x1f, 0x0e, 0xcd, 0x82, 0x42, 0x8e, 0x7d, 0x32, 0x8b, 0xcf, 0x7a, 0xdf, 0xff, 0x67, 0xdb, 0xf8, + 0xee, 0xfd, 0xb6, 0xf1, 0xfd, 0xfb, 0x6d, 0xe3, 0xdf, 0xef, 0xb7, 0x57, 0xfe, 0xfa, 0xdf, 0x6d, + 0xe3, 0x0f, 0xea, 0x1f, 0x23, 0x13, 0x27, 0x0c, 0xdc, 0x2b, 0x9f, 0x8f, 0x6a, 0xd1, 0xc1, 0x63, + 0xbb, 0xd3, 0xf3, 0xd3, 0xdd, 0xe9, 0xc9, 0x2e, 0xa6, 0xf4, 0xa4, 0xcc, 0xff, 0x0e, 0x79, 0xf8, + 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb2, 0x86, 0xcb, 0x66, 0x62, 0x19, 0x00, 0x00, } func (m *LockOptions) Marshal() (dAtA []byte, err error) { @@ -3974,11 +3957,6 @@ func (m *KeepLockTableBindRequest) MarshalToSizedBuffer(dAtA []byte) (int, error i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - if m.Version != 0 { - i = encodeVarintLock(dAtA, i, uint64(m.Version)) - i-- - dAtA[i] = 0x28 - } if len(m.LockTables) > 0 { for iNdEx := len(m.LockTables) - 1; iNdEx >= 0; iNdEx-- { { @@ -4041,11 +4019,6 @@ func (m *KeepLockTableBindResponse) MarshalToSizedBuffer(dAtA []byte) (int, erro i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - if m.Version != 0 { - i = encodeVarintLock(dAtA, i, uint64(m.Version)) - i-- - dAtA[i] = 0x18 - } if m.Status != 0 { i = encodeVarintLock(dAtA, i, uint64(m.Status)) i-- @@ -5345,9 +5318,6 @@ func (m *KeepLockTableBindRequest) ProtoSize() (n int) { n += 1 + l + sovLock(uint64(l)) } } - if m.Version != 0 { - n += 1 + sovLock(uint64(m.Version)) - } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -5366,9 +5336,6 @@ func (m *KeepLockTableBindResponse) ProtoSize() (n int) { if m.Status != 0 { n += 1 + sovLock(uint64(m.Status)) } - if m.Version != 0 { - n += 1 + sovLock(uint64(m.Version)) - } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -8846,25 +8813,6 @@ func (m *KeepLockTableBindRequest) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 5: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Version", wireType) - } - m.Version = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowLock - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Version |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } default: iNdEx = preIndex skippy, err := skipLock(dAtA[iNdEx:]) @@ -8955,25 +8903,6 @@ func (m *KeepLockTableBindResponse) Unmarshal(dAtA []byte) error { break } } - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Version", wireType) - } - m.Version = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowLock - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Version |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } default: iNdEx = preIndex skippy, err := skipLock(dAtA[iNdEx:]) diff --git a/proto/lock.proto b/proto/lock.proto index d61560bcee2b8..88e10bbbba306 100644 --- a/proto/lock.proto +++ b/proto/lock.proto @@ -254,14 +254,12 @@ message KeepLockTableBindRequest { Status Status = 2; repeated bytes TxnIDs = 3; repeated LockTable LockTables = 4 [(gogoproto.nullable) = false]; - uint64 Version = 5; } // KeepLockTableBindResponse keep lock table bind response. TN -> CN message KeepLockTableBindResponse { bool OK = 1; Status Status = 2; - uint64 Version = 3; } // SetRestartServiceRequest set restart lock service request from allocator request. operator -> TN