From 3b77f2c65c635567751d27afd6c58c7958645785 Mon Sep 17 00:00:00 2001 From: 3pointer Date: Wed, 8 Jan 2025 12:17:15 +0800 Subject: [PATCH] restore: support skip some keys due before/after certain timestamp (#1283) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * restore: support skip some keys due after certain timestamp * add ignore before timestamp --------- Co-authored-by: 山岚 <36239017+YuJuncen@users.noreply.github.com> --- pkg/import_sstpb/import_sstpb.pb.go | 364 +++++++++++++++++----------- proto/import_sstpb.proto | 5 + scripts/proto.lock | 10 + 3 files changed, 235 insertions(+), 144 deletions(-) diff --git a/pkg/import_sstpb/import_sstpb.pb.go b/pkg/import_sstpb/import_sstpb.pb.go index 8d27cb7dd..791ab67f5 100644 --- a/pkg/import_sstpb/import_sstpb.pb.go +++ b/pkg/import_sstpb/import_sstpb.pb.go @@ -581,7 +581,12 @@ func (m *SSTMeta) GetCipherIv() []byte { type RewriteRule struct { OldKeyPrefix []byte `protobuf:"bytes,1,opt,name=old_key_prefix,json=oldKeyPrefix,proto3" json:"old_key_prefix,omitempty"` NewKeyPrefix []byte `protobuf:"bytes,2,opt,name=new_key_prefix,json=newKeyPrefix,proto3" json:"new_key_prefix,omitempty"` + // (Optional) Rewrite all keys in the range to use this timestamp. NewTimestamp uint64 `protobuf:"varint,3,opt,name=new_timestamp,json=newTimestamp,proto3" json:"new_timestamp,omitempty"` + // (Optional) Skip keys with timestamps greater than this during download, useful for compacted SST backups. + IgnoreAfterTimestamp uint64 `protobuf:"varint,4,opt,name=ignore_after_timestamp,json=ignoreAfterTimestamp,proto3" json:"ignore_after_timestamp,omitempty"` + // (Optional) Skip write CF keys with timestamps less than this during download. Default CF keys are preserved. + IgnoreBeforeTimestamp uint64 `protobuf:"varint,5,opt,name=ignore_before_timestamp,json=ignoreBeforeTimestamp,proto3" json:"ignore_before_timestamp,omitempty"` } func (m *RewriteRule) Reset() { *m = RewriteRule{} } @@ -638,6 +643,20 @@ func (m *RewriteRule) GetNewTimestamp() uint64 { return 0 } +func (m *RewriteRule) GetIgnoreAfterTimestamp() uint64 { + if m != nil { + return m.IgnoreAfterTimestamp + } + return 0 +} + +func (m *RewriteRule) GetIgnoreBeforeTimestamp() uint64 { + if m != nil { + return m.IgnoreBeforeTimestamp + } + return 0 +} + type UploadRequest struct { // Types that are valid to be assigned to Chunk: // *UploadRequest_Meta @@ -2546,151 +2565,154 @@ func init() { func init() { proto.RegisterFile("import_sstpb.proto", fileDescriptor_4d076b7935cfab6b) } var fileDescriptor_4d076b7935cfab6b = []byte{ - // 2301 bytes of a gzipped FileDescriptorProto + // 2345 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x59, 0xcd, 0x72, 0xdb, 0xc8, - 0xf1, 0x27, 0xf8, 0xcd, 0xe6, 0x87, 0xe8, 0xb1, 0x56, 0xa6, 0x69, 0x5b, 0xb6, 0xf1, 0xf7, 0xee, - 0xca, 0xd2, 0x3f, 0xb4, 0x23, 0x6f, 0x5c, 0x5b, 0x9b, 0xaa, 0xb8, 0x56, 0x1f, 0xb1, 0x15, 0x59, - 0xb6, 0x02, 0x2a, 0xce, 0x21, 0x07, 0x14, 0x04, 0x0e, 0x25, 0x84, 0x20, 0x80, 0x60, 0x86, 0x94, - 0x79, 0xc9, 0x03, 0xe4, 0x94, 0xdc, 0x72, 0x4d, 0x4e, 0x5b, 0x79, 0x83, 0xbc, 0xc1, 0x1e, 0x72, - 0xd8, 0xe3, 0x9e, 0x52, 0x29, 0xfb, 0x9e, 0x4b, 0x1e, 0x20, 0xa9, 0xe9, 0x19, 0x90, 0x00, 0x44, - 0x89, 0xb6, 0x2a, 0x39, 0x71, 0xa6, 0xa7, 0xd1, 0xd3, 0xd3, 0x9f, 0xbf, 0x19, 0x02, 0x71, 0x86, - 0x81, 0x1f, 0x72, 0x93, 0x31, 0x1e, 0x1c, 0x77, 0x82, 0xd0, 0xe7, 0x3e, 0xa9, 0xc5, 0x69, 0xed, - 0xda, 0x90, 0x72, 0x2b, 0x5a, 0x6b, 0xd7, 0x69, 0x18, 0xfa, 0xe1, 0x6c, 0x3a, 0x18, 0x87, 0x81, - 0x3d, 0x9d, 0xc2, 0xf1, 0x6c, 0x89, 0x50, 0xcf, 0x0e, 0x27, 0x01, 0x77, 0x7c, 0x6f, 0x4a, 0x5b, - 0x3e, 0xf1, 0x4f, 0x7c, 0x1c, 0x3e, 0x12, 0x23, 0x45, 0x5d, 0x0a, 0x47, 0x8c, 0xe3, 0x50, 0x12, - 0xf4, 0x3f, 0x68, 0x70, 0xa3, 0x3b, 0x62, 0x01, 0xf5, 0x7a, 0x7b, 0xa8, 0x8a, 0x71, 0xb8, 0x6d, - 0xd0, 0xdf, 0x8c, 0x28, 0xe3, 0xe4, 0x0b, 0x58, 0x61, 0xa7, 0xfe, 0xc8, 0xed, 0x99, 0x4c, 0x72, - 0x98, 0x52, 0x5b, 0xd6, 0xd2, 0xee, 0x69, 0x6b, 0x65, 0x63, 0x59, 0xae, 0x26, 0x3e, 0x67, 0x64, - 0x0d, 0x9a, 0xbd, 0x51, 0x68, 0x09, 0x65, 0x4c, 0xc7, 0x33, 0x19, 0xb5, 0x59, 0x2b, 0x7b, 0x4f, - 0x5b, 0xcb, 0x1b, 0x8d, 0x88, 0xbe, 0xe7, 0x75, 0xa9, 0xcd, 0xc8, 0x0a, 0x14, 0x6d, 0xcb, 0x75, - 0x69, 0xd8, 0xca, 0xdd, 0xd3, 0xd6, 0x2a, 0x86, 0x9a, 0xe9, 0xcf, 0xa1, 0x75, 0x5e, 0x25, 0x16, - 0xf8, 0x1e, 0xa3, 0x64, 0x03, 0xae, 0x59, 0x6e, 0x48, 0xad, 0xde, 0x24, 0x52, 0x8a, 0xf6, 0x94, - 0x3a, 0x4d, 0xb5, 0xd0, 0x8d, 0xe8, 0xba, 0x07, 0xd7, 0xba, 0x67, 0x0e, 0xb7, 0x4f, 0x0f, 0xfc, - 0x1e, 0x8d, 0x4e, 0xf5, 0xff, 0x90, 0x1f, 0xfa, 0x3d, 0x8a, 0x1f, 0x35, 0x36, 0x5b, 0x9d, 0x84, - 0x57, 0x62, 0xec, 0xc8, 0x45, 0x36, 0xa0, 0x18, 0x5a, 0xde, 0x09, 0x15, 0x67, 0xc8, 0xad, 0x55, - 0x37, 0xaf, 0x27, 0xf9, 0x0d, 0xb1, 0x66, 0x28, 0x16, 0x7d, 0x19, 0x48, 0x7c, 0x3f, 0xa9, 0xb2, - 0xde, 0x84, 0xc6, 0x73, 0xca, 0x63, 0x2a, 0xe8, 0xcf, 0x60, 0x69, 0x4a, 0x51, 0xe7, 0xfa, 0x28, - 0xad, 0xf4, 0x47, 0x50, 0xc0, 0x9d, 0xc9, 0x32, 0x14, 0x18, 0xb7, 0x42, 0x8e, 0xdf, 0xd5, 0x0c, - 0x39, 0x21, 0x4d, 0xc8, 0x51, 0xaf, 0x87, 0x56, 0xaf, 0x19, 0x62, 0xa8, 0xff, 0x29, 0x07, 0xa5, - 0x6e, 0xf7, 0xe8, 0x80, 0x72, 0x8b, 0x10, 0xc8, 0x8f, 0x46, 0x4e, 0x4f, 0x7d, 0x82, 0x63, 0xf2, - 0x10, 0x0a, 0x78, 0x06, 0xfc, 0xe6, 0x82, 0x53, 0x4a, 0x0e, 0xb1, 0xa5, 0x1d, 0xda, 0x4f, 0x36, - 0xd1, 0x69, 0x75, 0x43, 0x4e, 0x84, 0x2f, 0x5d, 0xea, 0x9d, 0xf0, 0xd3, 0x56, 0x1e, 0x7d, 0xad, - 0x66, 0xe4, 0x06, 0x94, 0xec, 0xbe, 0xe9, 0x59, 0x43, 0xda, 0x2a, 0x28, 0x27, 0xf7, 0x5f, 0x59, - 0x43, 0x4a, 0x6e, 0x41, 0x25, 0xa4, 0x27, 0x18, 0x24, 0xbd, 0x56, 0x11, 0xbf, 0x29, 0x4b, 0xc2, - 0x5e, 0x8f, 0x3c, 0x85, 0x9a, 0x5a, 0xa4, 0x81, 0x6f, 0x9f, 0xb6, 0x4a, 0x4a, 0x2b, 0x95, 0x1f, - 0x06, 0xae, 0xed, 0x8a, 0x25, 0xa3, 0x1a, 0xce, 0x26, 0x64, 0x1d, 0xae, 0x89, 0x30, 0x1d, 0xd0, - 0x89, 0x49, 0xdf, 0xda, 0xee, 0x88, 0x39, 0x63, 0xda, 0x2a, 0x63, 0x74, 0x2c, 0x51, 0xaf, 0xb7, - 0x4f, 0x27, 0xbb, 0x11, 0x59, 0x28, 0xc0, 0x7d, 0x6e, 0xb9, 0xe6, 0x60, 0xcc, 0x5a, 0x15, 0xa9, - 0x00, 0x12, 0xf6, 0xc7, 0x8c, 0xdc, 0x85, 0xaa, 0x5c, 0x3c, 0x9e, 0x70, 0xca, 0x5a, 0x80, 0xcb, - 0x80, 0xa4, 0x2d, 0x41, 0x21, 0x5f, 0x40, 0xd5, 0x0a, 0x1c, 0x73, 0x4c, 0x43, 0xe6, 0xf8, 0x5e, - 0xab, 0x8a, 0x6e, 0xbb, 0xde, 0x89, 0x72, 0xf4, 0xeb, 0xc3, 0xbd, 0x37, 0x72, 0xc9, 0x00, 0x2b, - 0x70, 0xd4, 0x58, 0xec, 0x69, 0x3b, 0xc1, 0x29, 0x0d, 0x4d, 0x67, 0xdc, 0xaa, 0xa1, 0xfd, 0xcb, - 0x92, 0xb0, 0x37, 0xd6, 0x7f, 0x0b, 0x55, 0x83, 0x9e, 0x85, 0x0e, 0xa7, 0xc6, 0xc8, 0xa5, 0xe4, - 0x01, 0x34, 0x7c, 0x57, 0x9e, 0x25, 0x08, 0x69, 0xdf, 0x79, 0xab, 0x1c, 0x56, 0xf3, 0x5d, 0x71, - 0x90, 0x43, 0xa4, 0x09, 0x2e, 0x8f, 0x9e, 0xc5, 0xb9, 0xa4, 0xd7, 0x6b, 0x1e, 0x3d, 0x9b, 0x71, - 0xfd, 0x1f, 0xd4, 0x05, 0x17, 0x77, 0x86, 0x94, 0x71, 0x6b, 0x18, 0xa0, 0xef, 0xf2, 0xc8, 0x74, - 0x14, 0xd1, 0xf4, 0x5f, 0x41, 0xfd, 0x17, 0x81, 0xeb, 0x5b, 0xbd, 0x28, 0x53, 0x36, 0x20, 0x2f, - 0x0c, 0x8e, 0xfb, 0x56, 0x37, 0x3f, 0x49, 0xc5, 0xa4, 0x8c, 0xa6, 0x17, 0x19, 0x03, 0x99, 0xc8, - 0x32, 0xe4, 0x7b, 0x16, 0xb7, 0xe4, 0xf6, 0x82, 0x2a, 0x66, 0x5b, 0x25, 0x28, 0xd8, 0xa7, 0x23, - 0x6f, 0x20, 0x92, 0x20, 0x12, 0xae, 0xd2, 0xa2, 0x07, 0xf5, 0x3d, 0x91, 0x35, 0x3c, 0xda, 0x6e, - 0x1d, 0x4a, 0xb6, 0xef, 0x71, 0xfa, 0x96, 0xab, 0x1d, 0x9b, 0x53, 0x73, 0x6e, 0x4b, 0xba, 0x11, - 0x31, 0x90, 0xcf, 0x21, 0xc7, 0x18, 0x57, 0xd1, 0x3a, 0x5f, 0x33, 0x43, 0x70, 0xe8, 0x03, 0x20, - 0x07, 0x23, 0x97, 0x3b, 0x57, 0xdf, 0xea, 0x21, 0xe4, 0x19, 0xe3, 0x51, 0xfe, 0x5f, 0xb0, 0x17, - 0xb2, 0xe8, 0x4f, 0xa1, 0x11, 0xed, 0xa3, 0xd2, 0xfa, 0x01, 0x14, 0xb0, 0x8a, 0xab, 0x6d, 0x1a, - 0x9d, 0xa8, 0xa6, 0xef, 0x8a, 0x5f, 0x43, 0x2e, 0xea, 0xbf, 0xd3, 0xa0, 0xb1, 0xed, 0x0f, 0x03, - 0xcb, 0x9e, 0x6a, 0x38, 0x4d, 0x48, 0x6d, 0x61, 0x42, 0xde, 0x87, 0x9a, 0x3f, 0xe2, 0xc1, 0x88, - 0x9b, 0x2e, 0x1d, 0x53, 0x17, 0x8d, 0x52, 0x30, 0xaa, 0x92, 0xf6, 0x52, 0x90, 0xe2, 0xe7, 0xcd, - 0x2d, 0x38, 0xaf, 0x7e, 0x0d, 0x96, 0xa6, 0xba, 0x28, 0x57, 0xfd, 0xad, 0x00, 0x4b, 0x3b, 0xfe, - 0x99, 0x17, 0x0f, 0x8e, 0x1f, 0x2b, 0xb3, 0x68, 0x68, 0x96, 0xcf, 0x93, 0xfa, 0xa5, 0x98, 0x3b, - 0x5d, 0xc6, 0xd9, 0xae, 0xc7, 0xc3, 0x89, 0x34, 0x94, 0x48, 0xaf, 0x90, 0x32, 0xdf, 0x1d, 0xd3, - 0x9e, 0xc9, 0x99, 0x8a, 0x46, 0x88, 0x48, 0x47, 0x8c, 0xfc, 0x60, 0xb1, 0x7f, 0xb7, 0xf2, 0xdf, - 0xfe, 0xfd, 0x6e, 0x06, 0xbd, 0x2c, 0x4a, 0x1a, 0x96, 0x98, 0x0a, 0x96, 0x18, 0x1c, 0x93, 0x2d, - 0x51, 0x43, 0x30, 0x9d, 0xcc, 0x70, 0xe4, 0xd2, 0x56, 0x1d, 0x65, 0xdd, 0x4c, 0x19, 0x72, 0x96, - 0x70, 0x4a, 0x5e, 0x35, 0x8c, 0xe5, 0xe0, 0x3e, 0x2c, 0x33, 0x3f, 0xe4, 0xb4, 0x67, 0xc6, 0x45, - 0xb1, 0xd6, 0x32, 0x1e, 0xfa, 0x62, 0x59, 0x06, 0x91, 0x9f, 0xc5, 0x48, 0x8c, 0x3c, 0x83, 0x25, - 0xc6, 0xfd, 0xd0, 0x3a, 0xa1, 0xe6, 0xb1, 0x65, 0x0f, 0x44, 0x85, 0x6e, 0xa0, 0x4e, 0x2b, 0x1d, - 0x31, 0x1f, 0x05, 0x9d, 0xae, 0x5c, 0xde, 0x92, 0xab, 0x46, 0x83, 0x25, 0xe6, 0xa2, 0xb3, 0x46, - 0x02, 0x6c, 0xcb, 0x3e, 0xa5, 0xa2, 0x72, 0x5e, 0xc3, 0x13, 0x47, 0x9c, 0xdb, 0x82, 0xbc, 0xd7, - 0x23, 0x6d, 0xa8, 0x38, 0xcc, 0x0c, 0xad, 0x33, 0x73, 0x30, 0x6e, 0x2d, 0x61, 0xfd, 0x2b, 0x39, - 0xcc, 0xb0, 0xce, 0xf6, 0xc7, 0xe4, 0x09, 0x54, 0xa3, 0x1a, 0xe4, 0xf5, 0xfd, 0x56, 0x13, 0x55, - 0x20, 0x91, 0x0a, 0xdb, 0xb2, 0x1a, 0x79, 0x7d, 0xdf, 0x00, 0x7b, 0x3a, 0x26, 0x3b, 0xc2, 0x98, - 0xe8, 0x4b, 0x93, 0x4f, 0x02, 0xda, 0x22, 0x58, 0xef, 0xee, 0x5f, 0xea, 0xf5, 0xa3, 0x49, 0x40, - 0x85, 0x39, 0xa7, 0x93, 0x78, 0x18, 0x5e, 0x5f, 0x10, 0x86, 0xed, 0x57, 0x50, 0x99, 0x46, 0x8d, - 0x68, 0x68, 0x03, 0x3a, 0xc1, 0x5c, 0xa8, 0x18, 0x62, 0x48, 0x36, 0xa0, 0x30, 0xb6, 0xdc, 0x11, - 0xbd, 0xbc, 0x04, 0x48, 0x9e, 0xaf, 0xb2, 0x5f, 0x6a, 0x3f, 0xcb, 0x97, 0xcb, 0xcd, 0x8a, 0x91, - 0x1b, 0x85, 0xae, 0x6e, 0x40, 0x01, 0xd3, 0x8f, 0xb4, 0xa0, 0x34, 0xa4, 0x8c, 0x59, 0x2a, 0xcd, - 0x2a, 0x46, 0x34, 0x25, 0x8f, 0xa0, 0x2a, 0x4c, 0x4a, 0x4d, 0x99, 0xbd, 0xd9, 0xb9, 0xd9, 0x0b, - 0xc8, 0x82, 0x63, 0xfd, 0x9d, 0x06, 0xcd, 0xd9, 0xf9, 0x55, 0xf6, 0x3f, 0x5a, 0x9c, 0xc4, 0x2a, - 0xea, 0x54, 0x2a, 0xdf, 0x84, 0xb2, 0xc3, 0x4c, 0x3a, 0x0c, 0xf8, 0x04, 0xf7, 0x44, 0xb7, 0xed, - 0x8a, 0xa9, 0x28, 0x08, 0x52, 0x97, 0xdc, 0x3c, 0x59, 0xf1, 0x72, 0x32, 0xeb, 0xd0, 0xf9, 0xf9, - 0x1d, 0xba, 0x90, 0xe8, 0xd0, 0x51, 0x7d, 0x2b, 0x2e, 0xae, 0x6f, 0xcf, 0xe0, 0x76, 0x97, 0xf2, - 0xe8, 0x98, 0xdd, 0x80, 0xd2, 0xde, 0x4b, 0x67, 0xe8, 0x4c, 0x8b, 0xd6, 0x5d, 0xa8, 0x32, 0x41, - 0x34, 0x5d, 0x41, 0xc5, 0x53, 0xe7, 0x0d, 0x60, 0x53, 0x3e, 0xfd, 0x2e, 0xdc, 0xb9, 0x40, 0x80, - 0xaa, 0x34, 0x01, 0xe4, 0x0f, 0x2d, 0x27, 0x8c, 0x3b, 0xbc, 0x26, 0x1d, 0xbe, 0x1c, 0x77, 0x78, - 0x4d, 0x79, 0x96, 0x7c, 0x0a, 0x59, 0x5f, 0x76, 0xb3, 0x46, 0x5a, 0x75, 0x21, 0xa7, 0xf3, 0xfa, - 0xd0, 0xc8, 0xfa, 0x81, 0x7e, 0x13, 0xb2, 0xaf, 0x0f, 0x49, 0x09, 0x72, 0x87, 0x23, 0xde, 0xcc, - 0x10, 0x80, 0xe2, 0x0e, 0x75, 0x29, 0xa7, 0x4d, 0x4d, 0xef, 0x02, 0xfc, 0x52, 0xe4, 0xe8, 0x96, - 0xc5, 0xed, 0x53, 0x6c, 0xd0, 0xfe, 0x70, 0xe8, 0x70, 0x53, 0xa1, 0xdc, 0xbc, 0x51, 0x96, 0x84, - 0x23, 0x81, 0x6c, 0x0b, 0x81, 0xe5, 0x84, 0x51, 0x2b, 0x20, 0xe7, 0xf7, 0x33, 0x24, 0x83, 0xfe, - 0x67, 0x0d, 0x6a, 0x28, 0xf5, 0x4a, 0xad, 0xf4, 0x31, 0x14, 0x8e, 0x85, 0x36, 0x2a, 0xec, 0x52, - 0x60, 0x70, 0xa6, 0xed, 0x8b, 0x8c, 0x21, 0x19, 0x3f, 0xa6, 0xbe, 0xcf, 0x5a, 0xf2, 0x09, 0xd4, - 0x95, 0x8e, 0x2a, 0x5c, 0x1f, 0x26, 0x9b, 0xd5, 0x65, 0x21, 0xb6, 0x01, 0x05, 0xa1, 0xea, 0x82, - 0xae, 0x28, 0x79, 0x04, 0xb0, 0x30, 0xac, 0xb3, 0x98, 0x95, 0x9b, 0x90, 0xe3, 0xdc, 0x55, 0xf6, - 0x15, 0xc3, 0x0f, 0x37, 0x2d, 0x69, 0x40, 0x76, 0xda, 0x31, 0xb2, 0x9c, 0xe9, 0xdf, 0x68, 0xb0, - 0x14, 0x49, 0xbf, 0x92, 0xb5, 0x9f, 0x24, 0xad, 0x7d, 0x2b, 0x9d, 0xa4, 0x67, 0xff, 0x35, 0x83, - 0xff, 0x1a, 0x9a, 0x33, 0x4d, 0xff, 0xc7, 0x36, 0xff, 0xab, 0x06, 0x2b, 0x3b, 0xa3, 0xc0, 0x75, - 0x6c, 0x8b, 0xd3, 0x1d, 0xca, 0xa9, 0x7d, 0x25, 0xf0, 0x73, 0x0b, 0x2a, 0x78, 0xa5, 0x10, 0x00, - 0x53, 0x65, 0x5e, 0x19, 0x09, 0xfb, 0x74, 0x22, 0xb0, 0xbd, 0x42, 0xdb, 0x68, 0x84, 0x9a, 0x51, - 0x94, 0x18, 0x5b, 0x94, 0x31, 0x01, 0x48, 0x7d, 0xcf, 0x9d, 0x60, 0x0d, 0x2a, 0x1b, 0xa5, 0x01, - 0x9d, 0xbc, 0xf6, 0xdc, 0x09, 0xd1, 0xa1, 0x3e, 0x74, 0x3c, 0x73, 0x96, 0x64, 0xb2, 0x18, 0x55, - 0x87, 0x8e, 0xb7, 0xad, 0xf2, 0x4c, 0x3f, 0x80, 0xe2, 0xfe, 0xf8, 0xa3, 0xca, 0x40, 0x22, 0x6d, - 0x73, 0xc9, 0xb4, 0xd5, 0xff, 0xa2, 0xc1, 0x8d, 0x73, 0xa6, 0x50, 0xe6, 0xff, 0xe1, 0xec, 0xa2, - 0x71, 0x09, 0x4c, 0x8b, 0xee, 0x18, 0xe8, 0x86, 0xc7, 0x50, 0xc1, 0xfb, 0x45, 0xac, 0x31, 0xcc, - 0xf5, 0x9a, 0x30, 0x81, 0xfc, 0x62, 0x3d, 0x0a, 0xee, 0x1c, 0x3a, 0x6e, 0x39, 0xc9, 0x2d, 0x8f, - 0x1a, 0x55, 0x8e, 0x7f, 0xe5, 0xa0, 0xb8, 0xff, 0x26, 0xba, 0xa7, 0x21, 0xa8, 0xd1, 0x62, 0xa0, - 0xe6, 0x3e, 0xd4, 0xb0, 0x53, 0x98, 0x7e, 0xbf, 0xcf, 0x28, 0xc7, 0x7b, 0x47, 0xde, 0xa8, 0x22, - 0xed, 0x35, 0x92, 0x62, 0x75, 0x3e, 0x9b, 0xa8, 0xf3, 0xd3, 0x4f, 0xd5, 0x6a, 0x2d, 0xf6, 0xe9, - 0x4b, 0xc9, 0xd2, 0x80, 0xac, 0xdd, 0x57, 0x97, 0xf1, 0xac, 0xdd, 0x17, 0x66, 0x75, 0x98, 0xd9, - 0xc3, 0x52, 0xa9, 0x1c, 0x59, 0x76, 0x98, 0x2c, 0x9d, 0xc2, 0xc9, 0x32, 0x34, 0x78, 0x74, 0x3f, - 0x2a, 0xe1, 0xfc, 0x88, 0x91, 0x3b, 0x20, 0xb0, 0x1c, 0xf6, 0xcf, 0xa9, 0x87, 0x2b, 0x8a, 0x72, - 0xc4, 0x92, 0x41, 0x55, 0xbc, 0x38, 0xa8, 0x4a, 0x89, 0xa0, 0x5a, 0x81, 0x22, 0x3b, 0xb5, 0x36, - 0x7f, 0xf4, 0x14, 0x2f, 0x74, 0x35, 0x43, 0xcd, 0xc4, 0x9d, 0x4f, 0x4a, 0x63, 0x9e, 0x15, 0xb0, - 0x53, 0x1f, 0x15, 0x92, 0xf7, 0xb9, 0x25, 0x5c, 0xe8, 0x2a, 0xfa, 0x11, 0x23, 0x5b, 0xd0, 0xb4, - 0xfd, 0x61, 0x10, 0x52, 0x26, 0xae, 0x63, 0x12, 0xca, 0xd4, 0xb1, 0x79, 0xdc, 0x98, 0x02, 0xa0, - 0xd9, 0x3a, 0x02, 0x98, 0x25, 0x3b, 0x49, 0x20, 0x06, 0x2c, 0xf7, 0x1d, 0x97, 0x9a, 0xb3, 0x37, - 0x17, 0x09, 0xa4, 0x24, 0x96, 0xbb, 0xd7, 0x49, 0xbc, 0xc5, 0xfc, 0xd4, 0x71, 0xe9, 0xee, 0x94, - 0x80, 0xb0, 0x8a, 0xf4, 0xcf, 0xd1, 0xf4, 0x7f, 0xe6, 0xa0, 0xf6, 0x75, 0x10, 0xb8, 0x93, 0x28, - 0x47, 0xd7, 0x12, 0x15, 0x2c, 0x1d, 0x31, 0x6f, 0x64, 0x4f, 0xc6, 0xf2, 0xb5, 0x1e, 0x55, 0x85, - 0xda, 0xdc, 0xe0, 0x7a, 0x13, 0x2b, 0x0a, 0xe7, 0x20, 0x71, 0xf6, 0x0a, 0x90, 0xf8, 0x27, 0x50, - 0x4f, 0x62, 0xe1, 0xfa, 0x22, 0x2c, 0x5c, 0x0b, 0xe3, 0x28, 0x78, 0x1e, 0x88, 0x2d, 0xcc, 0x05, - 0xb1, 0x73, 0xf0, 0x72, 0xee, 0xa3, 0xf0, 0x72, 0xac, 0xd0, 0xe5, 0x17, 0x15, 0xba, 0x14, 0x2a, - 0xae, 0x7e, 0x10, 0x2a, 0xfe, 0x12, 0xaa, 0x43, 0x8b, 0x71, 0x1a, 0x8a, 0x70, 0x65, 0xad, 0x06, - 0x5a, 0xe2, 0x46, 0x32, 0x02, 0x0e, 0x90, 0x61, 0x9f, 0x4e, 0x0c, 0x18, 0x46, 0x43, 0xa6, 0x0f, - 0xa0, 0xae, 0xfc, 0x7d, 0x55, 0xa8, 0x38, 0x6d, 0x1c, 0xd9, 0x45, 0x8d, 0x43, 0xff, 0x0c, 0x6a, - 0xdb, 0x2e, 0xb5, 0xc2, 0x28, 0xb8, 0x56, 0xa0, 0x18, 0x7b, 0x51, 0xa8, 0x18, 0x6a, 0xa6, 0x7f, - 0x05, 0x75, 0xc5, 0xf7, 0xd1, 0xcd, 0x69, 0xfd, 0x01, 0xc0, 0xec, 0x95, 0x4a, 0x00, 0xac, 0x57, - 0x7e, 0x38, 0xb4, 0x5c, 0x09, 0xb6, 0xe4, 0x33, 0x5e, 0x53, 0x5b, 0x7f, 0x04, 0xd7, 0xe7, 0x5c, - 0x12, 0x04, 0xcb, 0x4b, 0x7a, 0x62, 0xd9, 0x93, 0x66, 0x86, 0xd4, 0xa0, 0x2c, 0x2c, 0x14, 0x58, - 0x36, 0x6d, 0x6a, 0x9b, 0xff, 0x2e, 0x43, 0x45, 0x7e, 0xdd, 0xed, 0x1e, 0x91, 0x9f, 0x27, 0x36, - 0xb9, 0x7b, 0xe1, 0x23, 0x99, 0x14, 0xdd, 0xbe, 0x77, 0x31, 0x83, 0x82, 0x9b, 0x19, 0xf2, 0x02, - 0x4a, 0xea, 0x29, 0x8e, 0xdc, 0x4e, 0xb2, 0x27, 0xdf, 0xec, 0xda, 0x77, 0x2e, 0x58, 0x9d, 0x4a, - 0x7a, 0x0e, 0x45, 0xf9, 0xc2, 0x41, 0x52, 0x10, 0x22, 0xf1, 0xa8, 0xd2, 0xbe, 0x3d, 0x7f, 0x31, - 0x12, 0xb3, 0xa6, 0x91, 0x5d, 0x28, 0xca, 0x57, 0x84, 0xb4, 0xa0, 0xc4, 0x1b, 0x46, 0x5a, 0x50, - 0xf2, 0xe1, 0x41, 0x9e, 0x4c, 0xdd, 0xe3, 0xd3, 0x27, 0x4b, 0x3e, 0x35, 0xa4, 0x4f, 0x96, 0xbe, - 0xfc, 0x67, 0x48, 0x08, 0x9f, 0xcc, 0x45, 0xed, 0x64, 0x3d, 0x65, 0xe0, 0x4b, 0xee, 0x06, 0xed, - 0x8d, 0x0f, 0xe2, 0x9d, 0xee, 0xb9, 0x0f, 0xe5, 0x68, 0x9d, 0xdc, 0xb9, 0xf4, 0x9a, 0xd9, 0x5e, - 0xbd, 0x68, 0x79, 0x2a, 0x6c, 0x07, 0x0a, 0x88, 0xba, 0x48, 0x7b, 0x0e, 0x94, 0x8e, 0xc4, 0xdc, - 0x9a, 0xbb, 0x16, 0xf3, 0xcb, 0x01, 0x94, 0x23, 0xf8, 0x96, 0x56, 0x29, 0x05, 0x40, 0xd3, 0x2a, - 0xa5, 0x51, 0x1f, 0x8a, 0x7b, 0x0d, 0xd5, 0xd8, 0xcb, 0x14, 0x49, 0x05, 0xeb, 0xf9, 0x47, 0xab, - 0x85, 0x0e, 0x3f, 0x86, 0xa5, 0x14, 0xcc, 0x21, 0x0f, 0x52, 0xa6, 0x99, 0x0b, 0x08, 0xdb, 0x9f, - 0x2e, 0xe0, 0x8a, 0x76, 0x78, 0xac, 0x91, 0x2d, 0x28, 0x60, 0xdd, 0x4a, 0x5b, 0x32, 0xde, 0xbc, - 0xd2, 0x96, 0x4c, 0x14, 0x3a, 0x4c, 0x14, 0xc0, 0x32, 0x23, 0x7a, 0x23, 0x4b, 0x0b, 0x8a, 0x17, - 0xaa, 0xb4, 0xa0, 0x44, 0x71, 0xd2, 0x33, 0xc4, 0x86, 0x66, 0xfa, 0x7f, 0x02, 0x92, 0x3a, 0xcb, - 0x05, 0x7f, 0x6d, 0xb4, 0x3f, 0x5b, 0xc4, 0x16, 0x6d, 0xb2, 0xb5, 0xf9, 0xfd, 0x37, 0x65, 0xed, - 0xdb, 0x77, 0xab, 0xda, 0x77, 0xef, 0x56, 0xb5, 0x7f, 0xbc, 0x5b, 0xd5, 0x7e, 0xff, 0x7e, 0x35, - 0xf3, 0xc7, 0xf7, 0xab, 0x99, 0xef, 0xde, 0xaf, 0x66, 0xbe, 0x7f, 0xbf, 0x9a, 0x81, 0xa6, 0x1f, - 0x9e, 0x74, 0xb8, 0x33, 0x18, 0x77, 0x06, 0x63, 0xfc, 0x53, 0xe5, 0xb8, 0x88, 0x3f, 0x4f, 0xfe, - 0x13, 0x00, 0x00, 0xff, 0xff, 0x17, 0x56, 0x42, 0x34, 0xf2, 0x19, 0x00, 0x00, + 0xf1, 0x27, 0xf8, 0xcd, 0xe6, 0x87, 0xe8, 0xb1, 0x2c, 0xd1, 0xb4, 0x2d, 0xdb, 0xf8, 0x7b, 0x77, + 0x65, 0xe9, 0x1f, 0xd9, 0x91, 0x37, 0xae, 0xad, 0x4d, 0x55, 0x5c, 0xd6, 0x47, 0x6c, 0x45, 0x96, + 0xad, 0x80, 0x8a, 0x73, 0xc8, 0x01, 0x05, 0x81, 0x43, 0x09, 0x21, 0x08, 0x20, 0x98, 0x21, 0x65, + 0xbe, 0x42, 0x4e, 0xc9, 0x2d, 0xd7, 0xe4, 0xb4, 0x95, 0x37, 0xc8, 0x1b, 0xec, 0x21, 0x87, 0x3d, + 0xee, 0x29, 0x95, 0xb2, 0xaf, 0xa9, 0x5c, 0xf2, 0x00, 0x49, 0x4d, 0xcf, 0x80, 0x04, 0x20, 0x4a, + 0xb4, 0x55, 0xc9, 0x89, 0x98, 0xee, 0x9e, 0x99, 0x9e, 0xfe, 0xfc, 0xcd, 0x10, 0x88, 0x33, 0x08, + 0xfc, 0x90, 0x9b, 0x8c, 0xf1, 0xe0, 0x78, 0x23, 0x08, 0x7d, 0xee, 0x93, 0x5a, 0x9c, 0xd6, 0xae, + 0x0d, 0x28, 0xb7, 0x22, 0x5e, 0xbb, 0x4e, 0xc3, 0xd0, 0x0f, 0xa7, 0xc3, 0xfe, 0x28, 0x0c, 0xec, + 0xc9, 0x10, 0x8e, 0xa7, 0x2c, 0x42, 0x3d, 0x3b, 0x1c, 0x07, 0xdc, 0xf1, 0xbd, 0x09, 0x6d, 0xf1, + 0xc4, 0x3f, 0xf1, 0xf1, 0xf3, 0x91, 0xf8, 0x52, 0xd4, 0x85, 0x70, 0xc8, 0x38, 0x7e, 0x4a, 0x82, + 0xfe, 0x7b, 0x0d, 0x96, 0x3b, 0x43, 0x16, 0x50, 0xaf, 0xbb, 0x87, 0xaa, 0x18, 0x87, 0xdb, 0x06, + 0xfd, 0xcd, 0x90, 0x32, 0x4e, 0xbe, 0x84, 0x25, 0x76, 0xea, 0x0f, 0xdd, 0xae, 0xc9, 0xa4, 0x84, + 0x29, 0xb5, 0x65, 0x2d, 0xed, 0x9e, 0xb6, 0x5a, 0x36, 0x16, 0x25, 0x37, 0x31, 0x9d, 0x91, 0x55, + 0x68, 0x76, 0x87, 0xa1, 0x25, 0x94, 0x31, 0x1d, 0xcf, 0x64, 0xd4, 0x66, 0xad, 0xec, 0x3d, 0x6d, + 0x35, 0x6f, 0x34, 0x22, 0xfa, 0x9e, 0xd7, 0xa1, 0x36, 0x23, 0x4b, 0x50, 0xb4, 0x2d, 0xd7, 0xa5, + 0x61, 0x2b, 0x77, 0x4f, 0x5b, 0xad, 0x18, 0x6a, 0xa4, 0xbf, 0x80, 0xd6, 0x79, 0x95, 0x58, 0xe0, + 0x7b, 0x8c, 0x92, 0x75, 0xb8, 0x66, 0xb9, 0x21, 0xb5, 0xba, 0xe3, 0x48, 0x29, 0xda, 0x55, 0xea, + 0x34, 0x15, 0xa3, 0x13, 0xd1, 0x75, 0x0f, 0xae, 0x75, 0xce, 0x1c, 0x6e, 0x9f, 0x1e, 0xf8, 0x5d, + 0x1a, 0x9d, 0xea, 0xff, 0x21, 0x3f, 0xf0, 0xbb, 0x14, 0x27, 0x35, 0x36, 0x5b, 0x1b, 0x09, 0xaf, + 0xc4, 0xc4, 0x51, 0x8a, 0xac, 0x43, 0x31, 0xb4, 0xbc, 0x13, 0x2a, 0xce, 0x90, 0x5b, 0xad, 0x6e, + 0x5e, 0x4f, 0xca, 0x1b, 0x82, 0x67, 0x28, 0x11, 0x7d, 0x11, 0x48, 0x7c, 0x3f, 0xa9, 0xb2, 0xde, + 0x84, 0xc6, 0x0b, 0xca, 0x63, 0x2a, 0xe8, 0xcf, 0x60, 0x61, 0x42, 0x51, 0xe7, 0xfa, 0x24, 0xad, + 0xf4, 0x47, 0x50, 0xc0, 0x9d, 0xc9, 0x22, 0x14, 0x18, 0xb7, 0x42, 0x8e, 0xf3, 0x6a, 0x86, 0x1c, + 0x90, 0x26, 0xe4, 0xa8, 0xd7, 0x45, 0xab, 0xd7, 0x0c, 0xf1, 0xa9, 0xff, 0x31, 0x07, 0xa5, 0x4e, + 0xe7, 0xe8, 0x80, 0x72, 0x8b, 0x10, 0xc8, 0x0f, 0x87, 0x4e, 0x57, 0x4d, 0xc1, 0x6f, 0xf2, 0x10, + 0x0a, 0x78, 0x06, 0x9c, 0x73, 0xc1, 0x29, 0xa5, 0x84, 0xd8, 0xd2, 0x0e, 0xed, 0x27, 0x9b, 0xe8, + 0xb4, 0xba, 0x21, 0x07, 0xc2, 0x97, 0x2e, 0xf5, 0x4e, 0xf8, 0x69, 0x2b, 0x8f, 0xbe, 0x56, 0x23, + 0xb2, 0x0c, 0x25, 0xbb, 0x67, 0x7a, 0xd6, 0x80, 0xb6, 0x0a, 0xca, 0xc9, 0xbd, 0xd7, 0xd6, 0x80, + 0x92, 0x5b, 0x50, 0x09, 0xe9, 0x09, 0x06, 0x49, 0xb7, 0x55, 0xc4, 0x39, 0x65, 0x49, 0xd8, 0xeb, + 0x92, 0xa7, 0x50, 0x53, 0x4c, 0x1a, 0xf8, 0xf6, 0x69, 0xab, 0xa4, 0xb4, 0x52, 0xf9, 0x61, 0x20, + 0x6f, 0x57, 0xb0, 0x8c, 0x6a, 0x38, 0x1d, 0x90, 0x35, 0xb8, 0x26, 0xc2, 0xb4, 0x4f, 0xc7, 0x26, + 0x7d, 0x67, 0xbb, 0x43, 0xe6, 0x8c, 0x68, 0xab, 0x8c, 0xd1, 0xb1, 0x40, 0xbd, 0xee, 0x3e, 0x1d, + 0xef, 0x46, 0x64, 0xa1, 0x00, 0xf7, 0xb9, 0xe5, 0x9a, 0xfd, 0x11, 0x6b, 0x55, 0xa4, 0x02, 0x48, + 0xd8, 0x1f, 0x31, 0x72, 0x17, 0xaa, 0x92, 0x79, 0x3c, 0xe6, 0x94, 0xb5, 0x00, 0xd9, 0x80, 0xa4, + 0x2d, 0x41, 0x21, 0x5f, 0x42, 0xd5, 0x0a, 0x1c, 0x73, 0x44, 0x43, 0xe6, 0xf8, 0x5e, 0xab, 0x8a, + 0x6e, 0xbb, 0xbe, 0x11, 0xe5, 0xe8, 0xf3, 0xc3, 0xbd, 0xb7, 0x92, 0x65, 0x80, 0x15, 0x38, 0xea, + 0x5b, 0xec, 0x69, 0x3b, 0xc1, 0x29, 0x0d, 0x4d, 0x67, 0xd4, 0xaa, 0xa1, 0xfd, 0xcb, 0x92, 0xb0, + 0x37, 0xd2, 0xff, 0xa1, 0x41, 0xd5, 0xa0, 0x67, 0xa1, 0xc3, 0xa9, 0x31, 0x74, 0x29, 0x79, 0x00, + 0x0d, 0xdf, 0x95, 0x87, 0x09, 0x42, 0xda, 0x73, 0xde, 0x29, 0x8f, 0xd5, 0x7c, 0x57, 0x9c, 0xe4, + 0x10, 0x69, 0x42, 0xca, 0xa3, 0x67, 0x71, 0x29, 0xe9, 0xf6, 0x9a, 0x47, 0xcf, 0xa6, 0x52, 0xff, + 0x07, 0x75, 0x21, 0xc5, 0x9d, 0x01, 0x65, 0xdc, 0x1a, 0x04, 0xe8, 0xbc, 0x3c, 0x0a, 0x1d, 0x45, + 0x34, 0x91, 0xef, 0xce, 0x89, 0xe7, 0x87, 0xd4, 0xb4, 0x7a, 0x9c, 0x86, 0x31, 0x69, 0xe9, 0xd3, + 0x45, 0xc9, 0x7d, 0x2e, 0x98, 0xd3, 0x59, 0x4f, 0x61, 0x59, 0xcd, 0x3a, 0xa6, 0x3d, 0xf1, 0x33, + 0x9d, 0x56, 0xc0, 0x69, 0x37, 0x24, 0x7b, 0x0b, 0xb9, 0x93, 0x79, 0xfa, 0xaf, 0xa0, 0xfe, 0x8b, + 0xc0, 0xf5, 0xad, 0x6e, 0x94, 0x98, 0xeb, 0x90, 0x17, 0xfe, 0xc5, 0x53, 0x56, 0x37, 0x6f, 0xa4, + 0x52, 0x40, 0x06, 0xef, 0xcb, 0x8c, 0x81, 0x42, 0x64, 0x11, 0xf2, 0x5d, 0x8b, 0x5b, 0xf2, 0xb0, + 0x82, 0x2a, 0x46, 0x5b, 0x25, 0x28, 0xd8, 0xa7, 0x43, 0xaf, 0x2f, 0x72, 0x2e, 0x5a, 0x5c, 0x65, + 0x61, 0x17, 0xea, 0x7b, 0x22, 0x49, 0x79, 0xb4, 0xdd, 0x1a, 0x94, 0x6c, 0xdf, 0xe3, 0xf4, 0x1d, + 0x57, 0x3b, 0x36, 0x27, 0xde, 0xdb, 0x96, 0x74, 0x23, 0x12, 0x20, 0x5f, 0x40, 0x8e, 0x31, 0xae, + 0x92, 0x63, 0xb6, 0x66, 0x86, 0x90, 0xd0, 0xfb, 0x40, 0x0e, 0x86, 0x2e, 0x77, 0xae, 0xbe, 0xd5, + 0x43, 0xc8, 0x33, 0xc6, 0xa3, 0x72, 0x73, 0xc1, 0x5e, 0x28, 0xa2, 0x3f, 0x85, 0x46, 0xb4, 0x8f, + 0xaa, 0x22, 0x0f, 0xa0, 0x80, 0x4d, 0x43, 0x6d, 0xd3, 0xd8, 0x88, 0x5a, 0xc8, 0xae, 0xf8, 0x35, + 0x24, 0x53, 0xff, 0xad, 0x06, 0x8d, 0x6d, 0x7f, 0x10, 0x58, 0xf6, 0x44, 0xc3, 0x49, 0xfe, 0x6b, + 0x73, 0xf3, 0xff, 0x3e, 0xd4, 0xfc, 0x21, 0x0f, 0x86, 0xdc, 0x74, 0xe9, 0x88, 0xba, 0x68, 0x94, + 0x82, 0x51, 0x95, 0xb4, 0x57, 0x82, 0x14, 0x3f, 0x6f, 0x6e, 0xce, 0x79, 0xf5, 0x6b, 0xb0, 0x30, + 0xd1, 0x45, 0xb9, 0xea, 0xaf, 0x05, 0x58, 0xd8, 0xf1, 0xcf, 0xbc, 0x78, 0x70, 0xfc, 0x58, 0x99, + 0x45, 0x43, 0xb3, 0x7c, 0x91, 0xd4, 0x2f, 0x25, 0xbc, 0xd1, 0x61, 0x9c, 0xed, 0x7a, 0x3c, 0x1c, + 0x4b, 0x43, 0x89, 0x6c, 0x0e, 0x29, 0xf3, 0xdd, 0x11, 0xed, 0x9a, 0x9c, 0xa9, 0xd8, 0x87, 0x88, + 0x74, 0xc4, 0xc8, 0x0f, 0xe6, 0xfb, 0x77, 0x2b, 0xff, 0xed, 0xdf, 0xee, 0x66, 0xd0, 0xcb, 0xa2, + 0x82, 0x62, 0x45, 0xab, 0x60, 0x45, 0xc3, 0x6f, 0xb2, 0x25, 0x4a, 0x16, 0x26, 0xaf, 0x19, 0x0e, + 0x5d, 0xda, 0xaa, 0xe3, 0x5a, 0x37, 0x53, 0x86, 0x9c, 0xa6, 0xb7, 0x5a, 0xaf, 0x1a, 0xc6, 0x32, + 0x7e, 0x1f, 0x16, 0x99, 0x1f, 0x72, 0xda, 0x35, 0xe3, 0x4b, 0xb1, 0xd6, 0x22, 0x1e, 0xfa, 0xe2, + 0xb5, 0x0c, 0x22, 0xa7, 0xc5, 0x48, 0x8c, 0x3c, 0x83, 0x05, 0xc6, 0xfd, 0xd0, 0x3a, 0xa1, 0xe6, + 0xb1, 0x65, 0xf7, 0x45, 0x43, 0x68, 0xa0, 0x4e, 0x4b, 0x1b, 0x62, 0x3c, 0x0c, 0x36, 0x3a, 0x92, + 0xbd, 0x25, 0xb9, 0x46, 0x83, 0x25, 0xc6, 0xa2, 0x91, 0x47, 0x0b, 0xd8, 0x96, 0x7d, 0x4a, 0x45, + 0xa1, 0xbe, 0x86, 0x27, 0x8e, 0x24, 0xb7, 0x05, 0x79, 0xaf, 0x4b, 0xda, 0x50, 0x71, 0x98, 0x19, + 0x5a, 0x67, 0x66, 0x7f, 0xd4, 0x5a, 0xc0, 0x72, 0x5b, 0x72, 0x98, 0x61, 0x9d, 0xed, 0x8f, 0xc8, + 0x13, 0xa8, 0x46, 0x25, 0xcf, 0xeb, 0xf9, 0xad, 0x26, 0xaa, 0x40, 0x22, 0x15, 0xb6, 0x65, 0xf1, + 0xf3, 0x7a, 0xbe, 0x01, 0xf6, 0xe4, 0x9b, 0xec, 0x08, 0x63, 0xa2, 0x2f, 0x4d, 0x3e, 0x0e, 0x68, + 0x8b, 0x60, 0x79, 0xbd, 0x7f, 0xa9, 0xd7, 0x8f, 0xc6, 0x01, 0x15, 0xe6, 0x9c, 0x0c, 0xe2, 0x61, + 0x78, 0x7d, 0x4e, 0x18, 0xb6, 0x5f, 0x43, 0x65, 0x12, 0x35, 0xa2, 0x7f, 0xf6, 0xe9, 0x18, 0x73, + 0xa1, 0x62, 0x88, 0x4f, 0xb2, 0x0e, 0x85, 0x91, 0xe5, 0x0e, 0xe9, 0xe5, 0x25, 0x40, 0xca, 0x7c, + 0x9d, 0xfd, 0x4a, 0xfb, 0x59, 0xbe, 0x5c, 0x6e, 0x56, 0x8c, 0xdc, 0x30, 0x74, 0x75, 0x03, 0x0a, + 0x98, 0x7e, 0xa4, 0x05, 0xa5, 0x01, 0x65, 0xcc, 0x52, 0x69, 0x56, 0x31, 0xa2, 0x21, 0x79, 0x04, + 0x55, 0x61, 0x52, 0x6a, 0xca, 0xec, 0xcd, 0xce, 0xcc, 0x5e, 0x40, 0x11, 0xfc, 0xd6, 0xdf, 0x6b, + 0xd0, 0x9c, 0x9e, 0x5f, 0x65, 0xff, 0xa3, 0xf9, 0x49, 0xac, 0xa2, 0x4e, 0xa5, 0xf2, 0x4d, 0x28, + 0x3b, 0xcc, 0xa4, 0x83, 0x80, 0x8f, 0x71, 0x4f, 0x74, 0xdb, 0xae, 0x18, 0x8a, 0x82, 0x20, 0x75, + 0xc9, 0xcd, 0x5a, 0x2b, 0x5e, 0x4e, 0xa6, 0x80, 0x20, 0x3f, 0x1b, 0x10, 0x14, 0x12, 0x80, 0x20, + 0xaa, 0x6f, 0xc5, 0xf9, 0xf5, 0xed, 0x19, 0xdc, 0xee, 0x50, 0x1e, 0x1d, 0xb3, 0x13, 0x50, 0xda, + 0x7d, 0xe5, 0x0c, 0x9c, 0x49, 0xd1, 0xba, 0x0b, 0x55, 0x26, 0x88, 0xa6, 0x2b, 0xa8, 0x78, 0xea, + 0xbc, 0x01, 0x6c, 0x22, 0xa7, 0xdf, 0x85, 0x3b, 0x17, 0x2c, 0xa0, 0x2a, 0x4d, 0x00, 0xf9, 0x43, + 0xcb, 0x09, 0xe3, 0x0e, 0xaf, 0x49, 0x87, 0x2f, 0xc6, 0x1d, 0x5e, 0x53, 0x9e, 0x25, 0x9f, 0x41, + 0xd6, 0x97, 0xbd, 0xb3, 0x91, 0x56, 0x5d, 0xac, 0xb3, 0xf1, 0xe6, 0xd0, 0xc8, 0xfa, 0x81, 0x7e, + 0x13, 0xb2, 0x6f, 0x0e, 0x49, 0x09, 0x72, 0x87, 0x43, 0xde, 0xcc, 0x10, 0x80, 0xe2, 0x0e, 0x75, + 0x29, 0xa7, 0x4d, 0x4d, 0xef, 0x00, 0xfc, 0x52, 0xe4, 0xe8, 0x96, 0xc5, 0xed, 0x53, 0xc4, 0x03, + 0xfe, 0x60, 0xe0, 0x70, 0x53, 0x81, 0xea, 0xbc, 0x51, 0x96, 0x84, 0x23, 0x01, 0xa4, 0x0b, 0x81, + 0xe5, 0x84, 0x51, 0x2b, 0x20, 0xe7, 0xf7, 0x33, 0xa4, 0x80, 0xfe, 0x27, 0x0d, 0x6a, 0xb8, 0xea, + 0x95, 0x5a, 0xe9, 0x63, 0x28, 0x1c, 0x0b, 0x6d, 0x54, 0xd8, 0xa5, 0xb0, 0xe7, 0x54, 0xdb, 0x97, + 0x19, 0x43, 0x0a, 0x7e, 0x4a, 0x7d, 0x9f, 0xb6, 0xe4, 0x13, 0xa8, 0x2b, 0x1d, 0x55, 0xb8, 0x3e, + 0x4c, 0x36, 0xab, 0xcb, 0x42, 0x6c, 0x1d, 0x0a, 0x42, 0xd5, 0x39, 0x5d, 0x51, 0xca, 0x08, 0x60, + 0x61, 0x58, 0x67, 0x31, 0x2b, 0x37, 0x21, 0xc7, 0xb9, 0xab, 0xec, 0x2b, 0x3e, 0x3f, 0xde, 0xb4, + 0xa4, 0x01, 0xd9, 0x49, 0xc7, 0xc8, 0x72, 0xa6, 0x7f, 0xa3, 0xc1, 0x42, 0xb4, 0xfa, 0x95, 0xac, + 0xfd, 0x24, 0x69, 0xed, 0x5b, 0xe9, 0x24, 0x3d, 0xfb, 0xaf, 0x19, 0xfc, 0xd7, 0xd0, 0x9c, 0x6a, + 0xfa, 0x3f, 0xb6, 0xf9, 0x5f, 0x34, 0x58, 0xda, 0x19, 0x06, 0xae, 0x63, 0x5b, 0x9c, 0xee, 0x50, + 0x4e, 0xed, 0x2b, 0x81, 0x9f, 0x5b, 0x50, 0xc1, 0x1b, 0x8c, 0x80, 0xb3, 0x2a, 0xf3, 0xca, 0x48, + 0xd8, 0xa7, 0x63, 0x71, 0x95, 0x50, 0xe0, 0x1e, 0x8d, 0x50, 0x33, 0x8a, 0x12, 0xd2, 0x8b, 0x32, + 0x26, 0xe0, 0xaf, 0xef, 0xb9, 0x63, 0xac, 0x41, 0x65, 0xa3, 0xd4, 0xa7, 0xe3, 0x37, 0x9e, 0x3b, + 0x26, 0x3a, 0xd4, 0x07, 0x8e, 0x67, 0x4e, 0x93, 0x4c, 0x16, 0xa3, 0xea, 0xc0, 0xf1, 0xb6, 0x55, + 0x9e, 0xe9, 0x07, 0x50, 0xdc, 0x1f, 0x7d, 0x52, 0x19, 0x48, 0xa4, 0x6d, 0x2e, 0x99, 0xb6, 0xfa, + 0x9f, 0x35, 0x58, 0x3e, 0x67, 0x0a, 0x65, 0xfe, 0x1f, 0x4e, 0xef, 0x35, 0x97, 0xc0, 0xb4, 0xe8, + 0x4a, 0x83, 0x6e, 0x78, 0x0c, 0x15, 0xbc, 0xce, 0xc4, 0x1a, 0xc3, 0x4c, 0xaf, 0x09, 0x13, 0xc8, + 0x19, 0x6b, 0x51, 0x70, 0xe7, 0xd0, 0x71, 0x8b, 0x49, 0x69, 0x79, 0xd4, 0xa8, 0x72, 0xfc, 0x2b, + 0x07, 0xc5, 0xfd, 0xb7, 0xd1, 0xb5, 0x10, 0x41, 0x8d, 0x16, 0x03, 0x35, 0xf7, 0xa1, 0x86, 0x9d, + 0xc2, 0xf4, 0x7b, 0x3d, 0x46, 0x39, 0x5e, 0x73, 0xf2, 0x46, 0x15, 0x69, 0x6f, 0x90, 0x14, 0xab, + 0xf3, 0xd9, 0x44, 0x9d, 0x9f, 0x4c, 0x55, 0xdc, 0x5a, 0x6c, 0xea, 0x2b, 0x29, 0xd2, 0x80, 0xac, + 0xdd, 0x53, 0x77, 0xff, 0xac, 0xdd, 0x13, 0x66, 0x75, 0x98, 0xd9, 0xc5, 0x52, 0xa9, 0x1c, 0x59, + 0x76, 0x98, 0x2c, 0x9d, 0xc2, 0xc9, 0x32, 0x34, 0x78, 0x74, 0x1d, 0x2b, 0xe1, 0xf8, 0x88, 0x91, + 0x3b, 0x20, 0xb0, 0x1c, 0xf6, 0xcf, 0x89, 0x87, 0x2b, 0x8a, 0x72, 0xc4, 0x92, 0x41, 0x55, 0xbc, + 0x38, 0xa8, 0x4a, 0x89, 0xa0, 0x5a, 0x82, 0x22, 0x3b, 0xb5, 0x36, 0x7f, 0xf4, 0x14, 0xef, 0x8f, + 0x35, 0x43, 0x8d, 0xc4, 0x15, 0x53, 0xae, 0xc6, 0x3c, 0x2b, 0x60, 0xa7, 0x3e, 0x2a, 0x24, 0xaf, + 0x8f, 0x0b, 0xc8, 0xe8, 0x28, 0xfa, 0x11, 0x23, 0x5b, 0xd0, 0xb4, 0xfd, 0x41, 0x10, 0x52, 0x26, + 0x6e, 0x7f, 0x12, 0xca, 0xd4, 0xb1, 0x79, 0x2c, 0x4f, 0x00, 0xd0, 0x94, 0x8f, 0x00, 0x66, 0xc1, + 0x4e, 0x12, 0x88, 0x01, 0x8b, 0x3d, 0xc7, 0xa5, 0xe6, 0xf4, 0x89, 0x47, 0x02, 0x29, 0x89, 0xe5, + 0xee, 0x6d, 0x24, 0x9e, 0x7e, 0x7e, 0xea, 0xb8, 0x74, 0x77, 0x42, 0x40, 0x58, 0x45, 0x7a, 0xe7, + 0x68, 0xfa, 0x3f, 0x73, 0x50, 0x7b, 0x1e, 0x04, 0xee, 0x38, 0xca, 0xd1, 0xd5, 0x44, 0x05, 0x4b, + 0x47, 0xcc, 0x5b, 0xd9, 0x93, 0xb1, 0x7c, 0xad, 0x45, 0x55, 0xa1, 0x36, 0x33, 0xb8, 0xde, 0xc6, + 0x8a, 0xc2, 0x39, 0x48, 0x9c, 0xbd, 0x02, 0x24, 0xfe, 0x09, 0xd4, 0x93, 0x58, 0xb8, 0x3e, 0x0f, + 0x0b, 0xd7, 0xc2, 0x38, 0x0a, 0x9e, 0x05, 0x62, 0x0b, 0x33, 0x41, 0xec, 0x0c, 0xbc, 0x9c, 0xfb, + 0x24, 0xbc, 0x1c, 0x2b, 0x74, 0xf9, 0x79, 0x85, 0x2e, 0x85, 0x8a, 0xab, 0x1f, 0x85, 0x8a, 0xbf, + 0x82, 0xea, 0xc0, 0x62, 0xe2, 0x66, 0xde, 0xa7, 0x63, 0xd6, 0x6a, 0xa0, 0x25, 0x96, 0x93, 0x11, + 0x70, 0x80, 0x02, 0xfb, 0x74, 0x6c, 0xc0, 0x20, 0xfa, 0x64, 0x7a, 0x1f, 0xea, 0xca, 0xdf, 0x57, + 0x85, 0x8a, 0x93, 0xc6, 0x91, 0x9d, 0xd7, 0x38, 0xf4, 0xcf, 0xa1, 0xb6, 0xed, 0x52, 0x2b, 0x8c, + 0x82, 0x6b, 0x09, 0x8a, 0xb1, 0xf7, 0x8b, 0x8a, 0xa1, 0x46, 0xfa, 0xd7, 0x50, 0x57, 0x72, 0x9f, + 0xdc, 0x9c, 0xd6, 0x1e, 0x00, 0x4c, 0x1f, 0xc5, 0x04, 0xc0, 0x7a, 0xed, 0x87, 0x03, 0xcb, 0x95, + 0x60, 0x4b, 0xbe, 0x1a, 0x36, 0xb5, 0xb5, 0x47, 0x70, 0x7d, 0xc6, 0x25, 0x41, 0x88, 0xbc, 0xa2, + 0x27, 0x96, 0x3d, 0x6e, 0x66, 0x48, 0x0d, 0xca, 0xc2, 0x42, 0x81, 0x65, 0xd3, 0xa6, 0xb6, 0xf9, + 0xef, 0x32, 0x54, 0xe4, 0xec, 0x4e, 0xe7, 0x88, 0xfc, 0x3c, 0xb1, 0xc9, 0xdd, 0x0b, 0xdf, 0xe4, + 0xe4, 0xd2, 0xed, 0x7b, 0x17, 0x0b, 0x28, 0xb8, 0x99, 0x21, 0x2f, 0xa1, 0xa4, 0x5e, 0xfe, 0xc8, + 0xed, 0xa4, 0x78, 0xf2, 0x89, 0xb0, 0x7d, 0xe7, 0x02, 0xee, 0x64, 0xa5, 0x17, 0x50, 0x94, 0x2f, + 0x1c, 0x24, 0x05, 0x21, 0x12, 0x8f, 0x2a, 0xed, 0xdb, 0xb3, 0x99, 0xd1, 0x32, 0xab, 0x1a, 0xd9, + 0x85, 0xa2, 0x7c, 0x45, 0x48, 0x2f, 0x94, 0x78, 0xc3, 0x48, 0x2f, 0x94, 0x7c, 0x78, 0x90, 0x27, + 0x53, 0xf7, 0xf8, 0xf4, 0xc9, 0x92, 0x4f, 0x0d, 0xe9, 0x93, 0xa5, 0x2f, 0xff, 0x19, 0x12, 0xc2, + 0x8d, 0x99, 0xa8, 0x9d, 0xac, 0xa5, 0x0c, 0x7c, 0xc9, 0xdd, 0xa0, 0xbd, 0xfe, 0x51, 0xb2, 0x93, + 0x3d, 0xf7, 0xa1, 0x1c, 0xf1, 0xc9, 0x9d, 0x4b, 0xaf, 0x99, 0xed, 0x95, 0x8b, 0xd8, 0x93, 0xc5, + 0x76, 0xa0, 0x80, 0xa8, 0x8b, 0xb4, 0x67, 0x40, 0xe9, 0x68, 0x99, 0x5b, 0x33, 0x79, 0x31, 0xbf, + 0x1c, 0x40, 0x39, 0x82, 0x6f, 0x69, 0x95, 0x52, 0x00, 0x34, 0xad, 0x52, 0x1a, 0xf5, 0xe1, 0x72, + 0x6f, 0xa0, 0x1a, 0x7b, 0x99, 0x22, 0xa9, 0x60, 0x3d, 0xff, 0x68, 0x35, 0xd7, 0xe1, 0xc7, 0xb0, + 0x90, 0x82, 0x39, 0xe4, 0x41, 0xca, 0x34, 0x33, 0x01, 0x61, 0xfb, 0xb3, 0x39, 0x52, 0xd1, 0x0e, + 0x8f, 0x35, 0xb2, 0x05, 0x05, 0xac, 0x5b, 0x69, 0x4b, 0xc6, 0x9b, 0x57, 0xda, 0x92, 0x89, 0x42, + 0x87, 0x89, 0x02, 0x58, 0x66, 0x44, 0x6f, 0x64, 0xe9, 0x85, 0xe2, 0x85, 0x2a, 0xbd, 0x50, 0xa2, + 0x38, 0xe9, 0x19, 0x62, 0x43, 0x33, 0xfd, 0xb7, 0x04, 0x49, 0x9d, 0xe5, 0x82, 0x7f, 0x52, 0xda, + 0x9f, 0xcf, 0x13, 0x8b, 0x36, 0xd9, 0xda, 0xfc, 0xfe, 0x9b, 0xb2, 0xf6, 0xed, 0xfb, 0x15, 0xed, + 0xbb, 0xf7, 0x2b, 0xda, 0xdf, 0xdf, 0xaf, 0x68, 0xbf, 0xfb, 0xb0, 0x92, 0xf9, 0xc3, 0x87, 0x95, + 0xcc, 0x77, 0x1f, 0x56, 0x32, 0xdf, 0x7f, 0x58, 0xc9, 0x40, 0xd3, 0x0f, 0x4f, 0x36, 0xb8, 0xd3, + 0x1f, 0x6d, 0xf4, 0x47, 0xf8, 0x1f, 0xce, 0x71, 0x11, 0x7f, 0x9e, 0xfc, 0x27, 0x00, 0x00, 0xff, + 0xff, 0xad, 0x9b, 0x4c, 0x26, 0x61, 0x1a, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3756,6 +3778,16 @@ func (m *RewriteRule) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.IgnoreBeforeTimestamp != 0 { + i = encodeVarintImportSstpb(dAtA, i, uint64(m.IgnoreBeforeTimestamp)) + i-- + dAtA[i] = 0x28 + } + if m.IgnoreAfterTimestamp != 0 { + i = encodeVarintImportSstpb(dAtA, i, uint64(m.IgnoreAfterTimestamp)) + i-- + dAtA[i] = 0x20 + } if m.NewTimestamp != 0 { i = encodeVarintImportSstpb(dAtA, i, uint64(m.NewTimestamp)) i-- @@ -5508,6 +5540,12 @@ func (m *RewriteRule) Size() (n int) { if m.NewTimestamp != 0 { n += 1 + sovImportSstpb(uint64(m.NewTimestamp)) } + if m.IgnoreAfterTimestamp != 0 { + n += 1 + sovImportSstpb(uint64(m.IgnoreAfterTimestamp)) + } + if m.IgnoreBeforeTimestamp != 0 { + n += 1 + sovImportSstpb(uint64(m.IgnoreBeforeTimestamp)) + } return n } @@ -7216,6 +7254,44 @@ func (m *RewriteRule) Unmarshal(dAtA []byte) error { break } } + case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field IgnoreAfterTimestamp", wireType) + } + m.IgnoreAfterTimestamp = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowImportSstpb + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.IgnoreAfterTimestamp |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 5: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field IgnoreBeforeTimestamp", wireType) + } + m.IgnoreBeforeTimestamp = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowImportSstpb + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.IgnoreBeforeTimestamp |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipImportSstpb(dAtA[iNdEx:]) diff --git a/proto/import_sstpb.proto b/proto/import_sstpb.proto index aebb3edd3..fb7754e6a 100644 --- a/proto/import_sstpb.proto +++ b/proto/import_sstpb.proto @@ -140,7 +140,12 @@ message SSTMeta { message RewriteRule { bytes old_key_prefix = 1; bytes new_key_prefix = 2; + // (Optional) Rewrite all keys in the range to use this timestamp. uint64 new_timestamp = 3; + // (Optional) Skip keys with timestamps greater than this during download, useful for compacted SST backups. + uint64 ignore_after_timestamp = 4; + // (Optional) Skip write CF keys with timestamps less than this during download. Default CF keys are preserved. + uint64 ignore_before_timestamp = 5; } message UploadRequest { diff --git a/scripts/proto.lock b/scripts/proto.lock index 1c134a50b..96dc19f50 100644 --- a/scripts/proto.lock +++ b/scripts/proto.lock @@ -7676,6 +7676,16 @@ "id": 3, "name": "new_timestamp", "type": "uint64" + }, + { + "id": 4, + "name": "ignore_after_timestamp", + "type": "uint64" + }, + { + "id": 5, + "name": "ignore_before_timestamp", + "type": "uint64" } ] },