From 6c9084a09bc91ad194dcd8e4e2bd79bbfd2001ce Mon Sep 17 00:00:00 2001 From: xufei Date: Tue, 3 Jun 2025 16:29:38 +0800 Subject: [PATCH 1/2] save work Signed-off-by: xufei --- pkg/coprocessor/coprocessor.pb.go | 386 ++++++++++++++++++++++------ pkg/import_sstpb/import_sstpb.pb.go | 336 ++++++++++++------------ proto/coprocessor.proto | 4 + scripts/proto.lock | 12 + 4 files changed, 488 insertions(+), 250 deletions(-) diff --git a/pkg/coprocessor/coprocessor.pb.go b/pkg/coprocessor/coprocessor.pb.go index 426171939..4bcfea310 100644 --- a/pkg/coprocessor/coprocessor.pb.go +++ b/pkg/coprocessor/coprocessor.pb.go @@ -101,6 +101,8 @@ type Request struct { ConnectionId uint64 `protobuf:"varint,12,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"` ConnectionAlias string `protobuf:"bytes,13,opt,name=connection_alias,json=connectionAlias,proto3" json:"connection_alias,omitempty"` TableShardInfos []*TableShardInfos `protobuf:"bytes,14,rep,name=table_shard_infos,json=tableShardInfos,proto3" json:"table_shard_infos,omitempty"` + // versions of each reange, used in TiCI lookup, if range_versions is set, then len(range_versions) should equal to len(ranges), and all the range in ranges should be point range + RangeVersions []uint64 `protobuf:"varint,15,rep,packed,name=range_versions,json=rangeVersions,proto3" json:"range_versions,omitempty"` } func (m *Request) Reset() { *m = Request{} } @@ -234,6 +236,13 @@ func (m *Request) GetTableShardInfos() []*TableShardInfos { return nil } +func (m *Request) GetRangeVersions() []uint64 { + if m != nil { + return m.RangeVersions + } + return nil +} + type Response struct { Data github_com_pingcap_kvproto_pkg_sharedbytes.SharedBytes `protobuf:"bytes,1,opt,name=data,proto3,customtype=github.com/pingcap/kvproto/pkg/sharedbytes.SharedBytes" json:"data"` RegionError *errorpb.Error `protobuf:"bytes,2,opt,name=region_error,json=regionError,proto3" json:"region_error,omitempty"` @@ -793,6 +802,8 @@ type StoreBatchTask struct { Peer *metapb.Peer `protobuf:"bytes,3,opt,name=peer,proto3" json:"peer,omitempty"` Ranges []*KeyRange `protobuf:"bytes,4,rep,name=ranges,proto3" json:"ranges,omitempty"` TaskId uint64 `protobuf:"varint,5,opt,name=task_id,json=taskId,proto3" json:"task_id,omitempty"` + // versions of each reange, used in TiCI lookup, if range_versions is set, then len(range_versions) should equal to len(ranges), and all the range in ranges should be point range + RangeVersions []uint64 `protobuf:"varint,6,rep,packed,name=range_versions,json=rangeVersions,proto3" json:"range_versions,omitempty"` } func (m *StoreBatchTask) Reset() { *m = StoreBatchTask{} } @@ -863,6 +874,13 @@ func (m *StoreBatchTask) GetTaskId() uint64 { return 0 } +func (m *StoreBatchTask) GetRangeVersions() []uint64 { + if m != nil { + return m.RangeVersions + } + return nil +} + type StoreBatchTaskResponse struct { Data github_com_pingcap_kvproto_pkg_sharedbytes.SharedBytes `protobuf:"bytes,1,opt,name=data,proto3,customtype=github.com/pingcap/kvproto/pkg/sharedbytes.SharedBytes" json:"data"` RegionError *errorpb.Error `protobuf:"bytes,2,opt,name=region_error,json=regionError,proto3" json:"region_error,omitempty"` @@ -1124,88 +1142,90 @@ func init() { func init() { proto.RegisterFile("coprocessor.proto", fileDescriptor_29878c170c3dd019) } var fileDescriptor_29878c170c3dd019 = []byte{ - // 1291 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x57, 0xcd, 0x6e, 0x14, 0x47, - 0x10, 0xf6, 0xfe, 0xef, 0xd6, 0xcc, 0xfe, 0xb8, 0x31, 0x66, 0x80, 0x64, 0x59, 0x2d, 0x39, 0x18, - 0x48, 0xd6, 0x62, 0x89, 0x40, 0xb9, 0x20, 0x65, 0xc1, 0x12, 0x9b, 0x10, 0x29, 0x6a, 0x5b, 0x5c, - 0x47, 0xbd, 0x33, 0xcd, 0xec, 0x68, 0x77, 0x67, 0x26, 0xd3, 0x6d, 0x0b, 0x73, 0xe3, 0x0d, 0x38, - 0xe6, 0x11, 0x72, 0xc9, 0x03, 0x44, 0xca, 0x31, 0x07, 0x6e, 0xe1, 0x88, 0x72, 0x40, 0x91, 0xfd, - 0x22, 0x51, 0x57, 0x4f, 0xef, 0x8f, 0x6d, 0x90, 0x8d, 0xc4, 0x25, 0xa7, 0xed, 0xfa, 0xe9, 0xaa, - 0xea, 0xaa, 0xaf, 0xaa, 0x66, 0x61, 0xdd, 0x8b, 0x93, 0x34, 0xf6, 0xb8, 0x10, 0x71, 0xda, 0x4b, - 0xd2, 0x58, 0xc6, 0xc4, 0x5a, 0x62, 0x5d, 0xab, 0xf3, 0x34, 0x8d, 0xd3, 0x64, 0xa4, 0x65, 0xd7, - 0xea, 0x93, 0x83, 0x34, 0xf1, 0xe6, 0xa4, 0x3d, 0xe3, 0x92, 0xcd, 0xa9, 0x8d, 0x20, 0x0e, 0x62, - 0x3c, 0x6e, 0xab, 0x53, 0xc6, 0x6d, 0xa6, 0xfb, 0x42, 0xe2, 0x51, 0x33, 0xba, 0x7d, 0xa8, 0xfe, - 0xc8, 0x0f, 0x29, 0x8b, 0x02, 0x4e, 0x36, 0xa0, 0x24, 0x24, 0x4b, 0xa5, 0x93, 0xeb, 0xe4, 0xb6, - 0x6c, 0xaa, 0x09, 0xd2, 0x82, 0x02, 0x8f, 0x7c, 0x27, 0x8f, 0x3c, 0x75, 0xec, 0xfe, 0x51, 0x84, - 0x0a, 0xe5, 0xbf, 0xec, 0x73, 0x21, 0xc9, 0x6d, 0xa8, 0x78, 0x71, 0x24, 0xf9, 0x0b, 0x7d, 0xcb, - 0xea, 0xb7, 0x7a, 0x26, 0xaa, 0x47, 0x9a, 0x4f, 0x8d, 0x02, 0x69, 0x40, 0x5e, 0x26, 0x68, 0xa8, - 0x40, 0xf3, 0x32, 0x21, 0x04, 0x8a, 0x3e, 0x93, 0xcc, 0x29, 0xa0, 0x69, 0x3c, 0x93, 0xab, 0x50, - 0x45, 0xb7, 0xae, 0x14, 0x4e, 0xa5, 0x93, 0xdb, 0x2a, 0xd2, 0x0a, 0xd2, 0x7b, 0x82, 0x7c, 0x03, - 0xe5, 0x54, 0xc5, 0x29, 0x9c, 0x62, 0xa7, 0xb0, 0x65, 0xf5, 0x2f, 0xf7, 0x96, 0xd3, 0x65, 0x5e, - 0x41, 0x33, 0x25, 0xb2, 0x05, 0xad, 0x50, 0xb8, 0x1e, 0xf3, 0xc6, 0xdc, 0xe5, 0x11, 0x1b, 0x4d, - 0xb9, 0xef, 0x94, 0x3a, 0xb9, 0xad, 0x2a, 0x6d, 0x84, 0xe2, 0x91, 0x62, 0xef, 0x68, 0x2e, 0xb9, - 0x07, 0x9b, 0x5a, 0x2d, 0x7c, 0xee, 0xce, 0x98, 0xf4, 0xc6, 0xee, 0x01, 0x4f, 0x45, 0x18, 0x47, - 0x4e, 0x19, 0x23, 0xb8, 0x84, 0xd2, 0xe1, 0xf3, 0x9f, 0x94, 0xec, 0x99, 0x16, 0x91, 0x2f, 0x01, - 0x84, 0x37, 0xe6, 0x33, 0xa6, 0x94, 0x9d, 0x2a, 0x3e, 0xaa, 0xa6, 0x39, 0xcf, 0x78, 0x9a, 0x79, - 0x97, 0x29, 0xf3, 0x16, 0xde, 0x6b, 0xc6, 0xfb, 0x9e, 0x62, 0x1b, 0xef, 0x37, 0xc0, 0x4a, 0x58, - 0x10, 0x46, 0x81, 0x2b, 0xc2, 0x97, 0xdc, 0x01, 0x74, 0x09, 0x9a, 0xb5, 0x1b, 0xbe, 0xe4, 0xe4, - 0x2e, 0x94, 0x24, 0x13, 0x13, 0xe1, 0x58, 0xf8, 0xec, 0xeb, 0x2b, 0xcf, 0xde, 0x95, 0x71, 0xca, - 0x07, 0x2a, 0xb0, 0x3d, 0x26, 0x26, 0x54, 0x6b, 0x92, 0x9b, 0x50, 0xf7, 0xe2, 0x28, 0xe2, 0x9e, - 0x0c, 0xe3, 0xc8, 0x0d, 0x7d, 0xc7, 0x46, 0xab, 0xf6, 0x82, 0x39, 0xf4, 0xc9, 0x2d, 0x68, 0x2d, - 0x29, 0xb1, 0x69, 0xc8, 0x84, 0x53, 0xef, 0xe4, 0xb6, 0x6a, 0xb4, 0xb9, 0xe0, 0x7f, 0xaf, 0xd8, - 0xe4, 0x09, 0xac, 0x4b, 0x15, 0xad, 0x2b, 0xc6, 0x2c, 0xf5, 0xdd, 0x30, 0x7a, 0x1e, 0x0b, 0xa7, - 0x81, 0xe1, 0x7c, 0xb1, 0x12, 0xce, 0x9e, 0xd2, 0xda, 0x55, 0x4a, 0x43, 0xa5, 0x43, 0x9b, 0x72, - 0x95, 0xd1, 0x7d, 0x55, 0x82, 0x2a, 0xe5, 0x22, 0x89, 0x23, 0xc1, 0x09, 0xcd, 0x00, 0x80, 0x78, - 0x1b, 0x3c, 0x7c, 0xf3, 0xfe, 0xc6, 0xda, 0x3f, 0xef, 0x6f, 0xdc, 0x0f, 0x42, 0x39, 0xde, 0x1f, - 0xf5, 0xbc, 0x78, 0xb6, 0x9d, 0x84, 0x51, 0xe0, 0xb1, 0x64, 0x7b, 0x72, 0xa0, 0xa1, 0x9c, 0x4c, - 0x82, 0x6d, 0x15, 0x03, 0xf7, 0x47, 0x87, 0x92, 0x8b, 0xde, 0x2e, 0x9e, 0x07, 0xea, 0x9c, 0x01, - 0xe8, 0x2e, 0xd8, 0x29, 0x0f, 0xd4, 0x8b, 0xb0, 0x59, 0x10, 0x6e, 0x56, 0xbf, 0xd1, 0x33, 0xad, - 0xb3, 0xa3, 0x7e, 0xa9, 0xa5, 0x75, 0x90, 0x20, 0xb7, 0xa0, 0x3c, 0x8d, 0xbd, 0x09, 0xf7, 0x11, - 0x89, 0x56, 0x7f, 0x7d, 0x0e, 0xe1, 0xa7, 0xb1, 0x37, 0x51, 0x71, 0xd3, 0x4c, 0x41, 0x15, 0x2b, - 0x96, 0x63, 0x9e, 0x66, 0xc6, 0x8b, 0x98, 0x2e, 0x40, 0x96, 0xb6, 0x75, 0x07, 0x4a, 0x88, 0x3f, - 0x84, 0xda, 0x07, 0x31, 0xaa, 0x75, 0xc8, 0x03, 0xb0, 0xf9, 0x0b, 0xee, 0xb9, 0x3e, 0x97, 0x2c, - 0x9c, 0x0a, 0x84, 0x9b, 0xd5, 0xdf, 0x98, 0xbb, 0xdf, 0x79, 0xc1, 0xbd, 0xc7, 0x5a, 0x46, 0x2d, - 0xbe, 0x20, 0xc8, 0x43, 0x68, 0x2e, 0x5f, 0x74, 0x0f, 0xfa, 0x8e, 0x85, 0x77, 0x37, 0xcf, 0xba, - 0xfb, 0xac, 0x4f, 0xeb, 0x7c, 0x99, 0x24, 0x1d, 0xb0, 0xe7, 0xbd, 0x31, 0x0e, 0x25, 0x76, 0x5a, - 0x95, 0x42, 0xd6, 0x17, 0x4f, 0x42, 0x49, 0xbe, 0x06, 0xa2, 0xc5, 0x53, 0x26, 0xe4, 0xbc, 0x1f, - 0xaa, 0x08, 0xa3, 0x16, 0x4a, 0x9e, 0x32, 0x21, 0x4d, 0x33, 0x74, 0xa1, 0xee, 0xb1, 0xc8, 0x1d, - 0x71, 0x6d, 0xd3, 0x40, 0xdd, 0xf2, 0x58, 0x34, 0xe0, 0x68, 0xd3, 0x27, 0xdf, 0xc2, 0xe6, 0x94, - 0x49, 0x2e, 0xa4, 0x3b, 0xda, 0xf7, 0x26, 0x5c, 0x8a, 0xb9, 0x55, 0x0d, 0xce, 0x0d, 0x2d, 0x1d, - 0x68, 0xa1, 0xb1, 0xfc, 0x14, 0x9a, 0x23, 0x6c, 0xc9, 0x34, 0x03, 0x8d, 0xc2, 0xa8, 0xc2, 0xdd, - 0xcd, 0x8f, 0xb5, 0x41, 0xa6, 0x4b, 0x1b, 0x78, 0xd7, 0x90, 0xe2, 0x87, 0x62, 0x15, 0x5a, 0x56, - 0xf7, 0x75, 0x0e, 0x80, 0x62, 0xfd, 0x55, 0x6d, 0xc9, 0x75, 0xa8, 0x65, 0x88, 0x09, 0x7d, 0x84, - 0x62, 0x91, 0x56, 0x35, 0x63, 0xe8, 0x93, 0xfb, 0x0b, 0x38, 0x25, 0xb1, 0x37, 0xce, 0xe0, 0x74, - 0xa9, 0x97, 0xcd, 0x5a, 0x6d, 0x66, 0x47, 0x89, 0xe6, 0x98, 0x52, 0xc4, 0xd2, 0xb0, 0x2a, 0x9c, - 0x63, 0x58, 0x75, 0x0f, 0xa0, 0x36, 0x6f, 0x12, 0x9c, 0x81, 0xba, 0xcf, 0x4c, 0x3c, 0x15, 0xa4, - 0x87, 0x88, 0x3f, 0x2d, 0x5a, 0x44, 0x53, 0xa4, 0x80, 0xac, 0x4f, 0xf2, 0x3b, 0x81, 0xe6, 0x89, - 0x96, 0x55, 0x2e, 0x14, 0x58, 0xf6, 0x65, 0x9c, 0x9a, 0x00, 0x6a, 0x14, 0x0c, 0x6b, 0xe8, 0x93, - 0x07, 0x26, 0x06, 0x3d, 0x06, 0xf2, 0xe8, 0x67, 0x73, 0xb5, 0x1c, 0xc6, 0x5c, 0x16, 0x9b, 0xee, - 0xfd, 0x19, 0xd8, 0xe8, 0x4c, 0x27, 0x4d, 0x90, 0xdb, 0xb0, 0x9e, 0x8c, 0x0f, 0x45, 0xe8, 0xb1, - 0xa9, 0xab, 0xc7, 0x4b, 0xe6, 0xaf, 0x40, 0x9b, 0x46, 0x80, 0x17, 0x86, 0x3e, 0xb9, 0x0b, 0x15, - 0x9d, 0x5e, 0xe3, 0xf0, 0xca, 0x8a, 0xc3, 0x45, 0x39, 0xa9, 0xd1, 0xeb, 0xfe, 0x59, 0x00, 0x7b, - 0xa0, 0xeb, 0xff, 0x79, 0x76, 0xd5, 0x52, 0x4c, 0xc5, 0xf3, 0xc5, 0xb4, 0xb2, 0xde, 0x4a, 0xab, - 0xeb, 0x6d, 0x75, 0xa1, 0x94, 0x4f, 0x2e, 0x94, 0x87, 0x50, 0xd7, 0x39, 0x32, 0x2e, 0x2b, 0xe8, - 0xf2, 0xea, 0xe9, 0xf1, 0x9b, 0xa5, 0x97, 0xda, 0x72, 0x39, 0xd9, 0x97, 0xd5, 0x90, 0x0b, 0x54, - 0x86, 0xab, 0x58, 0xd1, 0xd2, 0x34, 0x0e, 0x86, 0xfe, 0xe9, 0x4d, 0x51, 0x3b, 0xe7, 0xa6, 0x80, - 0x0b, 0x6c, 0x0a, 0xeb, 0x53, 0x36, 0xc5, 0xef, 0x79, 0xa8, 0x0f, 0x96, 0xdb, 0xf7, 0xb3, 0xac, - 0x8b, 0x13, 0x03, 0x3d, 0x7f, 0x6a, 0xa0, 0x9f, 0x9c, 0xd1, 0x85, 0xf3, 0xce, 0xe8, 0x7b, 0x50, - 0x4f, 0xb9, 0x4c, 0x0f, 0xdd, 0x55, 0x8c, 0x34, 0x56, 0x47, 0x07, 0xb5, 0x51, 0xc9, 0x54, 0xe9, - 0x3b, 0xd0, 0xb4, 0x4e, 0x9f, 0xc2, 0xc8, 0xc7, 0x9a, 0xcb, 0x42, 0x5d, 0xa4, 0x45, 0xf7, 0xef, - 0x1c, 0x34, 0x56, 0xc7, 0xe0, 0xe7, 0x99, 0x6c, 0x1d, 0x28, 0x26, 0x9c, 0xa7, 0x59, 0x22, 0x6c, - 0xa3, 0xff, 0x33, 0xe7, 0x29, 0x45, 0xc9, 0x45, 0x3f, 0xd4, 0xae, 0x40, 0x45, 0x7d, 0xb5, 0xa8, - 0x18, 0x75, 0x4b, 0x94, 0x15, 0x39, 0xf4, 0xbb, 0x7f, 0xe5, 0x61, 0xf3, 0xec, 0xc1, 0xfe, 0x7f, - 0xfc, 0x72, 0xf8, 0x50, 0x1a, 0xce, 0x5a, 0xf6, 0xe5, 0x0b, 0x2c, 0xfb, 0xee, 0x51, 0x0e, 0x9a, - 0x8f, 0xf9, 0x94, 0x07, 0x4c, 0xf2, 0x4f, 0x19, 0x85, 0xcb, 0x33, 0x2b, 0xff, 0xa1, 0x4f, 0xf2, - 0xf3, 0x6c, 0x1b, 0xf5, 0x51, 0x31, 0xe3, 0xb3, 0x6c, 0xd6, 0x0b, 0x15, 0x4a, 0xe4, 0x71, 0x4c, - 0x45, 0x91, 0xb6, 0x66, 0x7c, 0xa6, 0x67, 0x42, 0xc6, 0x27, 0x77, 0x60, 0x5d, 0x44, 0x2c, 0x11, - 0xe3, 0x58, 0x2e, 0x94, 0x75, 0x6a, 0x5a, 0x46, 0x60, 0x94, 0xbb, 0xaf, 0xf2, 0xd0, 0x5a, 0x3c, - 0x32, 0x43, 0xc9, 0x57, 0xd0, 0x58, 0xf8, 0x5b, 0xe0, 0x85, 0xda, 0xc6, 0xd7, 0x63, 0x55, 0xf7, - 0x6b, 0x50, 0x35, 0xe6, 0xb2, 0x7f, 0x39, 0x73, 0xfa, 0x14, 0x26, 0x0a, 0x17, 0xc1, 0x44, 0xf1, - 0x82, 0x98, 0x28, 0x9d, 0xc2, 0xc4, 0xd9, 0x09, 0x2b, 0x9f, 0x9d, 0xb0, 0x41, 0xff, 0xdd, 0x6f, - 0xd5, 0xdc, 0x9b, 0xa3, 0x76, 0xee, 0xed, 0x51, 0x3b, 0xf7, 0xef, 0x51, 0x3b, 0xf7, 0xfa, 0xb8, - 0xbd, 0xf6, 0xeb, 0x71, 0x7b, 0xed, 0xed, 0x71, 0x7b, 0xed, 0xdd, 0x71, 0x7b, 0x0d, 0x5a, 0x71, - 0x1a, 0xf4, 0x64, 0x38, 0x39, 0xe8, 0x65, 0x6d, 0x31, 0x2a, 0xe3, 0xcf, 0xbd, 0xff, 0x02, 0x00, - 0x00, 0xff, 0xff, 0x1c, 0x19, 0x81, 0xd9, 0x7b, 0x0e, 0x00, 0x00, + // 1318 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x57, 0xcd, 0x8e, 0x13, 0xc7, + 0x13, 0x5f, 0x7f, 0xdb, 0x35, 0xfe, 0xda, 0x66, 0x59, 0x06, 0xf8, 0xff, 0x8d, 0x65, 0x12, 0xc9, + 0x40, 0xe2, 0x15, 0x26, 0x02, 0xe5, 0x82, 0x14, 0xc3, 0x4a, 0x38, 0x21, 0x52, 0xd4, 0xbb, 0xe2, + 0x3a, 0x6a, 0xcf, 0x34, 0xe3, 0x91, 0xed, 0x99, 0xc9, 0x74, 0xef, 0x8a, 0xe5, 0xc6, 0x1b, 0x70, + 0xcc, 0x23, 0xe4, 0x92, 0x37, 0xc8, 0x31, 0x07, 0x8e, 0x1c, 0x51, 0x0e, 0x08, 0xed, 0xbe, 0x43, + 0xce, 0x51, 0x57, 0x4f, 0xfb, 0x63, 0xd7, 0xa0, 0x5d, 0x24, 0x2e, 0x39, 0xb9, 0xeb, 0x63, 0xaa, + 0xaa, 0xab, 0x7e, 0x55, 0xd5, 0x86, 0x4d, 0x37, 0x8a, 0x93, 0xc8, 0xe5, 0x42, 0x44, 0x49, 0x2f, + 0x4e, 0x22, 0x19, 0x11, 0x6b, 0x89, 0x75, 0xad, 0xc6, 0x93, 0x24, 0x4a, 0xe2, 0x91, 0x96, 0x5d, + 0xab, 0x4d, 0x0e, 0x93, 0xd8, 0x9d, 0x93, 0xd5, 0x19, 0x97, 0x6c, 0x4e, 0x6d, 0xf9, 0x91, 0x1f, + 0xe1, 0x71, 0x47, 0x9d, 0x52, 0x6e, 0x23, 0x39, 0x10, 0x12, 0x8f, 0x9a, 0xd1, 0xe9, 0x43, 0xf9, + 0x27, 0x7e, 0x44, 0x59, 0xe8, 0x73, 0xb2, 0x05, 0x05, 0x21, 0x59, 0x22, 0xed, 0x4c, 0x3b, 0xd3, + 0xad, 0x52, 0x4d, 0x90, 0x26, 0xe4, 0x78, 0xe8, 0xd9, 0x59, 0xe4, 0xa9, 0x63, 0xe7, 0x43, 0x1e, + 0x4a, 0x94, 0xff, 0x7a, 0xc0, 0x85, 0x24, 0xb7, 0xa1, 0xe4, 0x46, 0xa1, 0xe4, 0x2f, 0xf4, 0x57, + 0x56, 0xbf, 0xd9, 0x33, 0x51, 0x3d, 0xd2, 0x7c, 0x6a, 0x14, 0x48, 0x1d, 0xb2, 0x32, 0x46, 0x43, + 0x39, 0x9a, 0x95, 0x31, 0x21, 0x90, 0xf7, 0x98, 0x64, 0x76, 0x0e, 0x4d, 0xe3, 0x99, 0x5c, 0x85, + 0x32, 0xba, 0x75, 0xa4, 0xb0, 0x4b, 0xed, 0x4c, 0x37, 0x4f, 0x4b, 0x48, 0xef, 0x0b, 0xf2, 0x2d, + 0x14, 0x13, 0x15, 0xa7, 0xb0, 0xf3, 0xed, 0x5c, 0xd7, 0xea, 0x5f, 0xee, 0x2d, 0xa7, 0xcb, 0xdc, + 0x82, 0xa6, 0x4a, 0xa4, 0x0b, 0xcd, 0x40, 0x38, 0x2e, 0x73, 0xc7, 0xdc, 0xe1, 0x21, 0x1b, 0x4d, + 0xb9, 0x67, 0x17, 0xda, 0x99, 0x6e, 0x99, 0xd6, 0x03, 0xf1, 0x48, 0xb1, 0x77, 0x35, 0x97, 0xdc, + 0x83, 0x6d, 0xad, 0x16, 0x3c, 0x77, 0x66, 0x4c, 0xba, 0x63, 0xe7, 0x90, 0x27, 0x22, 0x88, 0x42, + 0xbb, 0x88, 0x11, 0x5c, 0x42, 0xe9, 0xf0, 0xf9, 0xcf, 0x4a, 0xf6, 0x4c, 0x8b, 0xc8, 0xff, 0x01, + 0x84, 0x3b, 0xe6, 0x33, 0xa6, 0x94, 0xed, 0x32, 0x5e, 0xaa, 0xa2, 0x39, 0xcf, 0x78, 0x92, 0x7a, + 0x97, 0x09, 0x73, 0x17, 0xde, 0x2b, 0xc6, 0xfb, 0xbe, 0x62, 0x1b, 0xef, 0x37, 0xc0, 0x8a, 0x99, + 0x1f, 0x84, 0xbe, 0x23, 0x82, 0x97, 0xdc, 0x06, 0x74, 0x09, 0x9a, 0xb5, 0x17, 0xbc, 0xe4, 0xe4, + 0x2e, 0x14, 0x24, 0x13, 0x13, 0x61, 0x5b, 0x78, 0xed, 0xeb, 0x2b, 0xd7, 0xde, 0x93, 0x51, 0xc2, + 0x07, 0x2a, 0xb0, 0x7d, 0x26, 0x26, 0x54, 0x6b, 0x92, 0x9b, 0x50, 0x73, 0xa3, 0x30, 0xe4, 0xae, + 0x0c, 0xa2, 0xd0, 0x09, 0x3c, 0xbb, 0x8a, 0x56, 0xab, 0x0b, 0xe6, 0xd0, 0x23, 0xb7, 0xa0, 0xb9, + 0xa4, 0xc4, 0xa6, 0x01, 0x13, 0x76, 0xad, 0x9d, 0xe9, 0x56, 0x68, 0x63, 0xc1, 0xff, 0x41, 0xb1, + 0xc9, 0x13, 0xd8, 0x94, 0x2a, 0x5a, 0x47, 0x8c, 0x59, 0xe2, 0x39, 0x41, 0xf8, 0x3c, 0x12, 0x76, + 0x1d, 0xc3, 0xf9, 0xdf, 0x4a, 0x38, 0xfb, 0x4a, 0x6b, 0x4f, 0x29, 0x0d, 0x95, 0x0e, 0x6d, 0xc8, + 0x55, 0x06, 0xf9, 0x1a, 0xea, 0x58, 0x1f, 0x93, 0x62, 0x61, 0x37, 0xda, 0xb9, 0x6e, 0x9e, 0xd6, + 0x90, 0x9b, 0x26, 0x57, 0x74, 0x5e, 0x15, 0xa0, 0x4c, 0xb9, 0x88, 0xa3, 0x50, 0x70, 0x42, 0x53, + 0x9c, 0x20, 0x2c, 0x07, 0x0f, 0xdf, 0xbc, 0xbf, 0xb1, 0xf1, 0xf7, 0xfb, 0x1b, 0xf7, 0xfd, 0x40, + 0x8e, 0x0f, 0x46, 0x3d, 0x37, 0x9a, 0xed, 0xc4, 0x41, 0xe8, 0xbb, 0x2c, 0xde, 0x99, 0x1c, 0x6a, + 0xc4, 0xc7, 0x13, 0x7f, 0x47, 0x85, 0xca, 0xbd, 0xd1, 0x91, 0xe4, 0xa2, 0xb7, 0x87, 0xe7, 0x81, + 0x3a, 0xa7, 0x38, 0xbb, 0x0b, 0xd5, 0x84, 0xfb, 0xea, 0xe2, 0xd8, 0x53, 0x88, 0x4a, 0xab, 0x5f, + 0xef, 0x99, 0x0e, 0xdb, 0x55, 0xbf, 0xd4, 0xd2, 0x3a, 0x48, 0x90, 0x5b, 0x50, 0x9c, 0x46, 0xee, + 0x84, 0x7b, 0x08, 0x58, 0xab, 0xbf, 0x39, 0x47, 0xfa, 0xd3, 0xc8, 0x9d, 0xa8, 0xeb, 0xd1, 0x54, + 0x41, 0xd5, 0x34, 0x92, 0x63, 0x9e, 0xa4, 0xc6, 0xf3, 0x98, 0x55, 0x40, 0x96, 0xb6, 0x75, 0x07, + 0x0a, 0x78, 0x61, 0x44, 0xe4, 0x47, 0xa1, 0xac, 0x75, 0xc8, 0x03, 0xa8, 0xf2, 0x17, 0xdc, 0x75, + 0x3c, 0x2e, 0x59, 0x30, 0x15, 0x88, 0x4a, 0xab, 0xbf, 0x35, 0x77, 0xbf, 0xfb, 0x82, 0xbb, 0x8f, + 0xb5, 0x8c, 0x5a, 0x7c, 0x41, 0x90, 0x87, 0xd0, 0x58, 0xfe, 0xd0, 0x39, 0xec, 0xdb, 0x16, 0x7e, + 0xbb, 0xbd, 0xee, 0xdb, 0x67, 0x7d, 0x5a, 0xe3, 0xcb, 0x24, 0x69, 0x43, 0x75, 0xde, 0x42, 0xe3, + 0x40, 0x62, 0x43, 0x96, 0x29, 0xa4, 0xed, 0xf3, 0x24, 0x90, 0xe4, 0x1b, 0x20, 0x5a, 0x3c, 0x65, + 0x42, 0xce, 0xdb, 0xa6, 0x8c, 0x68, 0x6b, 0xa2, 0xe4, 0x29, 0x13, 0xd2, 0xf4, 0x4c, 0x07, 0x6a, + 0x2e, 0x0b, 0x9d, 0x11, 0xd7, 0x36, 0x4d, 0x47, 0x58, 0x2e, 0x0b, 0x07, 0x1c, 0x6d, 0x7a, 0xe4, + 0x3b, 0xd8, 0x9e, 0x32, 0xc9, 0x85, 0x74, 0x46, 0x07, 0xee, 0x84, 0x4b, 0x31, 0xb7, 0xaa, 0x31, + 0xbc, 0xa5, 0xa5, 0x03, 0x2d, 0x34, 0x96, 0x9f, 0x42, 0x63, 0x84, 0x9d, 0x9b, 0xa4, 0xa0, 0x51, + 0x50, 0x56, 0xf0, 0xbc, 0xf9, 0xa9, 0x6e, 0x49, 0x75, 0x69, 0x1d, 0xbf, 0x35, 0xa4, 0xf8, 0x31, + 0x5f, 0x86, 0xa6, 0xd5, 0x79, 0x9d, 0x01, 0xa0, 0x58, 0x7f, 0x55, 0x5b, 0x72, 0x1d, 0x2a, 0x29, + 0x62, 0x02, 0x0f, 0xa1, 0x98, 0xa7, 0x65, 0xcd, 0x18, 0x7a, 0xe4, 0xfe, 0x02, 0x4e, 0x71, 0xe4, + 0x8e, 0x53, 0x38, 0x5d, 0xea, 0xa5, 0x23, 0x59, 0x9b, 0xd9, 0x55, 0xa2, 0x39, 0xa6, 0x14, 0xb1, + 0x34, 0xd3, 0x72, 0xe7, 0x98, 0x69, 0x9d, 0x43, 0xa8, 0xcc, 0x7b, 0x09, 0x47, 0xa5, 0x6e, 0x47, + 0x13, 0x4f, 0x09, 0xe9, 0x21, 0xe2, 0x4f, 0x8b, 0x16, 0xd1, 0xe4, 0x29, 0x20, 0xeb, 0xb3, 0xfc, + 0x4e, 0xa0, 0x71, 0xaa, 0xb3, 0x95, 0x0b, 0x05, 0x96, 0x03, 0x19, 0x25, 0x26, 0x80, 0x0a, 0x05, + 0xc3, 0x1a, 0x7a, 0xe4, 0x81, 0x89, 0x41, 0x4f, 0x8b, 0x2c, 0xfa, 0xd9, 0x5e, 0x2d, 0x87, 0x31, + 0x97, 0xc6, 0x86, 0x96, 0x3b, 0x33, 0xa8, 0xa2, 0x33, 0x9d, 0x34, 0x41, 0x6e, 0xc3, 0x66, 0x3c, + 0x3e, 0x12, 0x81, 0xcb, 0xa6, 0x8e, 0x9e, 0x42, 0xa9, 0xbf, 0x1c, 0x6d, 0x18, 0x01, 0x7e, 0x30, + 0xf4, 0xc8, 0x5d, 0x28, 0xe9, 0xf4, 0x1a, 0x87, 0x57, 0x56, 0x1c, 0x2e, 0xca, 0x49, 0x8d, 0x5e, + 0xe7, 0xcf, 0x1c, 0x54, 0x07, 0xba, 0xfe, 0x5f, 0x66, 0xa5, 0x2d, 0xc5, 0x94, 0x3f, 0x5f, 0x4c, + 0x2b, 0x5b, 0xb0, 0xb0, 0xba, 0x05, 0x57, 0xf7, 0x4e, 0xf1, 0xf4, 0xde, 0x79, 0x08, 0x35, 0x9d, + 0x23, 0xe3, 0xb2, 0x84, 0x2e, 0xaf, 0x9e, 0x9d, 0xd2, 0x69, 0x7a, 0x69, 0x55, 0x2e, 0x27, 0xfb, + 0xb2, 0x1a, 0x72, 0xbe, 0xca, 0x70, 0x19, 0x2b, 0x5a, 0x98, 0x46, 0xfe, 0xd0, 0x3b, 0xbb, 0x50, + 0x2a, 0xe7, 0x5c, 0x28, 0x70, 0x81, 0x85, 0x62, 0x7d, 0xc6, 0x42, 0xe9, 0xfc, 0x91, 0x85, 0xda, + 0x60, 0xb9, 0x7d, 0xbf, 0xc8, 0xba, 0x38, 0x35, 0xd0, 0xb3, 0x67, 0x06, 0xfa, 0xe9, 0x19, 0x9d, + 0x3b, 0xef, 0x8c, 0xbe, 0x07, 0xb5, 0x84, 0xcb, 0xe4, 0xc8, 0x59, 0xc5, 0x48, 0x7d, 0x75, 0x74, + 0xd0, 0x2a, 0x2a, 0x99, 0x2a, 0x7d, 0x0f, 0x9a, 0xd6, 0xe9, 0x53, 0x18, 0xf9, 0x54, 0x73, 0x59, + 0xa8, 0x8b, 0xb4, 0xe8, 0xfc, 0x93, 0x81, 0xfa, 0xea, 0x18, 0xfc, 0x32, 0x93, 0xad, 0x0d, 0xf9, + 0x98, 0xf3, 0x24, 0x4d, 0x44, 0xd5, 0xe8, 0xff, 0xc2, 0x79, 0x42, 0x51, 0x72, 0xd1, 0xf7, 0xdc, + 0x15, 0x28, 0xa9, 0xc7, 0x8d, 0x8a, 0x51, 0xb7, 0x44, 0x51, 0x91, 0x43, 0x6f, 0xcd, 0x93, 0xa2, + 0xb8, 0xee, 0x49, 0xf1, 0x57, 0x16, 0xb6, 0xd7, 0xcf, 0xff, 0xff, 0xe2, 0x03, 0xe3, 0xa3, 0xd9, + 0x5a, 0xf3, 0x26, 0x28, 0x5e, 0xe0, 0x4d, 0xd0, 0x39, 0xce, 0x40, 0xe3, 0x31, 0x9f, 0x72, 0x9f, + 0x49, 0xfe, 0x39, 0x13, 0x73, 0x79, 0xb4, 0x65, 0x3f, 0xf6, 0xc0, 0x3f, 0xcf, 0x52, 0x52, 0x6f, + 0x8f, 0x19, 0x9f, 0xa5, 0x2b, 0x41, 0xa8, 0x50, 0x42, 0x97, 0x63, 0x2a, 0xf2, 0xb4, 0x39, 0xe3, + 0x33, 0x3d, 0x3a, 0x52, 0x3e, 0xb9, 0x03, 0x9b, 0x22, 0x64, 0xb1, 0x18, 0x47, 0x72, 0xa1, 0xac, + 0x53, 0xd3, 0x34, 0x02, 0xa3, 0xdc, 0x79, 0x95, 0x85, 0xe6, 0xe2, 0x92, 0x29, 0x4a, 0xbe, 0x82, + 0xfa, 0xc2, 0xdf, 0x02, 0x2f, 0xb4, 0x6a, 0x7c, 0x3d, 0x56, 0x75, 0xbf, 0x06, 0x65, 0x63, 0x2e, + 0xfd, 0xcf, 0x34, 0xa7, 0xcf, 0x60, 0x22, 0x77, 0x11, 0x4c, 0xe4, 0x2f, 0x88, 0x89, 0xc2, 0x19, + 0x4c, 0xac, 0x4f, 0x58, 0x71, 0x7d, 0xc2, 0x06, 0xfd, 0x77, 0xbf, 0x97, 0x33, 0x6f, 0x8e, 0x5b, + 0x99, 0xb7, 0xc7, 0xad, 0xcc, 0x87, 0xe3, 0x56, 0xe6, 0xf5, 0x49, 0x6b, 0xe3, 0xb7, 0x93, 0xd6, + 0xc6, 0xdb, 0x93, 0xd6, 0xc6, 0xbb, 0x93, 0xd6, 0x06, 0x34, 0xa3, 0xc4, 0xef, 0xc9, 0x60, 0x72, + 0xd8, 0x4b, 0xdb, 0x62, 0x54, 0xc4, 0x9f, 0x7b, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xa9, 0x2d, + 0xfd, 0xcd, 0xc9, 0x0e, 0x00, 0x00, } func (m *KeyRange) Marshal() (dAtA []byte, err error) { @@ -1265,6 +1285,24 @@ func (m *Request) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.RangeVersions) > 0 { + dAtA2 := make([]byte, len(m.RangeVersions)*10) + var j1 int + for _, num := range m.RangeVersions { + for num >= 1<<7 { + dAtA2[j1] = uint8(uint64(num)&0x7f | 0x80) + num >>= 7 + j1++ + } + dAtA2[j1] = uint8(num) + j1++ + } + i -= j1 + copy(dAtA[i:], dAtA2[:j1]) + i = encodeVarintCoprocessor(dAtA, i, uint64(j1)) + i-- + dAtA[i] = 0x7a + } if len(m.TableShardInfos) > 0 { for iNdEx := len(m.TableShardInfos) - 1; iNdEx >= 0; iNdEx-- { { @@ -1935,6 +1973,24 @@ func (m *StoreBatchTask) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.RangeVersions) > 0 { + dAtA13 := make([]byte, len(m.RangeVersions)*10) + var j12 int + for _, num := range m.RangeVersions { + for num >= 1<<7 { + dAtA13[j12] = uint8(uint64(num)&0x7f | 0x80) + num >>= 7 + j12++ + } + dAtA13[j12] = uint8(num) + j12++ + } + i -= j12 + copy(dAtA[i:], dAtA13[:j12]) + i = encodeVarintCoprocessor(dAtA, i, uint64(j12)) + i-- + dAtA[i] = 0x32 + } if m.TaskId != 0 { i = encodeVarintCoprocessor(dAtA, i, uint64(m.TaskId)) i-- @@ -2292,6 +2348,13 @@ func (m *Request) Size() (n int) { n += 1 + l + sovCoprocessor(uint64(l)) } } + if len(m.RangeVersions) > 0 { + l = 0 + for _, e := range m.RangeVersions { + l += sovCoprocessor(uint64(e)) + } + n += 1 + sovCoprocessor(uint64(l)) + l + } return n } @@ -2540,6 +2603,13 @@ func (m *StoreBatchTask) Size() (n int) { if m.TaskId != 0 { n += 1 + sovCoprocessor(uint64(m.TaskId)) } + if len(m.RangeVersions) > 0 { + l = 0 + for _, e := range m.RangeVersions { + l += sovCoprocessor(uint64(e)) + } + n += 1 + sovCoprocessor(uint64(l)) + l + } return n } @@ -3144,6 +3214,82 @@ func (m *Request) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 15: + if wireType == 0 { + var v uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCoprocessor + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.RangeVersions = append(m.RangeVersions, v) + } else if wireType == 2 { + var packedLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCoprocessor + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + packedLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if packedLen < 0 { + return ErrInvalidLengthCoprocessor + } + postIndex := iNdEx + packedLen + if postIndex < 0 { + return ErrInvalidLengthCoprocessor + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + var elementCount int + var count int + for _, integer := range dAtA[iNdEx:postIndex] { + if integer < 128 { + count++ + } + } + elementCount = count + if elementCount != 0 && len(m.RangeVersions) == 0 { + m.RangeVersions = make([]uint64, 0, elementCount) + } + for iNdEx < postIndex { + var v uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCoprocessor + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.RangeVersions = append(m.RangeVersions, v) + } + } else { + return fmt.Errorf("proto: wrong wireType = %d for field RangeVersions", wireType) + } default: iNdEx = preIndex skippy, err := skipCoprocessor(dAtA[iNdEx:]) @@ -4806,6 +4952,82 @@ func (m *StoreBatchTask) Unmarshal(dAtA []byte) error { break } } + case 6: + if wireType == 0 { + var v uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCoprocessor + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.RangeVersions = append(m.RangeVersions, v) + } else if wireType == 2 { + var packedLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCoprocessor + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + packedLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if packedLen < 0 { + return ErrInvalidLengthCoprocessor + } + postIndex := iNdEx + packedLen + if postIndex < 0 { + return ErrInvalidLengthCoprocessor + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + var elementCount int + var count int + for _, integer := range dAtA[iNdEx:postIndex] { + if integer < 128 { + count++ + } + } + elementCount = count + if elementCount != 0 && len(m.RangeVersions) == 0 { + m.RangeVersions = make([]uint64, 0, elementCount) + } + for iNdEx < postIndex { + var v uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCoprocessor + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.RangeVersions = append(m.RangeVersions, v) + } + } else { + return fmt.Errorf("proto: wrong wireType = %d for field RangeVersions", wireType) + } default: iNdEx = preIndex skippy, err := skipCoprocessor(dAtA[iNdEx:]) diff --git a/pkg/import_sstpb/import_sstpb.pb.go b/pkg/import_sstpb/import_sstpb.pb.go index a0b744294..90a46929d 100644 --- a/pkg/import_sstpb/import_sstpb.pb.go +++ b/pkg/import_sstpb/import_sstpb.pb.go @@ -2521,12 +2521,12 @@ func (m *ClearResponse) GetError() *Error { type AddPartitionRangeRequest struct { Range *Range `protobuf:"bytes,1,opt,name=range,proto3" json:"range,omitempty"` - // the number of seconds this range is valid. If after this duration seconds, - // this range is still not removed by `RemoveForcePartitionRange`, tikv will - // automically remove it. So the client should ensure to set a big enough value - // to avoid auto cleanup. But in general, 1h should be a big enough value. - // If its value is 0, tikv will auto adjust it to 3600(1h). - Ttl uint64 `protobuf:"varint,2,opt,name=ttl,proto3" json:"ttl,omitempty"` + // the number of seconds this range is valid. + //After this duration, if this range is still not removed by + // `RemoveForcePartitionRange`, tikv will automically remove it. So the client + // should set a big enough value to avoid auto cleanup. But in general, 1h + // should be a big enough value. If its value is 0, tikv will auto adjust it to 3600(1h). + TtlSeconds uint64 `protobuf:"varint,2,opt,name=ttl_seconds,json=ttlSeconds,proto3" json:"ttl_seconds,omitempty"` } func (m *AddPartitionRangeRequest) Reset() { *m = AddPartitionRangeRequest{} } @@ -2569,9 +2569,9 @@ func (m *AddPartitionRangeRequest) GetRange() *Range { return nil } -func (m *AddPartitionRangeRequest) GetTtl() uint64 { +func (m *AddPartitionRangeRequest) GetTtlSeconds() uint64 { if m != nil { - return m.Ttl + return m.TtlSeconds } return 0 } @@ -2742,160 +2742,160 @@ func init() { func init() { proto.RegisterFile("import_sstpb.proto", fileDescriptor_4d076b7935cfab6b) } var fileDescriptor_4d076b7935cfab6b = []byte{ - // 2437 bytes of a gzipped FileDescriptorProto + // 2446 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x59, 0x4b, 0x73, 0xdb, 0xc8, - 0xf1, 0x27, 0xf8, 0x66, 0xf3, 0x21, 0x7a, 0xac, 0x95, 0x60, 0xca, 0x96, 0xbd, 0xf8, 0x7b, 0xd7, - 0xb2, 0xf4, 0x8f, 0xec, 0xc8, 0x1b, 0xd7, 0xd6, 0xa6, 0x2a, 0x2e, 0xeb, 0xb1, 0xb6, 0x22, 0xcb, - 0x56, 0x40, 0xc5, 0x7b, 0xc8, 0x01, 0x05, 0x01, 0x43, 0x09, 0x21, 0x08, 0x20, 0x98, 0x21, 0x65, - 0x7e, 0x85, 0x9c, 0x92, 0x5b, 0xae, 0xc9, 0x69, 0x2b, 0xdf, 0x20, 0xdf, 0x60, 0x0f, 0x39, 0xec, - 0x71, 0x4f, 0xa9, 0x94, 0x7d, 0x4d, 0xe5, 0x92, 0x2f, 0x90, 0x9a, 0x07, 0x40, 0x00, 0x22, 0x45, - 0x4b, 0x49, 0x4e, 0xc4, 0x74, 0xf7, 0xf4, 0xf4, 0xf4, 0x6b, 0x7e, 0x33, 0x04, 0xe4, 0x0c, 0x02, - 0x3f, 0xa4, 0x06, 0x21, 0x34, 0x38, 0xd9, 0x0c, 0x42, 0x9f, 0xfa, 0xa8, 0x91, 0xa4, 0x75, 0x1a, - 0x03, 0x4c, 0xcd, 0x88, 0xd7, 0x69, 0xe2, 0x30, 0xf4, 0xc3, 0xc9, 0xb0, 0x3f, 0x0a, 0x03, 0x2b, - 0x1e, 0xc2, 0xc9, 0x84, 0x85, 0xb0, 0x67, 0x85, 0xe3, 0x80, 0x3a, 0xbe, 0x17, 0xd3, 0x16, 0x4f, - 0xfd, 0x53, 0x9f, 0x7f, 0x3e, 0x62, 0x5f, 0x92, 0xba, 0x10, 0x0e, 0x09, 0xe5, 0x9f, 0x82, 0xa0, - 0xfd, 0x5e, 0x81, 0xe5, 0xee, 0x90, 0x04, 0xd8, 0xb3, 0xf7, 0xb9, 0x29, 0xfa, 0xd1, 0x8e, 0x8e, - 0x7f, 0x33, 0xc4, 0x84, 0xa2, 0x2f, 0x60, 0x89, 0x9c, 0xf9, 0x43, 0xd7, 0x36, 0x88, 0x90, 0x30, - 0x84, 0xb5, 0x44, 0x55, 0xee, 0x29, 0x6b, 0x55, 0x7d, 0x51, 0x70, 0x53, 0xd3, 0x09, 0x5a, 0x83, - 0xb6, 0x3d, 0x0c, 0x4d, 0x66, 0x8c, 0xe1, 0x78, 0x06, 0xc1, 0x16, 0x51, 0xf3, 0xf7, 0x94, 0xb5, - 0xa2, 0xde, 0x8a, 0xe8, 0xfb, 0x5e, 0x17, 0x5b, 0x04, 0x2d, 0x41, 0xd9, 0x32, 0x5d, 0x17, 0x87, - 0x6a, 0xe1, 0x9e, 0xb2, 0x56, 0xd3, 0xe5, 0x48, 0x7b, 0x01, 0xea, 0x45, 0x93, 0x48, 0xe0, 0x7b, - 0x04, 0xa3, 0x0d, 0xb8, 0x61, 0xba, 0x21, 0x36, 0xed, 0x71, 0x64, 0x14, 0xb6, 0xa5, 0x39, 0x6d, - 0xc9, 0xe8, 0x46, 0x74, 0xcd, 0x83, 0x1b, 0xdd, 0x73, 0x87, 0x5a, 0x67, 0x87, 0xbe, 0x8d, 0xa3, - 0x5d, 0xfd, 0x3f, 0x14, 0x07, 0xbe, 0x8d, 0xf9, 0xa4, 0xd6, 0x96, 0xba, 0x99, 0x8a, 0x4a, 0x42, - 0x9c, 0x4b, 0xa1, 0x0d, 0x28, 0x87, 0xa6, 0x77, 0x8a, 0xd9, 0x1e, 0x0a, 0x6b, 0xf5, 0xad, 0x9b, - 0x69, 0x79, 0x9d, 0xf1, 0x74, 0x29, 0xa2, 0x2d, 0x02, 0x4a, 0xae, 0x27, 0x4c, 0xd6, 0xda, 0xd0, - 0x7a, 0x81, 0x69, 0xc2, 0x04, 0xed, 0x19, 0x2c, 0xc4, 0x14, 0xb9, 0xaf, 0x2b, 0x59, 0xa5, 0x3d, - 0x82, 0x12, 0x5f, 0x19, 0x2d, 0x42, 0x89, 0x50, 0x33, 0xa4, 0x7c, 0x5e, 0x43, 0x17, 0x03, 0xd4, - 0x86, 0x02, 0xf6, 0x6c, 0xee, 0xf5, 0x86, 0xce, 0x3e, 0xb5, 0x3f, 0x16, 0xa0, 0xd2, 0xed, 0x1e, - 0x1f, 0x62, 0x6a, 0x22, 0x04, 0xc5, 0xe1, 0xd0, 0xb1, 0xe5, 0x14, 0xfe, 0x8d, 0x1e, 0x42, 0x89, - 0xef, 0x81, 0xcf, 0x99, 0xb1, 0x4b, 0x21, 0xc1, 0x96, 0xb4, 0x42, 0xeb, 0xc9, 0x16, 0x0f, 0x5a, - 0x53, 0x17, 0x03, 0x16, 0x4b, 0x17, 0x7b, 0xa7, 0xf4, 0x4c, 0x2d, 0xf2, 0x58, 0xcb, 0x11, 0x5a, - 0x86, 0x8a, 0xd5, 0x33, 0x3c, 0x73, 0x80, 0xd5, 0x92, 0x0c, 0x72, 0xef, 0xb5, 0x39, 0xc0, 0x68, - 0x05, 0x6a, 0x21, 0x3e, 0xe5, 0x49, 0x62, 0xab, 0x65, 0x3e, 0xa7, 0x2a, 0x08, 0xfb, 0x36, 0x7a, - 0x0a, 0x0d, 0xc9, 0xc4, 0x81, 0x6f, 0x9d, 0xa9, 0x15, 0x69, 0x95, 0xac, 0x0f, 0x9d, 0xf3, 0xf6, - 0x18, 0x4b, 0xaf, 0x87, 0x93, 0x01, 0x5a, 0x87, 0x1b, 0x2c, 0x4d, 0xfb, 0x78, 0x6c, 0xe0, 0x77, - 0x96, 0x3b, 0x24, 0xce, 0x08, 0xab, 0x55, 0x9e, 0x1d, 0x0b, 0xd8, 0xb3, 0x0f, 0xf0, 0x78, 0x2f, - 0x22, 0x33, 0x03, 0xa8, 0x4f, 0x4d, 0xd7, 0xe8, 0x8f, 0x88, 0x5a, 0x13, 0x06, 0x70, 0xc2, 0xc1, - 0x88, 0xa0, 0xbb, 0x50, 0x17, 0xcc, 0x93, 0x31, 0xc5, 0x44, 0x05, 0xce, 0x06, 0x4e, 0xda, 0x66, - 0x14, 0xf4, 0x05, 0xd4, 0xcd, 0xc0, 0x31, 0x46, 0x38, 0x24, 0x8e, 0xef, 0xa9, 0x75, 0x1e, 0xb6, - 0x9b, 0x9b, 0x51, 0x8d, 0x3e, 0x3f, 0xda, 0x7f, 0x2b, 0x58, 0x3a, 0x98, 0x81, 0x23, 0xbf, 0xd9, - 0x9a, 0x96, 0x13, 0x9c, 0xe1, 0xd0, 0x70, 0x46, 0x6a, 0x83, 0xfb, 0xbf, 0x2a, 0x08, 0xfb, 0x23, - 0xed, 0x1f, 0x0a, 0xd4, 0x75, 0x7c, 0x1e, 0x3a, 0x14, 0xeb, 0x43, 0x17, 0xa3, 0xfb, 0xd0, 0xf2, - 0x5d, 0xb1, 0x99, 0x20, 0xc4, 0x3d, 0xe7, 0x9d, 0x8c, 0x58, 0xc3, 0x77, 0xd9, 0x4e, 0x8e, 0x38, - 0x8d, 0x49, 0x79, 0xf8, 0x3c, 0x29, 0x25, 0xc2, 0xde, 0xf0, 0xf0, 0xf9, 0x44, 0xea, 0xff, 0xa0, - 0xc9, 0xa4, 0xa8, 0x33, 0xc0, 0x84, 0x9a, 0x83, 0x80, 0x07, 0xaf, 0xc8, 0x85, 0x8e, 0x23, 0x1a, - 0xab, 0x77, 0xe7, 0xd4, 0xf3, 0x43, 0x6c, 0x98, 0x3d, 0x8a, 0xc3, 0x84, 0xb4, 0x88, 0xe9, 0xa2, - 0xe0, 0x3e, 0x67, 0xcc, 0xc9, 0xac, 0xa7, 0xb0, 0x2c, 0x67, 0x9d, 0xe0, 0x1e, 0xfb, 0x99, 0x4c, - 0x2b, 0xf1, 0x69, 0x9f, 0x08, 0xf6, 0x36, 0xe7, 0xc6, 0xf3, 0xb4, 0x5f, 0x41, 0xf3, 0x97, 0x81, - 0xeb, 0x9b, 0x76, 0x54, 0x98, 0x1b, 0x50, 0x64, 0xf1, 0xe5, 0xbb, 0xac, 0x6f, 0x7d, 0x92, 0x29, - 0x01, 0x91, 0xbc, 0x2f, 0x73, 0x3a, 0x17, 0x42, 0x8b, 0x50, 0xb4, 0x4d, 0x6a, 0x8a, 0xcd, 0x32, - 0x2a, 0x1b, 0x6d, 0x57, 0xa0, 0x64, 0x9d, 0x0d, 0xbd, 0x3e, 0xab, 0xb9, 0x48, 0xb9, 0xac, 0x42, - 0x1b, 0x9a, 0xfb, 0xac, 0x48, 0x69, 0xb4, 0xdc, 0x3a, 0x54, 0x2c, 0xdf, 0xa3, 0xf8, 0x1d, 0x95, - 0x2b, 0xb6, 0xe3, 0xe8, 0xed, 0x08, 0xba, 0x1e, 0x09, 0xa0, 0x07, 0x50, 0x20, 0x84, 0xca, 0xe2, - 0x98, 0x6e, 0x99, 0xce, 0x24, 0xb4, 0x3e, 0xa0, 0xc3, 0xa1, 0x4b, 0x9d, 0xeb, 0x2f, 0xf5, 0x10, - 0x8a, 0x84, 0xd0, 0xa8, 0xdd, 0xcc, 0x58, 0x8b, 0x8b, 0x68, 0x4f, 0xa1, 0x15, 0xad, 0x23, 0xbb, - 0xc8, 0x7d, 0x28, 0xf1, 0x43, 0x43, 0x2e, 0xd3, 0xda, 0x8c, 0x8e, 0x90, 0x3d, 0xf6, 0xab, 0x0b, - 0xa6, 0xf6, 0x5b, 0x05, 0x5a, 0x3b, 0xfe, 0x20, 0x30, 0xad, 0xd8, 0xc2, 0xb8, 0xfe, 0x95, 0xb9, - 0xf5, 0xff, 0x29, 0x34, 0xfc, 0x21, 0x0d, 0x86, 0xd4, 0x70, 0xf1, 0x08, 0xbb, 0xdc, 0x29, 0x25, - 0xbd, 0x2e, 0x68, 0xaf, 0x18, 0x29, 0xb9, 0xdf, 0xc2, 0x9c, 0xfd, 0x6a, 0x37, 0x60, 0x21, 0xb6, - 0x45, 0x86, 0xea, 0xaf, 0x25, 0x58, 0xd8, 0xf5, 0xcf, 0xbd, 0x64, 0x72, 0xfc, 0x54, 0xba, 0x45, - 0xe1, 0x6e, 0x79, 0x90, 0xb6, 0x2f, 0x23, 0xbc, 0xd9, 0x25, 0x94, 0xec, 0x79, 0x34, 0x1c, 0x0b, - 0x47, 0xb1, 0x6a, 0x0e, 0x31, 0xf1, 0xdd, 0x11, 0xb6, 0x0d, 0x4a, 0x64, 0xee, 0x43, 0x44, 0x3a, - 0x26, 0xe8, 0x47, 0xf3, 0xe3, 0xbb, 0x5d, 0xfc, 0xee, 0x6f, 0x77, 0x73, 0x3c, 0xca, 0xac, 0x83, - 0xf2, 0x8e, 0x56, 0xe3, 0x1d, 0x8d, 0x7f, 0xa3, 0x6d, 0xd6, 0xb2, 0x78, 0xf1, 0x1a, 0xe1, 0xd0, - 0xc5, 0x6a, 0x93, 0xeb, 0xba, 0x95, 0x71, 0xe4, 0xa4, 0xbc, 0xa5, 0xbe, 0x7a, 0x98, 0xa8, 0xf8, - 0x03, 0x58, 0x24, 0x7e, 0x48, 0xb1, 0x6d, 0x24, 0x55, 0x11, 0x75, 0x91, 0x6f, 0x7a, 0xb6, 0x2e, - 0x1d, 0x89, 0x69, 0x09, 0x12, 0x41, 0xcf, 0x60, 0x81, 0x50, 0x3f, 0x34, 0x4f, 0xb1, 0x71, 0x62, - 0x5a, 0x7d, 0x76, 0x20, 0xb4, 0xb8, 0x4d, 0x4b, 0x9b, 0x6c, 0x3c, 0x0c, 0x36, 0xbb, 0x82, 0xbd, - 0x2d, 0xb8, 0x7a, 0x8b, 0xa4, 0xc6, 0xec, 0x20, 0x8f, 0x14, 0x58, 0xa6, 0x75, 0x86, 0x59, 0xa3, - 0xbe, 0xc1, 0x77, 0x1c, 0x49, 0xee, 0x30, 0xf2, 0xbe, 0x8d, 0x3a, 0x50, 0x73, 0x88, 0x11, 0x9a, - 0xe7, 0x46, 0x7f, 0xa4, 0x2e, 0xf0, 0x76, 0x5b, 0x71, 0x88, 0x6e, 0x9e, 0x1f, 0x8c, 0xd0, 0x13, - 0xa8, 0x47, 0x2d, 0xcf, 0xeb, 0xf9, 0x6a, 0x9b, 0x9b, 0x80, 0x22, 0x13, 0x76, 0x44, 0xf3, 0xf3, - 0x7a, 0xbe, 0x0e, 0x56, 0xfc, 0x8d, 0x76, 0x99, 0x33, 0x79, 0x2c, 0x0d, 0x3a, 0x0e, 0xb0, 0x8a, - 0x78, 0x7b, 0xfd, 0xf4, 0xd2, 0xa8, 0x1f, 0x8f, 0x03, 0xcc, 0xdc, 0x19, 0x0f, 0x92, 0x69, 0x78, - 0x73, 0x4e, 0x1a, 0x76, 0x5e, 0x43, 0x2d, 0xce, 0x1a, 0x76, 0x7e, 0xf6, 0xf1, 0x98, 0xd7, 0x42, - 0x4d, 0x67, 0x9f, 0x68, 0x03, 0x4a, 0x23, 0xd3, 0x1d, 0xe2, 0xcb, 0x5b, 0x80, 0x90, 0xf9, 0x2a, - 0xff, 0xa5, 0xf2, 0xf3, 0x62, 0xb5, 0xda, 0xae, 0xe9, 0x85, 0x61, 0xe8, 0x6a, 0x3a, 0x94, 0x78, - 0xf9, 0x21, 0x15, 0x2a, 0x03, 0x4c, 0x88, 0x29, 0xcb, 0xac, 0xa6, 0x47, 0x43, 0xf4, 0x08, 0xea, - 0xcc, 0xa5, 0xd8, 0x10, 0xd5, 0x9b, 0x9f, 0x5a, 0xbd, 0xc0, 0x45, 0xf8, 0xb7, 0xf6, 0x5e, 0x81, - 0xf6, 0x64, 0xff, 0xb2, 0xfa, 0x1f, 0xcd, 0x2f, 0x62, 0x99, 0x75, 0xb2, 0x94, 0x6f, 0x41, 0xd5, - 0x21, 0x06, 0x1e, 0x04, 0x74, 0xcc, 0xd7, 0xe4, 0x61, 0xdb, 0x63, 0x43, 0xd6, 0x10, 0x84, 0x2d, - 0x85, 0x69, 0xba, 0x92, 0xed, 0x64, 0x02, 0x08, 0x8a, 0xd3, 0x01, 0x41, 0x29, 0x05, 0x08, 0xa2, - 0xfe, 0x56, 0x9e, 0xdf, 0xdf, 0x9e, 0xc1, 0xed, 0x2e, 0xa6, 0xd1, 0x36, 0xbb, 0x01, 0xc6, 0xf6, - 0x2b, 0x67, 0xe0, 0xc4, 0x4d, 0xeb, 0x2e, 0xd4, 0x09, 0x23, 0x1a, 0x2e, 0xa3, 0xf2, 0x5d, 0x17, - 0x75, 0x20, 0xb1, 0x9c, 0x76, 0x17, 0xee, 0xcc, 0x50, 0x20, 0x3b, 0x4d, 0x00, 0xc5, 0x23, 0xd3, - 0x09, 0x93, 0x01, 0x6f, 0x88, 0x80, 0x2f, 0x26, 0x03, 0xde, 0x90, 0x91, 0x45, 0x9f, 0x41, 0xde, - 0x17, 0x67, 0x67, 0x2b, 0x6b, 0x3a, 0xd3, 0xb3, 0xf9, 0xe6, 0x48, 0xcf, 0xfb, 0x81, 0x76, 0x0b, - 0xf2, 0x6f, 0x8e, 0x50, 0x05, 0x0a, 0x47, 0x43, 0xda, 0xce, 0x21, 0x80, 0xf2, 0x2e, 0x76, 0x31, - 0xc5, 0x6d, 0x45, 0xeb, 0x02, 0x7c, 0xc3, 0x6a, 0x74, 0xdb, 0xa4, 0xd6, 0x19, 0xc7, 0x03, 0xfe, - 0x60, 0xe0, 0x50, 0x43, 0x82, 0xea, 0xa2, 0x5e, 0x15, 0x84, 0x63, 0x06, 0xa4, 0x4b, 0x81, 0xe9, - 0x84, 0xd1, 0x51, 0x80, 0x2e, 0xae, 0xa7, 0x0b, 0x01, 0xed, 0x4f, 0x0a, 0x34, 0xb8, 0xd6, 0x6b, - 0x1d, 0xa5, 0x8f, 0xa1, 0x74, 0xc2, 0xac, 0x91, 0x69, 0x97, 0xc1, 0x9e, 0x13, 0x6b, 0x5f, 0xe6, - 0x74, 0x21, 0x78, 0x95, 0xfe, 0x3e, 0x39, 0x92, 0x4f, 0xa1, 0x29, 0x6d, 0x94, 0xe9, 0xfa, 0x30, - 0x7d, 0x58, 0x5d, 0x96, 0x62, 0x1b, 0x50, 0x62, 0xa6, 0xce, 0x39, 0x15, 0x85, 0x0c, 0x03, 0x16, - 0xba, 0x79, 0x9e, 0xf0, 0x72, 0x1b, 0x0a, 0x94, 0xba, 0xd2, 0xbf, 0xec, 0xf3, 0xe3, 0x5d, 0x8b, - 0x5a, 0x90, 0x8f, 0x4f, 0x8c, 0x3c, 0x25, 0xda, 0xb7, 0x0a, 0x2c, 0x44, 0xda, 0xaf, 0xe5, 0xed, - 0x27, 0x69, 0x6f, 0xaf, 0x64, 0x8b, 0xf4, 0xfc, 0xbf, 0xe6, 0xf0, 0x5f, 0x43, 0x7b, 0x62, 0xe9, - 0xff, 0xd8, 0xe7, 0x7f, 0x51, 0x60, 0x69, 0x77, 0x18, 0xb8, 0x8e, 0x65, 0x52, 0xbc, 0x8b, 0x29, - 0xb6, 0xae, 0x05, 0x7e, 0x56, 0xa0, 0xc6, 0x6f, 0x30, 0x0c, 0xce, 0xca, 0xca, 0xab, 0x72, 0xc2, - 0x01, 0x1e, 0xb3, 0xab, 0x84, 0x04, 0xf7, 0xdc, 0x09, 0x0d, 0xbd, 0x2c, 0x20, 0x3d, 0x6b, 0x63, - 0x0c, 0xfe, 0xfa, 0x9e, 0x3b, 0xe6, 0x3d, 0xa8, 0xaa, 0x57, 0xfa, 0x78, 0xfc, 0xc6, 0x73, 0xc7, - 0x48, 0x83, 0xe6, 0xc0, 0xf1, 0x8c, 0x49, 0x91, 0x89, 0x66, 0x54, 0x1f, 0x38, 0xde, 0x8e, 0xac, - 0x33, 0xed, 0x10, 0xca, 0x07, 0xa3, 0x2b, 0xb5, 0x81, 0x54, 0xd9, 0x16, 0xd2, 0x65, 0xab, 0xfd, - 0x59, 0x81, 0xe5, 0x0b, 0xae, 0x90, 0xee, 0xff, 0xf1, 0xe4, 0x5e, 0x73, 0x09, 0x4c, 0x8b, 0xae, - 0x34, 0x3c, 0x0c, 0x8f, 0xa1, 0xc6, 0xaf, 0x33, 0x89, 0x83, 0x61, 0x6a, 0xd4, 0x98, 0x0b, 0xc4, - 0x8c, 0xf5, 0x28, 0xb9, 0x0b, 0x3c, 0x70, 0x8b, 0x69, 0x69, 0xb1, 0xd5, 0xa8, 0x73, 0xfc, 0xab, - 0x00, 0xe5, 0x83, 0xb7, 0xd1, 0xb5, 0x90, 0x83, 0x1a, 0x25, 0x01, 0x6a, 0x3e, 0x85, 0x06, 0x3f, - 0x29, 0x0c, 0xbf, 0xd7, 0x23, 0x98, 0xf2, 0x6b, 0x4e, 0x51, 0xaf, 0x73, 0xda, 0x1b, 0x4e, 0x4a, - 0xf4, 0xf9, 0x7c, 0xaa, 0xcf, 0xc7, 0x53, 0x25, 0xb7, 0x91, 0x98, 0xfa, 0x4a, 0x88, 0xb4, 0x20, - 0x6f, 0xf5, 0xe4, 0xdd, 0x3f, 0x6f, 0xf5, 0x98, 0x5b, 0x1d, 0x62, 0xd8, 0xbc, 0x55, 0xca, 0x40, - 0x56, 0x1d, 0x22, 0x5a, 0x27, 0x0b, 0xb2, 0x48, 0x0d, 0x1a, 0x5d, 0xc7, 0x2a, 0x7c, 0x7c, 0x4c, - 0xd0, 0x1d, 0x60, 0x58, 0x8e, 0x9f, 0x9f, 0x71, 0x84, 0x6b, 0x92, 0x72, 0x4c, 0xd2, 0x49, 0x55, - 0x9e, 0x9d, 0x54, 0x95, 0x54, 0x52, 0x2d, 0x41, 0x99, 0x9c, 0x99, 0x5b, 0x3f, 0x79, 0xca, 0xef, - 0x8f, 0x0d, 0x5d, 0x8e, 0xd8, 0x15, 0x53, 0x68, 0x23, 0x9e, 0x19, 0x90, 0x33, 0x9f, 0x1b, 0x24, - 0xae, 0x8f, 0x0b, 0x9c, 0xd1, 0x95, 0xf4, 0x63, 0x82, 0xb6, 0xa1, 0x6d, 0xf9, 0x83, 0x20, 0xc4, - 0x84, 0xdd, 0xfe, 0x04, 0x94, 0x69, 0xf2, 0xc3, 0x63, 0x39, 0x06, 0x40, 0x13, 0x3e, 0x07, 0x30, - 0x0b, 0x56, 0x9a, 0x80, 0x74, 0x58, 0xec, 0x39, 0x2e, 0x36, 0x26, 0x4f, 0x3c, 0x02, 0x48, 0x09, - 0x2c, 0x77, 0x6f, 0x33, 0xf5, 0xf4, 0xf3, 0xb5, 0xe3, 0xe2, 0xbd, 0x98, 0xc0, 0x61, 0x15, 0xea, - 0x5d, 0xa0, 0x69, 0xff, 0x2c, 0x40, 0xe3, 0x79, 0x10, 0xb8, 0xe3, 0xa8, 0x46, 0xd7, 0x52, 0x1d, - 0x2c, 0x9b, 0x31, 0x6f, 0xc5, 0x99, 0xcc, 0xdb, 0xd7, 0x7a, 0xd4, 0x15, 0x1a, 0x53, 0x93, 0xeb, - 0x6d, 0xa2, 0x29, 0x5c, 0x80, 0xc4, 0xf9, 0x6b, 0x40, 0xe2, 0x9f, 0x41, 0x33, 0x8d, 0x85, 0x9b, - 0xf3, 0xb0, 0x70, 0x23, 0x4c, 0xa2, 0xe0, 0x69, 0x20, 0xb6, 0x34, 0x15, 0xc4, 0x4e, 0xc1, 0xcb, - 0x85, 0x2b, 0xe1, 0xe5, 0x44, 0xa3, 0x2b, 0xce, 0x6b, 0x74, 0x19, 0x54, 0x5c, 0xff, 0x28, 0x54, - 0xfc, 0x25, 0xd4, 0x07, 0x26, 0x61, 0x37, 0xf3, 0x3e, 0x1e, 0x13, 0xb5, 0xc5, 0x3d, 0xb1, 0x9c, - 0xce, 0x80, 0x43, 0x2e, 0x70, 0x80, 0xc7, 0x3a, 0x0c, 0xa2, 0x4f, 0xa2, 0xf5, 0xa1, 0x29, 0xe3, - 0x7d, 0x5d, 0xa8, 0x18, 0x1f, 0x1c, 0xf9, 0x79, 0x07, 0x87, 0xf6, 0x39, 0x34, 0x76, 0x5c, 0x6c, - 0x86, 0x51, 0x72, 0x2d, 0x41, 0x39, 0xf1, 0x7e, 0x51, 0xd3, 0xe5, 0x48, 0xfb, 0x0a, 0x9a, 0x52, - 0xee, 0xca, 0x87, 0x93, 0xf6, 0x0d, 0xa8, 0xcf, 0x6d, 0xfb, 0xc8, 0x0c, 0xa9, 0xc3, 0x36, 0x2e, - 0x2e, 0xa8, 0x57, 0xbf, 0xcb, 0x4a, 0x64, 0x90, 0x8f, 0x91, 0x81, 0xb6, 0x02, 0xb7, 0xa6, 0x28, - 0x96, 0x70, 0xf1, 0x25, 0xac, 0xe8, 0x78, 0xe0, 0x8f, 0xf0, 0x7f, 0xba, 0xb0, 0xb6, 0x0a, 0xb7, - 0xa7, 0x6b, 0x12, 0x2b, 0xad, 0xdf, 0x07, 0x98, 0x3c, 0xfa, 0x31, 0x00, 0xf9, 0xda, 0x0f, 0x07, - 0xa6, 0x2b, 0xc0, 0xa4, 0x78, 0x15, 0x6d, 0x2b, 0xeb, 0x8f, 0xe0, 0xe6, 0x94, 0x4b, 0x10, 0x13, - 0x79, 0x85, 0x4f, 0x4d, 0x6b, 0xdc, 0xce, 0xa1, 0x06, 0x54, 0x59, 0x06, 0x04, 0xa6, 0x85, 0xdb, - 0xca, 0xd6, 0x7b, 0x80, 0x9a, 0x98, 0xdd, 0xed, 0x1e, 0xa3, 0x5f, 0xa4, 0x16, 0xb9, 0x3b, 0xf3, - 0xcd, 0x51, 0xa8, 0xee, 0xdc, 0x9b, 0x2d, 0x20, 0xfd, 0x93, 0x43, 0x2f, 0xa1, 0x22, 0x5f, 0x36, - 0xd1, 0xed, 0xb4, 0x78, 0xfa, 0x09, 0xb4, 0x73, 0x67, 0x06, 0x37, 0xd6, 0xf4, 0x02, 0xca, 0xe2, - 0x05, 0x07, 0x65, 0x20, 0x52, 0xea, 0xd1, 0xa8, 0x73, 0x7b, 0x3a, 0x33, 0x52, 0xb3, 0xa6, 0xa0, - 0x3d, 0x28, 0x8b, 0x57, 0x92, 0xac, 0xa2, 0xd4, 0x1b, 0x4d, 0x56, 0x51, 0xfa, 0x61, 0x45, 0xec, - 0x4c, 0xbe, 0x53, 0x64, 0x77, 0x96, 0x7e, 0x4a, 0xc9, 0xee, 0x2c, 0xfb, 0xb8, 0x91, 0x43, 0x21, - 0x7c, 0x32, 0xf5, 0x56, 0x82, 0xd6, 0x33, 0x0e, 0xbe, 0xe4, 0xee, 0xd3, 0xd9, 0xf8, 0x28, 0xd9, - 0x78, 0xcd, 0x03, 0xa8, 0x46, 0x7c, 0x74, 0xe7, 0xd2, 0x6b, 0x74, 0x67, 0x75, 0x16, 0x3b, 0x56, - 0xb6, 0x0b, 0x25, 0x8e, 0x2a, 0x51, 0x67, 0xca, 0x55, 0x21, 0x52, 0xb3, 0x32, 0x95, 0x97, 0x88, - 0xcb, 0x21, 0x54, 0x23, 0x78, 0x9a, 0x35, 0x29, 0x03, 0xb0, 0xb3, 0x26, 0x65, 0x51, 0x2d, 0x57, - 0xf7, 0x06, 0xea, 0x89, 0x97, 0x37, 0x94, 0x49, 0xd6, 0x8b, 0x8f, 0x72, 0x73, 0x03, 0x7e, 0x02, - 0x0b, 0x19, 0x18, 0x87, 0xee, 0x67, 0x5c, 0x33, 0x15, 0xf0, 0x76, 0x3e, 0x9b, 0x23, 0x15, 0xad, - 0xf0, 0x58, 0x41, 0xdb, 0x50, 0xe2, 0x7d, 0x39, 0xeb, 0xc9, 0xe4, 0xe1, 0x9c, 0xf5, 0x64, 0xaa, - 0x91, 0xf3, 0x42, 0x01, 0xde, 0x46, 0xd9, 0xd9, 0x4f, 0xb2, 0x8a, 0x92, 0x8d, 0x38, 0xab, 0x28, - 0xd5, 0x7c, 0xb5, 0x1c, 0xb2, 0xa0, 0x9d, 0xfd, 0xdb, 0x05, 0x65, 0xf6, 0x32, 0xe3, 0x9f, 0xa2, - 0xce, 0xe7, 0xf3, 0xc4, 0xe2, 0x45, 0xfa, 0xb0, 0xf4, 0xdc, 0xb6, 0xbf, 0xf6, 0x43, 0x2b, 0xd3, - 0xfa, 0x50, 0x46, 0xc7, 0xac, 0xf6, 0xde, 0x79, 0x30, 0x57, 0x2e, 0x5e, 0x8c, 0xc2, 0x2d, 0xd1, - 0x65, 0xa7, 0xad, 0xf7, 0x30, 0x0b, 0x21, 0x66, 0x36, 0xf6, 0xce, 0xfa, 0xc7, 0x88, 0x46, 0xab, - 0x6e, 0x6f, 0xfd, 0xf0, 0x6d, 0x55, 0xf9, 0xee, 0xfd, 0xaa, 0xf2, 0xfd, 0xfb, 0x55, 0xe5, 0xef, - 0xef, 0x57, 0x95, 0xdf, 0x7d, 0x58, 0xcd, 0xfd, 0xe1, 0xc3, 0x6a, 0xee, 0xfb, 0x0f, 0xab, 0xb9, - 0x1f, 0x3e, 0xac, 0xe6, 0xa0, 0xed, 0x87, 0xa7, 0x9b, 0xd4, 0xe9, 0x8f, 0x36, 0xfb, 0x23, 0xfe, - 0x37, 0xdc, 0x49, 0x99, 0xff, 0x3c, 0xf9, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4e, 0x85, 0xbe, - 0xef, 0x24, 0x1c, 0x00, 0x00, + 0x11, 0x26, 0xf8, 0x66, 0xf3, 0x21, 0x7a, 0x2c, 0x4b, 0x34, 0x65, 0x4b, 0x36, 0xe2, 0x5d, 0xcb, + 0x52, 0x42, 0x3b, 0xf2, 0xc6, 0xb5, 0xb5, 0xa9, 0x8a, 0xcb, 0x7a, 0xac, 0xad, 0xc8, 0xb2, 0x15, + 0x50, 0x71, 0x0e, 0x39, 0xa0, 0x20, 0x60, 0x28, 0x21, 0x04, 0x01, 0x04, 0x33, 0xa4, 0xcc, 0xbf, + 0x90, 0x53, 0x72, 0xcb, 0x35, 0x39, 0x6d, 0xe5, 0x1f, 0xe4, 0x1f, 0xec, 0x21, 0x87, 0x3d, 0xee, + 0x29, 0x95, 0xb2, 0xaf, 0xa9, 0x5c, 0xf2, 0x07, 0x52, 0xf3, 0x00, 0x08, 0x40, 0xa4, 0x68, 0x29, + 0xc9, 0x89, 0x98, 0xee, 0x9e, 0x9e, 0x9e, 0x7e, 0xcd, 0x37, 0x43, 0x40, 0xf6, 0xc0, 0xf7, 0x02, + 0xaa, 0x13, 0x42, 0xfd, 0x93, 0x8e, 0x1f, 0x78, 0xd4, 0x43, 0xb5, 0x38, 0xad, 0x5d, 0x1b, 0x60, + 0x6a, 0x84, 0xbc, 0x76, 0x1d, 0x07, 0x81, 0x17, 0x4c, 0x86, 0xfd, 0x51, 0xe0, 0x9b, 0xd1, 0x10, + 0x4e, 0x26, 0x2c, 0x84, 0x5d, 0x33, 0x18, 0xfb, 0xd4, 0xf6, 0xdc, 0x88, 0xb6, 0x78, 0xea, 0x9d, + 0x7a, 0xfc, 0xf3, 0x31, 0xfb, 0x92, 0xd4, 0x85, 0x60, 0x48, 0x28, 0xff, 0x14, 0x04, 0xf5, 0x0f, + 0x0a, 0x2c, 0x77, 0x87, 0xc4, 0xc7, 0xae, 0xb5, 0xcf, 0x4d, 0xd1, 0x8e, 0x76, 0x34, 0xfc, 0xdb, + 0x21, 0x26, 0x14, 0x7d, 0x01, 0x4b, 0xe4, 0xcc, 0x1b, 0x3a, 0x96, 0x4e, 0x84, 0x84, 0x2e, 0xac, + 0x25, 0x2d, 0xe5, 0x9e, 0xb2, 0x5e, 0xd6, 0x16, 0x05, 0x37, 0x31, 0x9d, 0xa0, 0x75, 0x68, 0x5a, + 0xc3, 0xc0, 0x60, 0xc6, 0xe8, 0xb6, 0xab, 0x13, 0x6c, 0x92, 0x56, 0xf6, 0x9e, 0xb2, 0x9e, 0xd7, + 0x1a, 0x21, 0x7d, 0xdf, 0xed, 0x62, 0x93, 0xa0, 0x25, 0x28, 0x9a, 0x86, 0xe3, 0xe0, 0xa0, 0x95, + 0xbb, 0xa7, 0xac, 0x57, 0x34, 0x39, 0x52, 0x5f, 0x42, 0xeb, 0xa2, 0x49, 0xc4, 0xf7, 0x5c, 0x82, + 0xd1, 0x26, 0xdc, 0x30, 0x9c, 0x00, 0x1b, 0xd6, 0x38, 0x34, 0x0a, 0x5b, 0xd2, 0x9c, 0xa6, 0x64, + 0x74, 0x43, 0xba, 0xea, 0xc2, 0x8d, 0xee, 0xb9, 0x4d, 0xcd, 0xb3, 0x43, 0xcf, 0xc2, 0xe1, 0xae, + 0x7e, 0x08, 0xf9, 0x81, 0x67, 0x61, 0x3e, 0xa9, 0xb1, 0xd5, 0xea, 0x24, 0xa2, 0x12, 0x13, 0xe7, + 0x52, 0x68, 0x13, 0x8a, 0x81, 0xe1, 0x9e, 0x62, 0xb6, 0x87, 0xdc, 0x7a, 0x75, 0xeb, 0x66, 0x52, + 0x5e, 0x63, 0x3c, 0x4d, 0x8a, 0xa8, 0x8b, 0x80, 0xe2, 0xeb, 0x09, 0x93, 0xd5, 0x26, 0x34, 0x5e, + 0x62, 0x1a, 0x33, 0x41, 0x7d, 0x0e, 0x0b, 0x11, 0x45, 0xee, 0xeb, 0x4a, 0x56, 0xa9, 0x8f, 0xa1, + 0xc0, 0x57, 0x46, 0x8b, 0x50, 0x20, 0xd4, 0x08, 0x28, 0x9f, 0x57, 0xd3, 0xc4, 0x00, 0x35, 0x21, + 0x87, 0x5d, 0x8b, 0x7b, 0xbd, 0xa6, 0xb1, 0x4f, 0xf5, 0x4f, 0x39, 0x28, 0x75, 0xbb, 0xc7, 0x87, + 0x98, 0x1a, 0x08, 0x41, 0x7e, 0x38, 0xb4, 0x2d, 0x39, 0x85, 0x7f, 0xa3, 0x47, 0x50, 0xe0, 0x7b, + 0xe0, 0x73, 0x66, 0xec, 0x52, 0x48, 0xb0, 0x25, 0xcd, 0xc0, 0x7c, 0xba, 0xc5, 0x83, 0x56, 0xd7, + 0xc4, 0x80, 0xc5, 0xd2, 0xc1, 0xee, 0x29, 0x3d, 0x6b, 0xe5, 0x79, 0xac, 0xe5, 0x08, 0x2d, 0x43, + 0xc9, 0xec, 0xe9, 0xae, 0x31, 0xc0, 0xad, 0x82, 0x0c, 0x72, 0xef, 0x8d, 0x31, 0xc0, 0x68, 0x05, + 0x2a, 0x01, 0x3e, 0xe5, 0x49, 0x62, 0xb5, 0x8a, 0x7c, 0x4e, 0x59, 0x10, 0xf6, 0x2d, 0xf4, 0x0c, + 0x6a, 0x92, 0x89, 0x7d, 0xcf, 0x3c, 0x6b, 0x95, 0xa4, 0x55, 0xb2, 0x3e, 0x34, 0xce, 0xdb, 0x63, + 0x2c, 0xad, 0x1a, 0x4c, 0x06, 0x68, 0x03, 0x6e, 0xb0, 0x34, 0xed, 0xe3, 0xb1, 0x8e, 0xdf, 0x9b, + 0xce, 0x90, 0xd8, 0x23, 0xdc, 0x2a, 0xf3, 0xec, 0x58, 0xc0, 0xae, 0x75, 0x80, 0xc7, 0x7b, 0x21, + 0x99, 0x19, 0x40, 0x3d, 0x6a, 0x38, 0x7a, 0x7f, 0x44, 0x5a, 0x15, 0x61, 0x00, 0x27, 0x1c, 0x8c, + 0x08, 0x5a, 0x83, 0xaa, 0x60, 0x9e, 0x8c, 0x29, 0x26, 0x2d, 0xe0, 0x6c, 0xe0, 0xa4, 0x6d, 0x46, + 0x41, 0x5f, 0x40, 0xd5, 0xf0, 0x6d, 0x7d, 0x84, 0x03, 0x62, 0x7b, 0x6e, 0xab, 0xca, 0xc3, 0x76, + 0xb3, 0x13, 0xd6, 0xe8, 0x8b, 0xa3, 0xfd, 0x77, 0x82, 0xa5, 0x81, 0xe1, 0xdb, 0xf2, 0x9b, 0xad, + 0x69, 0xda, 0xfe, 0x19, 0x0e, 0x74, 0x7b, 0xd4, 0xaa, 0x71, 0xff, 0x97, 0x05, 0x61, 0x7f, 0xa4, + 0xfe, 0x53, 0x81, 0xaa, 0x86, 0xcf, 0x03, 0x9b, 0x62, 0x6d, 0xe8, 0x60, 0xf4, 0x00, 0x1a, 0x9e, + 0x23, 0x36, 0xe3, 0x07, 0xb8, 0x67, 0xbf, 0x97, 0x11, 0xab, 0x79, 0x0e, 0xdb, 0xc9, 0x11, 0xa7, + 0x31, 0x29, 0x17, 0x9f, 0xc7, 0xa5, 0x44, 0xd8, 0x6b, 0x2e, 0x3e, 0x9f, 0x48, 0xfd, 0x00, 0xea, + 0x4c, 0x8a, 0xda, 0x03, 0x4c, 0xa8, 0x31, 0xf0, 0x79, 0xf0, 0xf2, 0x5c, 0xe8, 0x38, 0xa4, 0xb1, + 0x7a, 0xb7, 0x4f, 0x5d, 0x2f, 0xc0, 0xba, 0xd1, 0xa3, 0x38, 0x88, 0x49, 0x8b, 0x98, 0x2e, 0x0a, + 0xee, 0x0b, 0xc6, 0x9c, 0xcc, 0x7a, 0x06, 0xcb, 0x72, 0xd6, 0x09, 0xee, 0xb1, 0x9f, 0xc9, 0xb4, + 0x02, 0x9f, 0x76, 0x4b, 0xb0, 0xb7, 0x39, 0x37, 0x9a, 0xa7, 0xfe, 0x1a, 0xea, 0xbf, 0xf4, 0x1d, + 0xcf, 0xb0, 0xc2, 0xc2, 0xdc, 0x84, 0x3c, 0x8b, 0x2f, 0xdf, 0x65, 0x75, 0xeb, 0x56, 0xaa, 0x04, + 0x44, 0xf2, 0xbe, 0xca, 0x68, 0x5c, 0x08, 0x2d, 0x42, 0xde, 0x32, 0xa8, 0x21, 0x36, 0xcb, 0xa8, + 0x6c, 0xb4, 0x5d, 0x82, 0x82, 0x79, 0x36, 0x74, 0xfb, 0xac, 0xe6, 0x42, 0xe5, 0xb2, 0x0a, 0x2d, + 0xa8, 0xef, 0xb3, 0x22, 0xa5, 0xe1, 0x72, 0x1b, 0x50, 0x32, 0x3d, 0x97, 0xe2, 0xf7, 0x54, 0xae, + 0xd8, 0x8c, 0xa2, 0xb7, 0x23, 0xe8, 0x5a, 0x28, 0x80, 0x1e, 0x42, 0x8e, 0x10, 0x2a, 0x8b, 0x63, + 0xba, 0x65, 0x1a, 0x93, 0x50, 0xfb, 0x80, 0x0e, 0x87, 0x0e, 0xb5, 0xaf, 0xbf, 0xd4, 0x23, 0xc8, + 0x13, 0x42, 0xc3, 0x76, 0x33, 0x63, 0x2d, 0x2e, 0xa2, 0x3e, 0x83, 0x46, 0xb8, 0x8e, 0xec, 0x22, + 0x0f, 0xa0, 0xc0, 0x0f, 0x0d, 0xb9, 0x4c, 0xa3, 0x13, 0x1e, 0x21, 0x7b, 0xec, 0x57, 0x13, 0x4c, + 0xf5, 0x77, 0x0a, 0x34, 0x76, 0xbc, 0x81, 0x6f, 0x98, 0x91, 0x85, 0x51, 0xfd, 0x2b, 0x73, 0xeb, + 0xff, 0x3e, 0xd4, 0xbc, 0x21, 0xf5, 0x87, 0x54, 0x77, 0xf0, 0x08, 0x3b, 0xdc, 0x29, 0x05, 0xad, + 0x2a, 0x68, 0xaf, 0x19, 0x29, 0xbe, 0xdf, 0xdc, 0x9c, 0xfd, 0xaa, 0x37, 0x60, 0x21, 0xb2, 0x45, + 0x86, 0xea, 0x6f, 0x05, 0x58, 0xd8, 0xf5, 0xce, 0xdd, 0x78, 0x72, 0xfc, 0x54, 0xba, 0x45, 0xe1, + 0x6e, 0x79, 0x98, 0xb4, 0x2f, 0x25, 0xdc, 0xe9, 0x12, 0x4a, 0xf6, 0x5c, 0x1a, 0x8c, 0x85, 0xa3, + 0x58, 0x35, 0x07, 0x98, 0x78, 0xce, 0x08, 0x5b, 0x3a, 0x25, 0x32, 0xf7, 0x21, 0x24, 0x1d, 0x13, + 0xf4, 0xa3, 0xf9, 0xf1, 0xdd, 0xce, 0x7f, 0xfb, 0xf7, 0xb5, 0x0c, 0x8f, 0x32, 0xeb, 0xa0, 0xbc, + 0xa3, 0x55, 0x78, 0x47, 0xe3, 0xdf, 0x68, 0x9b, 0xb5, 0x2c, 0x5e, 0xbc, 0x7a, 0x30, 0x74, 0x70, + 0xab, 0xce, 0x75, 0xdd, 0x4e, 0x39, 0x72, 0x52, 0xde, 0x52, 0x5f, 0x35, 0x88, 0x55, 0xfc, 0x01, + 0x2c, 0x12, 0x2f, 0xa0, 0xd8, 0xd2, 0xe3, 0xaa, 0x48, 0x6b, 0x91, 0x6f, 0x7a, 0xb6, 0x2e, 0x0d, + 0x89, 0x69, 0x31, 0x12, 0x41, 0xcf, 0x61, 0x81, 0x50, 0x2f, 0x30, 0x4e, 0xb1, 0x7e, 0x62, 0x98, + 0x7d, 0x76, 0x20, 0x34, 0xb8, 0x4d, 0x4b, 0x1d, 0x36, 0x1e, 0xfa, 0x9d, 0xae, 0x60, 0x6f, 0x0b, + 0xae, 0xd6, 0x20, 0x89, 0x31, 0x3b, 0xc8, 0x43, 0x05, 0xa6, 0x61, 0x9e, 0x61, 0xd6, 0xa8, 0x6f, + 0xf0, 0x1d, 0x87, 0x92, 0x3b, 0x8c, 0xbc, 0x6f, 0xa1, 0x36, 0x54, 0x6c, 0xa2, 0x07, 0xc6, 0xb9, + 0xde, 0x1f, 0xb5, 0x16, 0x78, 0xbb, 0x2d, 0xd9, 0x44, 0x33, 0xce, 0x0f, 0x46, 0xe8, 0x29, 0x54, + 0xc3, 0x96, 0xe7, 0xf6, 0xbc, 0x56, 0x93, 0x9b, 0x80, 0x42, 0x13, 0x76, 0x44, 0xf3, 0x73, 0x7b, + 0x9e, 0x06, 0x66, 0xf4, 0x8d, 0x76, 0x99, 0x33, 0x79, 0x2c, 0x75, 0x3a, 0xf6, 0x71, 0x0b, 0xf1, + 0xf6, 0x7a, 0xff, 0xd2, 0xa8, 0x1f, 0x8f, 0x7d, 0xcc, 0xdc, 0x19, 0x0d, 0xe2, 0x69, 0x78, 0x73, + 0x4e, 0x1a, 0xb6, 0xdf, 0x40, 0x25, 0xca, 0x1a, 0x76, 0x7e, 0xf6, 0xf1, 0x98, 0xd7, 0x42, 0x45, + 0x63, 0x9f, 0x68, 0x13, 0x0a, 0x23, 0xc3, 0x19, 0xe2, 0xcb, 0x5b, 0x80, 0x90, 0xf9, 0x2a, 0xfb, + 0xa5, 0xf2, 0xf3, 0x7c, 0xb9, 0xdc, 0xac, 0x68, 0xb9, 0x61, 0xe0, 0xa8, 0x1a, 0x14, 0x78, 0xf9, + 0xa1, 0x16, 0x94, 0x06, 0x98, 0x10, 0x43, 0x96, 0x59, 0x45, 0x0b, 0x87, 0xe8, 0x31, 0x54, 0x99, + 0x4b, 0xb1, 0x2e, 0xaa, 0x37, 0x3b, 0xb5, 0x7a, 0x81, 0x8b, 0xf0, 0x6f, 0xf5, 0x83, 0x02, 0xcd, + 0xc9, 0xfe, 0x65, 0xf5, 0x3f, 0x9e, 0x5f, 0xc4, 0x32, 0xeb, 0x64, 0x29, 0xdf, 0x86, 0xb2, 0x4d, + 0x74, 0x3c, 0xf0, 0xe9, 0x98, 0xaf, 0xc9, 0xc3, 0xb6, 0xc7, 0x86, 0xac, 0x21, 0x08, 0x5b, 0x72, + 0xd3, 0x74, 0xc5, 0xdb, 0xc9, 0x04, 0x10, 0xe4, 0xa7, 0x03, 0x82, 0x42, 0x02, 0x10, 0x84, 0xfd, + 0xad, 0x38, 0xbf, 0xbf, 0x3d, 0x87, 0x3b, 0x5d, 0x4c, 0xc3, 0x6d, 0x76, 0x7d, 0x8c, 0xad, 0xd7, + 0xf6, 0xc0, 0x8e, 0x9a, 0xd6, 0x1a, 0x54, 0x09, 0x23, 0xea, 0x0e, 0xa3, 0xf2, 0x5d, 0xe7, 0x35, + 0x20, 0x91, 0x9c, 0xba, 0x06, 0x77, 0x67, 0x28, 0x90, 0x9d, 0xc6, 0x87, 0xfc, 0x91, 0x61, 0x07, + 0xf1, 0x80, 0xd7, 0x44, 0xc0, 0x17, 0xe3, 0x01, 0xaf, 0xc9, 0xc8, 0xa2, 0xcf, 0x20, 0xeb, 0x89, + 0xb3, 0xb3, 0x91, 0x36, 0x9d, 0xe9, 0xe9, 0xbc, 0x3d, 0xd2, 0xb2, 0x9e, 0xaf, 0xde, 0x86, 0xec, + 0xdb, 0x23, 0x54, 0x82, 0xdc, 0xd1, 0x90, 0x36, 0x33, 0x08, 0xa0, 0xb8, 0x8b, 0x1d, 0x4c, 0x71, + 0x53, 0x51, 0xbb, 0x00, 0xbf, 0x62, 0x35, 0xba, 0x6d, 0x50, 0xf3, 0x8c, 0xe3, 0x01, 0x6f, 0x30, + 0xb0, 0xa9, 0x2e, 0x41, 0x75, 0x5e, 0x2b, 0x0b, 0xc2, 0x31, 0x03, 0xd2, 0x05, 0xdf, 0xb0, 0x83, + 0xf0, 0x28, 0x40, 0x17, 0xd7, 0xd3, 0x84, 0x80, 0xfa, 0x67, 0x05, 0x6a, 0x5c, 0xeb, 0xb5, 0x8e, + 0xd2, 0x27, 0x50, 0x38, 0x61, 0xd6, 0xc8, 0xb4, 0x4b, 0x61, 0xcf, 0x89, 0xb5, 0xaf, 0x32, 0x9a, + 0x10, 0xbc, 0x4a, 0x7f, 0x9f, 0x1c, 0xc9, 0xa7, 0x50, 0x97, 0x36, 0xca, 0x74, 0x7d, 0x94, 0x3c, + 0xac, 0x2e, 0x4b, 0xb1, 0x4d, 0x28, 0x30, 0x53, 0xe7, 0x9c, 0x8a, 0x42, 0x86, 0x01, 0x0b, 0xcd, + 0x38, 0x8f, 0x79, 0xb9, 0x09, 0x39, 0x4a, 0x1d, 0xe9, 0x5f, 0xf6, 0xf9, 0xe9, 0xae, 0x45, 0x0d, + 0xc8, 0x46, 0x27, 0x46, 0x96, 0x12, 0xf5, 0x1b, 0x05, 0x16, 0x42, 0xed, 0xd7, 0xf2, 0xf6, 0xd3, + 0xa4, 0xb7, 0x57, 0xd2, 0x45, 0x7a, 0xfe, 0x3f, 0x73, 0xf8, 0x6f, 0xa0, 0x39, 0xb1, 0xf4, 0xff, + 0xec, 0xf3, 0xbf, 0x2a, 0xb0, 0xb4, 0x3b, 0xf4, 0x1d, 0xdb, 0x34, 0x28, 0xde, 0xc5, 0x14, 0x9b, + 0xd7, 0x02, 0x3f, 0x2b, 0x50, 0xe1, 0x37, 0x18, 0x06, 0x67, 0x65, 0xe5, 0x95, 0x39, 0xe1, 0x00, + 0x8f, 0xd9, 0x55, 0x42, 0x82, 0x7b, 0xee, 0x84, 0x9a, 0x56, 0x14, 0x90, 0x9e, 0xb5, 0x31, 0x06, + 0x7f, 0x3d, 0xd7, 0x19, 0xf3, 0x1e, 0x54, 0xd6, 0x4a, 0x7d, 0x3c, 0x7e, 0xeb, 0x3a, 0x63, 0xa4, + 0x42, 0x7d, 0x60, 0xbb, 0xfa, 0xa4, 0xc8, 0x44, 0x33, 0xaa, 0x0e, 0x6c, 0x77, 0x47, 0xd6, 0x99, + 0x7a, 0x08, 0xc5, 0x83, 0xd1, 0x95, 0xda, 0x40, 0xa2, 0x6c, 0x73, 0xc9, 0xb2, 0x55, 0xff, 0xa2, + 0xc0, 0xf2, 0x05, 0x57, 0x48, 0xf7, 0xff, 0x78, 0x72, 0xaf, 0xb9, 0x04, 0xa6, 0x85, 0x57, 0x1a, + 0x1e, 0x86, 0x27, 0x50, 0xe1, 0xd7, 0x99, 0xd8, 0xc1, 0x30, 0x35, 0x6a, 0xcc, 0x05, 0x62, 0xc6, + 0x46, 0x98, 0xdc, 0x39, 0x1e, 0xb8, 0xc5, 0xa4, 0xb4, 0xd8, 0x6a, 0xd8, 0x39, 0xfe, 0x9d, 0x83, + 0xe2, 0xc1, 0xbb, 0xf0, 0x5a, 0xc8, 0x41, 0x8d, 0x12, 0x03, 0x35, 0xf7, 0xa1, 0xc6, 0x4f, 0x0a, + 0xdd, 0xeb, 0xf5, 0x08, 0xa6, 0xfc, 0x9a, 0x93, 0xd7, 0xaa, 0x9c, 0xf6, 0x96, 0x93, 0x62, 0x7d, + 0x3e, 0x9b, 0xe8, 0xf3, 0xd1, 0x54, 0xc9, 0xad, 0xc5, 0xa6, 0xbe, 0x16, 0x22, 0x0d, 0xc8, 0x9a, + 0x3d, 0x79, 0xf7, 0xcf, 0x9a, 0x3d, 0xe6, 0x56, 0x9b, 0xe8, 0x16, 0x6f, 0x95, 0x32, 0x90, 0x65, + 0x9b, 0x88, 0xd6, 0xc9, 0x82, 0x2c, 0x52, 0x83, 0x86, 0xd7, 0xb1, 0x12, 0x1f, 0x1f, 0x13, 0x74, + 0x17, 0x18, 0x96, 0xe3, 0xe7, 0x67, 0x14, 0xe1, 0x8a, 0xa4, 0x1c, 0x93, 0x64, 0x52, 0x15, 0x67, + 0x27, 0x55, 0x29, 0x91, 0x54, 0x4b, 0x50, 0x24, 0x67, 0xc6, 0xd6, 0x4f, 0x9e, 0xf1, 0xfb, 0x63, + 0x4d, 0x93, 0x23, 0x76, 0xc5, 0x14, 0xda, 0x88, 0x6b, 0xf8, 0xe4, 0xcc, 0xe3, 0x06, 0x89, 0xeb, + 0xe3, 0x02, 0x67, 0x74, 0x25, 0xfd, 0x98, 0xa0, 0x6d, 0x68, 0x9a, 0xde, 0xc0, 0x0f, 0x30, 0x61, + 0xb7, 0x3f, 0x01, 0x65, 0xea, 0xfc, 0xf0, 0x58, 0x8e, 0x00, 0xd0, 0x84, 0xcf, 0x01, 0xcc, 0x82, + 0x99, 0x24, 0x20, 0x0d, 0x16, 0x7b, 0xb6, 0x83, 0xf5, 0xc9, 0x13, 0x8f, 0x00, 0x52, 0x02, 0xcb, + 0xdd, 0xeb, 0x24, 0x9e, 0x7e, 0xbe, 0xb6, 0x1d, 0xbc, 0x17, 0x11, 0x38, 0xac, 0x42, 0xbd, 0x0b, + 0x34, 0xf5, 0x5f, 0x39, 0xa8, 0xbd, 0xf0, 0x7d, 0x67, 0x1c, 0xd6, 0xe8, 0x7a, 0xa2, 0x83, 0xa5, + 0x33, 0xe6, 0x9d, 0x38, 0x93, 0x79, 0xfb, 0xda, 0x08, 0xbb, 0x42, 0x6d, 0x6a, 0x72, 0xbd, 0x8b, + 0x35, 0x85, 0x0b, 0x90, 0x38, 0x7b, 0x0d, 0x48, 0xfc, 0x33, 0xa8, 0x27, 0xb1, 0x70, 0x7d, 0x1e, + 0x16, 0xae, 0x05, 0x71, 0x14, 0x3c, 0x0d, 0xc4, 0x16, 0xa6, 0x82, 0xd8, 0x29, 0x78, 0x39, 0x77, + 0x25, 0xbc, 0x1c, 0x6b, 0x74, 0xf9, 0x79, 0x8d, 0x2e, 0x85, 0x8a, 0xab, 0x9f, 0x84, 0x8a, 0xbf, + 0x84, 0xea, 0xc0, 0x20, 0xec, 0x66, 0xde, 0xc7, 0x63, 0xd2, 0x6a, 0x70, 0x4f, 0x2c, 0x27, 0x33, + 0xe0, 0x90, 0x0b, 0x1c, 0xe0, 0xb1, 0x06, 0x83, 0xf0, 0x93, 0xa8, 0x7d, 0xa8, 0xcb, 0x78, 0x5f, + 0x17, 0x2a, 0x46, 0x07, 0x47, 0x76, 0xde, 0xc1, 0xa1, 0x7e, 0x0e, 0xb5, 0x1d, 0x07, 0x1b, 0x41, + 0x98, 0x5c, 0x4b, 0x50, 0x8c, 0xbd, 0x5f, 0x54, 0x34, 0x39, 0x52, 0xbf, 0x82, 0xba, 0x94, 0xbb, + 0xf2, 0xe1, 0xa4, 0xf6, 0xa0, 0xf5, 0xc2, 0xb2, 0x8e, 0x8c, 0x80, 0xda, 0x6c, 0xe3, 0xe2, 0x82, + 0x7a, 0xf5, 0xbb, 0xec, 0x1a, 0x54, 0x29, 0x75, 0x74, 0x82, 0x4d, 0xcf, 0xb5, 0xc2, 0x67, 0x4a, + 0xa0, 0xd4, 0xe9, 0x0a, 0x8a, 0xba, 0x02, 0xb7, 0xa7, 0xac, 0x23, 0xd1, 0xe3, 0x2b, 0x58, 0xd1, + 0xf0, 0xc0, 0x1b, 0xe1, 0xff, 0xd6, 0x0e, 0x75, 0x15, 0xee, 0x4c, 0xd7, 0x24, 0x56, 0xda, 0x78, + 0x00, 0x30, 0x79, 0x03, 0x64, 0x78, 0xf2, 0x8d, 0x17, 0x0c, 0x0c, 0x47, 0x60, 0x4b, 0xf1, 0x48, + 0xda, 0x54, 0x36, 0x1e, 0xc3, 0xcd, 0x29, 0x77, 0x22, 0x26, 0xf2, 0x1a, 0x9f, 0x1a, 0xe6, 0xb8, + 0x99, 0x41, 0x35, 0x28, 0xb3, 0x84, 0xf0, 0x0d, 0x13, 0x37, 0x95, 0xad, 0x0f, 0x00, 0x15, 0x31, + 0xbb, 0xdb, 0x3d, 0x46, 0xbf, 0x48, 0x2c, 0xb2, 0x36, 0xf3, 0x09, 0x52, 0xa8, 0x6e, 0xdf, 0x9b, + 0x2d, 0x20, 0xfd, 0x93, 0x41, 0xaf, 0xa0, 0x24, 0x1f, 0x3a, 0xd1, 0x9d, 0xa4, 0x78, 0xf2, 0x45, + 0xb4, 0x7d, 0x77, 0x06, 0x37, 0xd2, 0xf4, 0x12, 0x8a, 0xe2, 0x41, 0x07, 0xa5, 0x10, 0x53, 0xe2, + 0x0d, 0xa9, 0x7d, 0x67, 0x3a, 0x33, 0x54, 0xb3, 0xae, 0xa0, 0x3d, 0x28, 0x8a, 0x47, 0x93, 0xb4, + 0xa2, 0xc4, 0x93, 0x4d, 0x5a, 0x51, 0xf2, 0x9d, 0x45, 0xec, 0x4c, 0x3e, 0x5b, 0xa4, 0x77, 0x96, + 0x7c, 0x59, 0x49, 0xef, 0x2c, 0xfd, 0xd6, 0x91, 0x41, 0x01, 0xdc, 0x9a, 0x7a, 0x49, 0x41, 0x1b, + 0x29, 0x07, 0x5f, 0x72, 0x15, 0x6a, 0x6f, 0x7e, 0x92, 0x6c, 0xb4, 0xe6, 0x01, 0x94, 0x43, 0x3e, + 0xba, 0x7b, 0xe9, 0xad, 0xba, 0xbd, 0x3a, 0x8b, 0x1d, 0x29, 0xdb, 0x85, 0x02, 0x07, 0x99, 0xa8, + 0x3d, 0xe5, 0xe6, 0x10, 0xaa, 0x59, 0x99, 0xca, 0x8b, 0xc5, 0xe5, 0x10, 0xca, 0x21, 0x5a, 0x4d, + 0x9b, 0x94, 0xc2, 0xdb, 0x69, 0x93, 0xd2, 0x20, 0x97, 0xab, 0x7b, 0x0b, 0xd5, 0xd8, 0x43, 0x1c, + 0x4a, 0x25, 0xeb, 0xc5, 0x37, 0xba, 0xb9, 0x01, 0x3f, 0x81, 0x85, 0x14, 0xaa, 0x43, 0x0f, 0x52, + 0xae, 0x99, 0x8a, 0x7f, 0xdb, 0x9f, 0xcd, 0x91, 0x0a, 0x57, 0x78, 0xa2, 0xa0, 0x6d, 0x28, 0xf0, + 0x36, 0x9d, 0xf6, 0x64, 0xfc, 0xac, 0x4e, 0x7b, 0x32, 0xd1, 0xd7, 0x79, 0xa1, 0x00, 0xef, 0xaa, + 0x0c, 0x0a, 0x90, 0xb4, 0xa2, 0x78, 0x5f, 0x4e, 0x2b, 0x4a, 0xf4, 0x62, 0x35, 0x83, 0x4c, 0x68, + 0xa6, 0xff, 0x85, 0x41, 0xa9, 0xbd, 0xcc, 0xf8, 0xe3, 0xa8, 0xfd, 0xf9, 0x3c, 0xb1, 0x68, 0x91, + 0x3e, 0x2c, 0xbd, 0xb0, 0xac, 0xaf, 0xbd, 0xc0, 0x4c, 0xb5, 0x3e, 0x94, 0xd2, 0x31, 0xab, 0xdb, + 0xb7, 0x1f, 0xce, 0x95, 0x8b, 0x16, 0xa3, 0x70, 0x5b, 0x74, 0xd9, 0x69, 0xeb, 0x3d, 0x4a, 0x23, + 0x8a, 0x99, 0x8d, 0xbd, 0xbd, 0xf1, 0x29, 0xa2, 0xe1, 0xaa, 0xdb, 0x5b, 0xdf, 0x7f, 0x53, 0x56, + 0xbe, 0xfd, 0xb0, 0xaa, 0x7c, 0xf7, 0x61, 0x55, 0xf9, 0xc7, 0x87, 0x55, 0xe5, 0xf7, 0x1f, 0x57, + 0x33, 0x7f, 0xfc, 0xb8, 0x9a, 0xf9, 0xee, 0xe3, 0x6a, 0xe6, 0xfb, 0x8f, 0xab, 0x19, 0x68, 0x7a, + 0xc1, 0x69, 0x87, 0xda, 0xfd, 0x51, 0xa7, 0x3f, 0xe2, 0xff, 0xca, 0x9d, 0x14, 0xf9, 0xcf, 0xd3, + 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x3a, 0x4c, 0x70, 0xa6, 0x33, 0x1c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -5653,8 +5653,8 @@ func (m *AddPartitionRangeRequest) MarshalToSizedBuffer(dAtA []byte) (int, error _ = i var l int _ = l - if m.Ttl != 0 { - i = encodeVarintImportSstpb(dAtA, i, uint64(m.Ttl)) + if m.TtlSeconds != 0 { + i = encodeVarintImportSstpb(dAtA, i, uint64(m.TtlSeconds)) i-- dAtA[i] = 0x10 } @@ -6593,8 +6593,8 @@ func (m *AddPartitionRangeRequest) Size() (n int) { l = m.Range.Size() n += 1 + l + sovImportSstpb(uint64(l)) } - if m.Ttl != 0 { - n += 1 + sovImportSstpb(uint64(m.Ttl)) + if m.TtlSeconds != 0 { + n += 1 + sovImportSstpb(uint64(m.TtlSeconds)) } return n } @@ -11912,9 +11912,9 @@ func (m *AddPartitionRangeRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Ttl", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TtlSeconds", wireType) } - m.Ttl = 0 + m.TtlSeconds = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowImportSstpb @@ -11924,7 +11924,7 @@ func (m *AddPartitionRangeRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Ttl |= uint64(b&0x7F) << shift + m.TtlSeconds |= uint64(b&0x7F) << shift if b < 0x80 { break } diff --git a/proto/coprocessor.proto b/proto/coprocessor.proto index 7973f186e..3a6d5c5e1 100644 --- a/proto/coprocessor.proto +++ b/proto/coprocessor.proto @@ -47,6 +47,8 @@ message Request { string connection_alias = 13; // This is the session alias between a client and tidb repeated TableShardInfos table_shard_infos= 14; // Shard infos for FTS index, used by TiFlash reading TiCI. + // versions of each reange, used in TiCI lookup, if range_versions is set, then len(range_versions) should equal to len(ranges), and all the range in ranges should be point range + repeated uint64 range_versions = 15; } message Response { @@ -131,6 +133,8 @@ message StoreBatchTask { metapb.Peer peer = 3; repeated KeyRange ranges = 4; uint64 task_id = 5; + // versions of each reange, used in TiCI lookup, if range_versions is set, then len(range_versions) should equal to len(ranges), and all the range in ranges should be point range + repeated uint64 range_versions = 6; } message StoreBatchTaskResponse { diff --git a/scripts/proto.lock b/scripts/proto.lock index c34710d78..03c2e3b9b 100644 --- a/scripts/proto.lock +++ b/scripts/proto.lock @@ -3404,6 +3404,12 @@ "name": "table_shard_infos", "type": "TableShardInfos", "is_repeated": true + }, + { + "id": 15, + "name": "range_versions", + "type": "uint64", + "is_repeated": true } ] }, @@ -3693,6 +3699,12 @@ "id": 5, "name": "task_id", "type": "uint64" + }, + { + "id": 6, + "name": "range_versions", + "type": "uint64", + "is_repeated": true } ] }, From 113cbfc0147f1ef26e2bca3b5e81eee1b96c5692 Mon Sep 17 00:00:00 2001 From: wshwsh12 <793703860@qq.com> Date: Sat, 11 Oct 2025 15:23:33 +0800 Subject: [PATCH 2/2] update comments Signed-off-by: wshwsh12 <793703860@qq.com> --- pkg/coprocessor/coprocessor.pb.go | 4 ++-- proto/coprocessor.proto | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/coprocessor/coprocessor.pb.go b/pkg/coprocessor/coprocessor.pb.go index 4bcfea310..cd663b474 100644 --- a/pkg/coprocessor/coprocessor.pb.go +++ b/pkg/coprocessor/coprocessor.pb.go @@ -101,7 +101,7 @@ type Request struct { ConnectionId uint64 `protobuf:"varint,12,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"` ConnectionAlias string `protobuf:"bytes,13,opt,name=connection_alias,json=connectionAlias,proto3" json:"connection_alias,omitempty"` TableShardInfos []*TableShardInfos `protobuf:"bytes,14,rep,name=table_shard_infos,json=tableShardInfos,proto3" json:"table_shard_infos,omitempty"` - // versions of each reange, used in TiCI lookup, if range_versions is set, then len(range_versions) should equal to len(ranges), and all the range in ranges should be point range + // versions of each range, used in TiCI lookup, if range_versions is set, then len(range_versions) should equal to len(ranges), and all the range in ranges should be point range RangeVersions []uint64 `protobuf:"varint,15,rep,packed,name=range_versions,json=rangeVersions,proto3" json:"range_versions,omitempty"` } @@ -802,7 +802,7 @@ type StoreBatchTask struct { Peer *metapb.Peer `protobuf:"bytes,3,opt,name=peer,proto3" json:"peer,omitempty"` Ranges []*KeyRange `protobuf:"bytes,4,rep,name=ranges,proto3" json:"ranges,omitempty"` TaskId uint64 `protobuf:"varint,5,opt,name=task_id,json=taskId,proto3" json:"task_id,omitempty"` - // versions of each reange, used in TiCI lookup, if range_versions is set, then len(range_versions) should equal to len(ranges), and all the range in ranges should be point range + // versions of each range, used in TiCI lookup, if range_versions is set, then len(range_versions) should equal to len(ranges), and all the range in ranges should be point range RangeVersions []uint64 `protobuf:"varint,6,rep,packed,name=range_versions,json=rangeVersions,proto3" json:"range_versions,omitempty"` } diff --git a/proto/coprocessor.proto b/proto/coprocessor.proto index 3a6d5c5e1..5137bc0f8 100644 --- a/proto/coprocessor.proto +++ b/proto/coprocessor.proto @@ -47,7 +47,7 @@ message Request { string connection_alias = 13; // This is the session alias between a client and tidb repeated TableShardInfos table_shard_infos= 14; // Shard infos for FTS index, used by TiFlash reading TiCI. - // versions of each reange, used in TiCI lookup, if range_versions is set, then len(range_versions) should equal to len(ranges), and all the range in ranges should be point range + // versions of each range, used in TiCI lookup, if range_versions is set, then len(range_versions) should equal to len(ranges), and all the range in ranges should be point range repeated uint64 range_versions = 15; } @@ -133,7 +133,7 @@ message StoreBatchTask { metapb.Peer peer = 3; repeated KeyRange ranges = 4; uint64 task_id = 5; - // versions of each reange, used in TiCI lookup, if range_versions is set, then len(range_versions) should equal to len(ranges), and all the range in ranges should be point range + // versions of each range, used in TiCI lookup, if range_versions is set, then len(range_versions) should equal to len(ranges), and all the range in ranges should be point range repeated uint64 range_versions = 6; }