From 6e4b47b2911f9b1301d99b2f7eafe9e1983094e1 Mon Sep 17 00:00:00 2001 From: Martin Martinez Rivera Date: Tue, 21 May 2019 12:24:17 -0700 Subject: [PATCH] Cherry-pick diff snapshot change into release/v1.0 (#3454) --- protos/pb.proto | 8 +- protos/pb/pb.pb.go | 439 ++++++++++++++++++++++++--------------------- worker/draft.go | 13 +- worker/snapshot.go | 14 +- 4 files changed, 266 insertions(+), 208 deletions(-) diff --git a/protos/pb.proto b/protos/pb.proto index fb3c971bedf..8c973827129 100644 --- a/protos/pb.proto +++ b/protos/pb.proto @@ -204,10 +204,12 @@ message Mutations { message Snapshot { RaftContext context = 1; - uint64 index = 2; - uint64 read_ts = 3; + uint64 index = 2; + uint64 read_ts = 3; // done is used to indicate that snapshot stream was a success. - bool done = 4; + bool done = 4; + // since_ts stores the ts of the last snapshot to support diff snap updates. + uint64 since_ts = 5; } message Proposal { diff --git a/protos/pb/pb.pb.go b/protos/pb/pb.pb.go index 683dd9db5b4..5fff1fea418 100644 --- a/protos/pb/pb.pb.go +++ b/protos/pb/pb.pb.go @@ -1641,7 +1641,9 @@ type Snapshot struct { Index uint64 `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty"` ReadTs uint64 `protobuf:"varint,3,opt,name=read_ts,json=readTs,proto3" json:"read_ts,omitempty"` // done is used to indicate that snapshot stream was a success. - Done bool `protobuf:"varint,4,opt,name=done,proto3" json:"done,omitempty"` + Done bool `protobuf:"varint,4,opt,name=done,proto3" json:"done,omitempty"` + // since_ts stores the ts of the last snapshot to support diff snap updates. + SinceTs uint64 `protobuf:"varint,5,opt,name=since_ts,json=sinceTs,proto3" json:"since_ts,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1708,6 +1710,13 @@ func (m *Snapshot) GetDone() bool { return false } +func (m *Snapshot) GetSinceTs() uint64 { + if m != nil { + return m.SinceTs + } + return 0 +} + type Proposal struct { Mutations *Mutations `protobuf:"bytes,2,opt,name=mutations,proto3" json:"mutations,omitempty"` Kv []*pb.KV `protobuf:"bytes,4,rep,name=kv,proto3" json:"kv,omitempty"` @@ -3551,210 +3560,211 @@ func init() { func init() { proto.RegisterFile("pb.proto", fileDescriptor_f80abaa17e25ccc8) } var fileDescriptor_f80abaa17e25ccc8 = []byte{ - // 3239 bytes of a gzipped FileDescriptorProto + // 3255 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x39, 0x4d, 0x73, 0x1b, 0x47, 0x76, 0x9a, 0x01, 0x30, 0x98, 0x79, 0x00, 0x29, 0xb8, 0x25, 0xcb, 0x30, 0x6d, 0x53, 0xf4, 0x58, 0xb2, 0x28, 0xc9, 0xa2, 0x64, 0xda, 0x49, 0x2c, 0xa7, 0x72, 0xa0, 0x48, 0x48, 0xa1, 0xcd, 0xaf, 0x34, 0x40, 0x39, 0x71, 0xa5, 0x82, 0x6a, 0xcc, 0x34, 0xc1, 0x09, 0x07, 0x33, 0x93, 0xe9, 0x01, - 0x03, 0xea, 0x96, 0x43, 0x0e, 0xf9, 0x07, 0x3e, 0xa4, 0x72, 0xcb, 0x25, 0x97, 0x5c, 0x7d, 0xde, - 0xaa, 0xad, 0xda, 0xe3, 0x5e, 0xf7, 0xb6, 0xa5, 0xdd, 0xcb, 0xfe, 0x84, 0xbd, 0x6d, 0xf5, 0xeb, - 0x9e, 0x0f, 0x40, 0x94, 0x64, 0x6f, 0xd5, 0x9e, 0xd0, 0xef, 0x6b, 0xba, 0xfb, 0xf5, 0xfb, 0x06, - 0xd8, 0xc9, 0x68, 0x23, 0x49, 0xe3, 0x2c, 0x26, 0x66, 0x32, 0x5a, 0x71, 0x58, 0x12, 0x28, 0x70, - 0xe5, 0xce, 0x38, 0xc8, 0x4e, 0xa7, 0xa3, 0x0d, 0x2f, 0x9e, 0x3c, 0xf4, 0xc7, 0x29, 0x4b, 0x4e, - 0x1f, 0x04, 0xf1, 0xc3, 0x11, 0xf3, 0xc7, 0x3c, 0x7d, 0x98, 0x8c, 0x1e, 0xe6, 0x72, 0xee, 0x0a, - 0xd4, 0xf7, 0x02, 0x91, 0x11, 0x02, 0xf5, 0x69, 0xe0, 0x8b, 0xae, 0xb1, 0x56, 0x5b, 0xb7, 0x28, - 0xae, 0xdd, 0x7d, 0x70, 0x06, 0x4c, 0x9c, 0x3d, 0x67, 0xe1, 0x94, 0x93, 0x0e, 0xd4, 0xce, 0x59, - 0xd8, 0x35, 0xd6, 0x8c, 0xf5, 0x36, 0x95, 0x4b, 0xb2, 0x01, 0xf6, 0x39, 0x0b, 0x87, 0xd9, 0x45, - 0xc2, 0xbb, 0xe6, 0x9a, 0xb1, 0xbe, 0xbc, 0x79, 0x6d, 0x23, 0x19, 0x6d, 0x1c, 0xc5, 0x22, 0x0b, - 0xa2, 0xf1, 0xc6, 0x73, 0x16, 0x0e, 0x2e, 0x12, 0x4e, 0x9b, 0xe7, 0x6a, 0xe1, 0x1e, 0x42, 0xab, - 0x9f, 0x7a, 0x4f, 0xa7, 0x91, 0x97, 0x05, 0x71, 0x24, 0x77, 0x8c, 0xd8, 0x84, 0xe3, 0x17, 0x1d, - 0x8a, 0x6b, 0x89, 0x63, 0xe9, 0x58, 0x74, 0x6b, 0x6b, 0x35, 0x89, 0x93, 0x6b, 0xd2, 0x85, 0x66, - 0x20, 0xb6, 0xe3, 0x69, 0x94, 0x75, 0xeb, 0x6b, 0xc6, 0xba, 0x4d, 0x73, 0xd0, 0xfd, 0xaf, 0x1a, - 0x34, 0xfe, 0x61, 0xca, 0xd3, 0x0b, 0x94, 0xcb, 0xb2, 0x34, 0xff, 0x96, 0x5c, 0x93, 0xeb, 0xd0, - 0x08, 0x59, 0x34, 0x16, 0x5d, 0x13, 0x3f, 0xa6, 0x00, 0xf2, 0x01, 0x38, 0xec, 0x24, 0xe3, 0xe9, - 0x70, 0x1a, 0xf8, 0xdd, 0xda, 0x9a, 0xb1, 0x6e, 0x51, 0x1b, 0x11, 0xc7, 0x81, 0x4f, 0xde, 0x07, - 0xdb, 0x8f, 0x87, 0x5e, 0x75, 0x2f, 0x3f, 0xc6, 0xbd, 0xc8, 0x27, 0x60, 0x4f, 0x03, 0x7f, 0x18, - 0x06, 0x22, 0xeb, 0x36, 0xd6, 0x8c, 0xf5, 0xd6, 0xa6, 0x2d, 0x2f, 0x2b, 0x75, 0x47, 0x9b, 0xd3, - 0xc0, 0x47, 0x25, 0xde, 0x03, 0x5b, 0xa4, 0xde, 0xf0, 0x64, 0x1a, 0x79, 0x5d, 0x0b, 0x99, 0xae, - 0x4a, 0xa6, 0xca, 0xad, 0x69, 0x53, 0x28, 0x40, 0x5e, 0x2b, 0xe5, 0xe7, 0x3c, 0x15, 0xbc, 0xdb, - 0x54, 0x5b, 0x69, 0x90, 0x3c, 0x82, 0xd6, 0x09, 0xf3, 0x78, 0x36, 0x4c, 0x58, 0xca, 0x26, 0x5d, - 0xbb, 0xfc, 0xd0, 0x53, 0x89, 0x3e, 0x92, 0x58, 0x41, 0xe1, 0xa4, 0x00, 0xc8, 0x17, 0xb0, 0x84, - 0x90, 0x18, 0x9e, 0x04, 0x61, 0xc6, 0xd3, 0xae, 0x83, 0x32, 0xcb, 0x28, 0x83, 0x98, 0x41, 0xca, - 0x39, 0x6d, 0x2b, 0x26, 0x85, 0x21, 0x1f, 0x01, 0xf0, 0x59, 0xc2, 0x22, 0x7f, 0xc8, 0xc2, 0xb0, - 0x0b, 0x78, 0x06, 0x47, 0x61, 0xb6, 0xc2, 0x90, 0xbc, 0x27, 0xcf, 0xc7, 0xfc, 0x61, 0x26, 0xba, - 0x4b, 0x6b, 0xc6, 0x7a, 0x9d, 0x5a, 0x12, 0x1c, 0x08, 0xa9, 0x57, 0x8f, 0x79, 0xa7, 0xbc, 0xbb, - 0xbc, 0x66, 0xac, 0x37, 0xa8, 0x02, 0xdc, 0x4d, 0x70, 0xd0, 0x4e, 0x50, 0x0f, 0xb7, 0xc1, 0x3a, - 0x97, 0x80, 0x32, 0xa7, 0xd6, 0xe6, 0x92, 0x3c, 0x48, 0x61, 0x4a, 0x54, 0x13, 0xdd, 0x55, 0xb0, - 0xf7, 0x58, 0x34, 0xce, 0xed, 0x4f, 0x3e, 0x10, 0x0a, 0x38, 0x14, 0xd7, 0xee, 0x0f, 0x26, 0x58, - 0x94, 0x8b, 0x69, 0x98, 0x91, 0x3b, 0x00, 0x52, 0xfd, 0x13, 0x96, 0xa5, 0xc1, 0x4c, 0x7f, 0xb5, - 0x7c, 0x00, 0x67, 0x1a, 0xf8, 0xfb, 0x48, 0x22, 0x8f, 0xa0, 0x8d, 0x5f, 0xcf, 0x59, 0xcd, 0xf2, - 0x00, 0xc5, 0xf9, 0x68, 0x0b, 0x59, 0xb4, 0xc4, 0x0d, 0xb0, 0xf0, 0xc5, 0x95, 0xd5, 0x2d, 0x51, - 0x0d, 0x91, 0xdb, 0xb0, 0x1c, 0x44, 0x99, 0x7c, 0x11, 0x2f, 0x1b, 0xfa, 0x5c, 0xe4, 0x26, 0xb1, - 0x54, 0x60, 0x77, 0xb8, 0xc8, 0xc8, 0xe7, 0xa0, 0xd4, 0x9a, 0x6f, 0xd8, 0xc0, 0x0d, 0x97, 0x8b, - 0xe7, 0x12, 0x6a, 0x47, 0xe4, 0xd1, 0x3b, 0x3e, 0x80, 0x96, 0xbc, 0x5f, 0x2e, 0x61, 0xa1, 0x44, - 0x1b, 0x6f, 0xa3, 0xd5, 0x41, 0x41, 0x32, 0x68, 0x76, 0xa9, 0x1a, 0x69, 0x76, 0xca, 0x4c, 0x70, - 0xed, 0xf6, 0xa0, 0x71, 0x98, 0xfa, 0x3c, 0xbd, 0xd4, 0xf2, 0x09, 0xd4, 0x7d, 0x2e, 0x3c, 0x74, - 0x4a, 0x9b, 0xe2, 0xba, 0xf4, 0x86, 0x5a, 0xc5, 0x1b, 0xdc, 0xff, 0x31, 0xa0, 0xd5, 0x8f, 0xd3, - 0x6c, 0x9f, 0x0b, 0xc1, 0xc6, 0x9c, 0xdc, 0x84, 0x46, 0x2c, 0x3f, 0xab, 0x35, 0xec, 0xc8, 0x33, - 0xe1, 0x3e, 0x54, 0xe1, 0x17, 0xde, 0xc1, 0x7c, 0xfd, 0x3b, 0x48, 0x2b, 0x41, 0x3f, 0xaa, 0x69, - 0x2b, 0x41, 0x2f, 0xba, 0x01, 0x56, 0x7c, 0x72, 0x22, 0xb8, 0xd2, 0x65, 0x83, 0x6a, 0xe8, 0xb5, - 0xc6, 0xe6, 0xfe, 0x15, 0x80, 0x3c, 0xdf, 0xcf, 0xb4, 0x02, 0xf7, 0x14, 0x5a, 0x94, 0x9d, 0x64, - 0xdb, 0x71, 0x94, 0xf1, 0x59, 0x46, 0x96, 0xc1, 0x0c, 0x7c, 0x54, 0x91, 0x45, 0xcd, 0xc0, 0x97, - 0x87, 0x1b, 0xa7, 0xf1, 0x34, 0x41, 0x0d, 0x2d, 0x51, 0x05, 0xa0, 0x2a, 0x7d, 0x3f, 0xc5, 0x13, - 0x4b, 0x55, 0xfa, 0x7e, 0x4a, 0x6e, 0x42, 0x4b, 0x44, 0x2c, 0x11, 0xa7, 0x71, 0x26, 0x0f, 0x57, - 0xc7, 0xc3, 0x41, 0x8e, 0x1a, 0x08, 0xf7, 0x97, 0x06, 0x58, 0xfb, 0x7c, 0x32, 0xe2, 0xe9, 0x2b, - 0xbb, 0xbc, 0x0f, 0x36, 0x7e, 0x78, 0x18, 0xf8, 0x7a, 0xa3, 0x26, 0xc2, 0xbb, 0xfe, 0xa5, 0x5b, - 0xdd, 0x00, 0x2b, 0xe4, 0x4c, 0x2a, 0x5f, 0xd9, 0x99, 0x86, 0xa4, 0x6e, 0xd8, 0x64, 0xe8, 0x73, - 0xe6, 0x63, 0xe0, 0xb1, 0xa9, 0xc5, 0x26, 0x3b, 0x9c, 0xf9, 0xf2, 0x6c, 0x21, 0x13, 0xd9, 0x70, - 0x9a, 0xf8, 0x2c, 0xe3, 0x18, 0x70, 0xea, 0xd2, 0x70, 0x44, 0x76, 0x8c, 0x18, 0x72, 0x0f, 0xde, - 0xf1, 0xc2, 0xa9, 0x90, 0xd1, 0x2e, 0x88, 0x4e, 0xe2, 0x61, 0x1c, 0x85, 0x17, 0xa8, 0x5f, 0x9b, - 0x5e, 0xd5, 0x84, 0xdd, 0xe8, 0x24, 0x3e, 0x8c, 0xc2, 0x0b, 0xf7, 0x47, 0x13, 0x1a, 0xcf, 0x50, - 0x0d, 0x8f, 0xa0, 0x39, 0xc1, 0x0b, 0xe5, 0xde, 0x7b, 0x43, 0x6a, 0x18, 0x69, 0x1b, 0xea, 0xa6, - 0xa2, 0x17, 0x65, 0xe9, 0x05, 0xcd, 0xd9, 0xa4, 0x44, 0xc6, 0x46, 0x21, 0xcf, 0x84, 0xb6, 0x88, - 0x8a, 0xc4, 0x40, 0x11, 0xb4, 0x84, 0x66, 0x5b, 0x54, 0x6b, 0x6d, 0x51, 0xad, 0x64, 0x05, 0x6c, - 0xef, 0x94, 0x7b, 0x67, 0x62, 0x3a, 0xd1, 0x4a, 0x2f, 0xe0, 0x95, 0xa7, 0xd0, 0xae, 0x9e, 0x43, - 0x66, 0xa6, 0x33, 0x7e, 0x81, 0x8a, 0xaf, 0x53, 0xb9, 0x24, 0x6b, 0xd0, 0x40, 0x0f, 0x47, 0xb5, - 0xb7, 0x36, 0x41, 0x1e, 0x47, 0x89, 0x50, 0x45, 0xf8, 0xda, 0xfc, 0xca, 0x90, 0xdf, 0xa9, 0x9e, - 0xae, 0xfa, 0x1d, 0xe7, 0xf5, 0xdf, 0x51, 0x22, 0x95, 0xef, 0xb8, 0x7f, 0x34, 0xa1, 0xfd, 0x3d, - 0x4f, 0xe3, 0xa3, 0x34, 0x4e, 0x62, 0xc1, 0x42, 0xb2, 0x35, 0x7f, 0x3b, 0xa5, 0xc5, 0x35, 0x29, - 0x5c, 0x65, 0xdb, 0xe8, 0x17, 0xd7, 0x55, 0xda, 0xa9, 0xde, 0xdf, 0x05, 0x4b, 0x69, 0xf7, 0x92, - 0x2b, 0x68, 0x8a, 0xe4, 0x51, 0xfa, 0x44, 0xfd, 0xcd, 0x1f, 0x4f, 0x53, 0xc8, 0x2a, 0xc0, 0x84, - 0xcd, 0xf6, 0x38, 0x13, 0x7c, 0xd7, 0xcf, 0xcd, 0xb7, 0xc4, 0x48, 0x3d, 0x4f, 0xd8, 0x6c, 0x30, - 0x8b, 0x06, 0x02, 0xad, 0xab, 0x4e, 0x0b, 0x98, 0x7c, 0x08, 0xce, 0x84, 0xcd, 0xa4, 0x1f, 0xed, - 0xfa, 0xda, 0xba, 0x4a, 0x04, 0xf9, 0x18, 0x6a, 0xd9, 0x2c, 0xc2, 0xa0, 0x24, 0xb3, 0x93, 0x2c, - 0x3d, 0x06, 0xb3, 0x48, 0x7b, 0x1c, 0x95, 0xb4, 0x5c, 0xa1, 0x76, 0xa9, 0xd0, 0x0e, 0xd4, 0xbc, - 0xc0, 0xc7, 0xf4, 0xe4, 0x50, 0xb9, 0x5c, 0xf9, 0x3b, 0xb8, 0xba, 0xa0, 0x87, 0xea, 0x3b, 0x2c, - 0x29, 0xb1, 0xeb, 0xd5, 0x77, 0xa8, 0x57, 0x75, 0xff, 0x63, 0x0d, 0xae, 0x6a, 0x63, 0x38, 0x0d, - 0x92, 0x7e, 0x26, 0xcd, 0xbe, 0x0b, 0x4d, 0x8c, 0x36, 0x3c, 0xd5, 0x36, 0x91, 0x83, 0xe4, 0x6f, - 0xc0, 0x42, 0x0f, 0xcc, 0xed, 0xf4, 0x66, 0xa9, 0xd5, 0x42, 0x5c, 0xd9, 0xad, 0x7e, 0x12, 0xcd, - 0x4e, 0xbe, 0x84, 0xc6, 0x0b, 0x9e, 0xc6, 0x2a, 0x7a, 0xb6, 0x36, 0x57, 0x2f, 0x93, 0x93, 0x6f, - 0xab, 0xc5, 0x14, 0xf3, 0x5f, 0x50, 0xf9, 0xb7, 0x64, 0xbc, 0x9c, 0xc4, 0xe7, 0xdc, 0xef, 0x36, - 0xf1, 0x44, 0x55, 0xfb, 0xc8, 0x49, 0xb9, 0xb6, 0xed, 0x52, 0xdb, 0x3b, 0xd0, 0xaa, 0x5c, 0xef, - 0x12, 0x4d, 0xdf, 0x9c, 0xb7, 0x78, 0xa7, 0x70, 0xe4, 0xaa, 0xe3, 0xec, 0x00, 0x94, 0x97, 0xfd, - 0x73, 0xdd, 0xcf, 0xfd, 0x0f, 0x03, 0xae, 0x6e, 0xc7, 0x51, 0xc4, 0xb1, 0x30, 0x52, 0x4f, 0x57, - 0x9a, 0xbd, 0xf1, 0x5a, 0xb3, 0xbf, 0x0b, 0x0d, 0x21, 0x99, 0xf5, 0xd7, 0xaf, 0x5d, 0xf2, 0x16, - 0x54, 0x71, 0xc8, 0x30, 0x33, 0x61, 0xb3, 0x61, 0xc2, 0x23, 0x3f, 0x88, 0xc6, 0x79, 0x98, 0x99, - 0xb0, 0xd9, 0x91, 0xc2, 0xb8, 0xff, 0x69, 0x80, 0xa5, 0x3c, 0x66, 0x2e, 0x5a, 0x1b, 0xf3, 0xd1, - 0xfa, 0x43, 0x70, 0x92, 0x94, 0xfb, 0x81, 0x97, 0xef, 0xea, 0xd0, 0x12, 0x21, 0x8d, 0xf3, 0x24, - 0x4e, 0x3d, 0x8e, 0x9f, 0xb7, 0xa9, 0x02, 0x24, 0x56, 0x24, 0xcc, 0x53, 0xc5, 0x5d, 0x8d, 0x2a, - 0x40, 0xc6, 0x78, 0xf5, 0x38, 0xf8, 0x28, 0x36, 0xd5, 0x90, 0xfb, 0x7f, 0x26, 0xb4, 0x77, 0x82, - 0x94, 0x7b, 0x19, 0xf7, 0x7b, 0xfe, 0x18, 0x19, 0x79, 0x94, 0x05, 0xd9, 0x85, 0xce, 0x27, 0x1a, - 0x2a, 0xd2, 0xbd, 0x39, 0x5f, 0xe8, 0x2a, 0x75, 0xd7, 0xb0, 0x36, 0x57, 0x00, 0xd9, 0x04, 0x50, - 0x85, 0x10, 0xd6, 0xe7, 0xf5, 0xd7, 0xd7, 0xe7, 0x0e, 0xb2, 0xc9, 0xa5, 0xd4, 0x81, 0x92, 0x09, - 0x54, 0xae, 0xb1, 0xb0, 0x78, 0x9f, 0x4a, 0x5b, 0xc5, 0xfa, 0x61, 0xc4, 0x43, 0xb4, 0x45, 0xac, - 0x1f, 0x46, 0x3c, 0x2c, 0xaa, 0xb6, 0xa6, 0x3a, 0x8e, 0x5c, 0x93, 0x4f, 0xc0, 0x8c, 0x13, 0xbc, - 0x9f, 0xde, 0xb0, 0x7a, 0xb1, 0x8d, 0xc3, 0x84, 0x9a, 0x71, 0x22, 0x1f, 0x5a, 0x15, 0xa3, 0x5d, - 0x47, 0xdb, 0xaf, 0x0c, 0x20, 0x58, 0x30, 0x51, 0x4d, 0x71, 0x6f, 0x80, 0x79, 0x98, 0x90, 0x26, - 0xd4, 0xfa, 0xbd, 0x41, 0xe7, 0x8a, 0x5c, 0xec, 0xf4, 0xf6, 0x3a, 0x86, 0xfb, 0xd2, 0x00, 0x67, - 0x7f, 0x9a, 0x31, 0x69, 0x36, 0xe2, 0x4d, 0xef, 0xf6, 0x3e, 0xd8, 0x22, 0x63, 0x29, 0x06, 0x61, - 0x15, 0x39, 0x9a, 0x08, 0x0f, 0x04, 0xf9, 0x14, 0x1a, 0xdc, 0x1f, 0xf3, 0xdc, 0xa1, 0x3b, 0x8b, - 0xe7, 0xa4, 0x8a, 0x4c, 0xd6, 0xc1, 0x12, 0xde, 0x29, 0x9f, 0xb0, 0x6e, 0xbd, 0x64, 0xec, 0x23, - 0x46, 0x25, 0x59, 0xaa, 0xe9, 0xd8, 0x3b, 0xa4, 0x71, 0x82, 0xc5, 0x74, 0x43, 0xf7, 0x0e, 0x69, - 0x9c, 0xc8, 0x52, 0x7a, 0x13, 0xde, 0x0d, 0xc6, 0x51, 0x9c, 0xf2, 0x61, 0x10, 0xf9, 0x7c, 0x36, - 0xf4, 0xe2, 0xe8, 0x24, 0x0c, 0xbc, 0x0c, 0x75, 0x69, 0xd3, 0x6b, 0x8a, 0xb8, 0x2b, 0x69, 0xdb, - 0x9a, 0xe4, 0xce, 0xc0, 0xce, 0xe3, 0x22, 0xb9, 0x2b, 0x03, 0x1a, 0xc6, 0x55, 0xed, 0x16, 0xd8, - 0x0c, 0x54, 0x0a, 0x1c, 0x9a, 0xd3, 0xe5, 0x33, 0xe1, 0x1e, 0x79, 0xa4, 0x44, 0xa0, 0x5a, 0x5e, - 0xd5, 0xe6, 0x6a, 0x79, 0x59, 0x29, 0xc6, 0x11, 0xd7, 0x15, 0x07, 0xae, 0xdd, 0xff, 0x36, 0xc1, - 0x2e, 0x52, 0xd9, 0x7d, 0x70, 0x26, 0xb9, 0xaa, 0xb5, 0xc3, 0x61, 0x2d, 0x5d, 0xe8, 0x9f, 0x96, - 0x74, 0x72, 0x03, 0xcc, 0xb3, 0x73, 0xad, 0x28, 0x4b, 0x72, 0x7d, 0xfb, 0x9c, 0x9a, 0x67, 0xe7, - 0xa5, 0xc7, 0x36, 0xde, 0xea, 0xb1, 0x77, 0xe0, 0xaa, 0x17, 0x72, 0x16, 0x0d, 0x4b, 0x87, 0x53, - 0x06, 0xb7, 0x8c, 0xe8, 0xa3, 0xc2, 0xeb, 0x74, 0xd4, 0x69, 0x96, 0xb9, 0xe5, 0x36, 0x34, 0x7c, - 0x1e, 0x66, 0xac, 0xda, 0x30, 0x1d, 0xa6, 0xcc, 0x0b, 0xf9, 0x8e, 0x44, 0x53, 0x45, 0x25, 0xeb, - 0x60, 0xe7, 0x79, 0x56, 0xb7, 0x49, 0x58, 0x79, 0xe7, 0xca, 0xa6, 0x05, 0xb5, 0xd4, 0x25, 0x54, - 0x74, 0xe9, 0x7e, 0x0e, 0xb5, 0x6f, 0x9f, 0xf7, 0xf5, 0x5d, 0x8d, 0x57, 0xee, 0x9a, 0x6b, 0xd4, - 0xac, 0x68, 0xf4, 0x0f, 0x35, 0x68, 0x6a, 0xaf, 0x93, 0xe7, 0x9e, 0x16, 0x55, 0xa2, 0x5c, 0xce, - 0x27, 0xb7, 0xc2, 0x7d, 0xab, 0xcd, 0x75, 0xed, 0xed, 0xcd, 0x35, 0xf9, 0x1a, 0xda, 0x89, 0xa2, - 0x55, 0x1d, 0xfe, 0xbd, 0xaa, 0x8c, 0xfe, 0x45, 0xb9, 0x56, 0x52, 0x02, 0xd2, 0x74, 0xb1, 0x1f, - 0xc9, 0xd8, 0x18, 0x9f, 0xa8, 0x4d, 0x9b, 0x12, 0x1e, 0xb0, 0xf1, 0x6b, 0xdc, 0xfe, 0x27, 0x78, - 0xaf, 0xac, 0x86, 0xe3, 0xa4, 0xdb, 0x46, 0x8f, 0x94, 0x1e, 0x5f, 0x75, 0xc6, 0xa5, 0x79, 0x67, - 0xfc, 0x00, 0x1c, 0x2f, 0x9e, 0x4c, 0x02, 0xa4, 0x2d, 0xeb, 0x6a, 0x0f, 0x11, 0x03, 0xe1, 0xbe, - 0x80, 0xa6, 0xbe, 0x2c, 0x69, 0x41, 0x73, 0xa7, 0xf7, 0x74, 0xeb, 0x78, 0x4f, 0x86, 0x03, 0x00, - 0xeb, 0xc9, 0xee, 0xc1, 0x16, 0xfd, 0xa7, 0x8e, 0x21, 0x43, 0xc3, 0xee, 0xc1, 0xa0, 0x63, 0x12, - 0x07, 0x1a, 0x4f, 0xf7, 0x0e, 0xb7, 0x06, 0x9d, 0x1a, 0xb1, 0xa1, 0xfe, 0xe4, 0xf0, 0x70, 0xaf, - 0x53, 0x27, 0x6d, 0xb0, 0x77, 0xb6, 0x06, 0xbd, 0xc1, 0xee, 0x7e, 0xaf, 0xd3, 0x90, 0xbc, 0xcf, - 0x7a, 0x87, 0x1d, 0x4b, 0x2e, 0x8e, 0x77, 0x77, 0x3a, 0x4d, 0x49, 0x3f, 0xda, 0xea, 0xf7, 0xbf, - 0x3b, 0xa4, 0x3b, 0x1d, 0x5b, 0x7e, 0xb7, 0x3f, 0xa0, 0xbb, 0x07, 0xcf, 0x3a, 0x8e, 0xfb, 0x39, - 0xb4, 0x2a, 0x4a, 0x93, 0x12, 0xb4, 0xf7, 0xb4, 0x73, 0x45, 0x6e, 0xf3, 0x7c, 0x6b, 0xef, 0xb8, - 0xd7, 0x31, 0xc8, 0x32, 0x00, 0x2e, 0x87, 0x7b, 0x5b, 0x07, 0xcf, 0x3a, 0xa6, 0xfb, 0xd7, 0x60, - 0x1f, 0x07, 0xfe, 0x93, 0x30, 0xf6, 0xce, 0xa4, 0x2d, 0x8c, 0x98, 0xe0, 0x3a, 0x35, 0xe2, 0x5a, - 0x06, 0x76, 0xb4, 0x43, 0xa1, 0x9f, 0x5b, 0x43, 0xee, 0x01, 0x34, 0x8f, 0x03, 0xff, 0x88, 0x79, - 0x67, 0xb2, 0x31, 0x1f, 0x49, 0xf9, 0xa1, 0x08, 0x5e, 0x70, 0x1d, 0xd3, 0x1c, 0xc4, 0xf4, 0x83, - 0x17, 0x9c, 0xdc, 0x02, 0x0b, 0x81, 0xbc, 0x88, 0x41, 0xf3, 0xcd, 0xf7, 0xa4, 0x9a, 0xe6, 0x66, - 0xc5, 0xd1, 0xb1, 0xbd, 0xbe, 0x09, 0xf5, 0x84, 0x79, 0x67, 0x3a, 0x7e, 0xb4, 0xb4, 0x88, 0xdc, - 0x8e, 0x22, 0x81, 0xdc, 0x01, 0x5b, 0x9b, 0x44, 0xfe, 0xdd, 0x56, 0xc5, 0x76, 0x68, 0x41, 0x9c, - 0x7f, 0xac, 0xda, 0xc2, 0x63, 0x7d, 0x09, 0x50, 0xce, 0x28, 0x2e, 0x29, 0xa8, 0xaf, 0x43, 0x83, - 0x85, 0x81, 0xbe, 0xbc, 0x43, 0x15, 0xe0, 0x1e, 0x40, 0xab, 0x32, 0xd9, 0x90, 0x96, 0xc2, 0xc2, - 0x70, 0x78, 0xc6, 0x2f, 0x04, 0xca, 0xda, 0xb4, 0xc9, 0xc2, 0xf0, 0x5b, 0x7e, 0x21, 0xc8, 0x2d, - 0x68, 0xa8, 0xa1, 0x88, 0xb9, 0xd0, 0x65, 0xa3, 0x28, 0x55, 0x44, 0xf7, 0x33, 0xb0, 0x54, 0xeb, - 0x5d, 0x31, 0x54, 0xe3, 0xb5, 0x69, 0xe6, 0xb1, 0x3e, 0x33, 0x36, 0xea, 0xe4, 0xbe, 0x1e, 0xbe, - 0x08, 0x35, 0xea, 0x31, 0xca, 0xea, 0x4a, 0x31, 0xe9, 0xb9, 0x0b, 0x32, 0xbb, 0x3b, 0x60, 0xbf, - 0x71, 0x9c, 0xa5, 0x15, 0x60, 0x96, 0x0a, 0xb8, 0x64, 0xc0, 0xe5, 0xfe, 0x2b, 0x40, 0x39, 0xa4, - 0xd1, 0x7e, 0xa3, 0xbe, 0x22, 0xfd, 0xe6, 0x9e, 0xec, 0x84, 0x82, 0xd0, 0x4f, 0x79, 0x34, 0x77, - 0xeb, 0x72, 0xac, 0x53, 0xd0, 0xc9, 0x1a, 0xd4, 0x71, 0xf6, 0x54, 0x2b, 0xe3, 0x5a, 0x31, 0x78, - 0x42, 0x8a, 0x3b, 0x82, 0x25, 0x95, 0xbd, 0x28, 0xff, 0xb7, 0x29, 0x17, 0x6f, 0x2c, 0x7b, 0x56, - 0x01, 0x8a, 0x28, 0x9c, 0x4f, 0xd1, 0x2a, 0x18, 0x69, 0xca, 0x27, 0x01, 0x0f, 0xfd, 0xfc, 0x36, - 0x1a, 0x72, 0xff, 0x16, 0xda, 0xf9, 0x1e, 0xd8, 0xb5, 0xdf, 0x2f, 0x72, 0xa8, 0xd2, 0xa6, 0x6a, - 0x16, 0x14, 0xcb, 0x41, 0xec, 0xf3, 0x27, 0x66, 0xd7, 0xc8, 0xd3, 0xa8, 0xfb, 0x1b, 0x33, 0x97, - 0xd6, 0x4d, 0xec, 0x5c, 0xf1, 0x65, 0x2c, 0x16, 0x5f, 0xf3, 0x55, 0x8e, 0xf9, 0x93, 0xaa, 0x9c, - 0xaf, 0xc0, 0xf1, 0x31, 0xd5, 0x07, 0xe7, 0x79, 0x6c, 0x5d, 0x59, 0x4c, 0xeb, 0xba, 0x18, 0x08, - 0xce, 0x39, 0x2d, 0x99, 0xe5, 0x59, 0xb2, 0xf8, 0x8c, 0x47, 0xc1, 0x0b, 0xec, 0xd2, 0xe5, 0xa5, - 0x4b, 0x44, 0x39, 0xf2, 0x50, 0xe9, 0x5f, 0x8f, 0x3c, 0xf2, 0xe9, 0x8d, 0x55, 0x4e, 0x6f, 0xa4, - 0xe6, 0xa6, 0x89, 0xe0, 0x69, 0x96, 0x97, 0x81, 0x0a, 0x2a, 0xca, 0x29, 0x47, 0xf3, 0xb2, 0x68, - 0xec, 0x3e, 0x06, 0xa7, 0x38, 0x8b, 0x0c, 0x6a, 0x07, 0x87, 0x07, 0x3d, 0x15, 0x82, 0x76, 0x0f, - 0x76, 0x7a, 0xff, 0xd8, 0x31, 0x64, 0x58, 0xa4, 0xbd, 0xe7, 0x3d, 0xda, 0xef, 0x75, 0x4c, 0x19, - 0xbe, 0x76, 0x7a, 0x7b, 0xbd, 0x41, 0xaf, 0x53, 0xfb, 0xa6, 0x6e, 0x37, 0x3b, 0x36, 0xb5, 0xf9, - 0x2c, 0x09, 0x03, 0x2f, 0xc8, 0xdc, 0x63, 0xb0, 0xf7, 0x59, 0xf2, 0x4a, 0xd5, 0xde, 0x2e, 0x7a, - 0xb3, 0xa9, 0x9e, 0x54, 0xe8, 0xcc, 0x74, 0x1b, 0x9a, 0xda, 0xed, 0xb5, 0x45, 0xcd, 0x85, 0x84, - 0x9c, 0x26, 0x8b, 0xe8, 0xeb, 0xfb, 0xf1, 0x39, 0x2f, 0x92, 0xf3, 0x11, 0xbb, 0x08, 0x63, 0xe6, - 0xbf, 0xe5, 0xe9, 0x3e, 0x02, 0x10, 0xf1, 0x34, 0xf5, 0xf8, 0x70, 0x5c, 0x0c, 0x48, 0x1c, 0x85, - 0x79, 0xa6, 0x67, 0xb1, 0x5c, 0x64, 0x48, 0xac, 0x29, 0xc3, 0x94, 0xb0, 0x24, 0xbd, 0x0b, 0x56, - 0x36, 0x8b, 0xca, 0x79, 0x4c, 0x23, 0x93, 0x2d, 0x93, 0xbb, 0x0d, 0xce, 0x60, 0x86, 0x8d, 0xc4, - 0x54, 0xcc, 0xa5, 0x1b, 0xe3, 0x0d, 0xe9, 0xc6, 0x5c, 0x88, 0x60, 0xbf, 0x37, 0xa0, 0x55, 0xa9, - 0x1a, 0xc8, 0xc7, 0x50, 0xcf, 0x66, 0xd1, 0xfc, 0x20, 0x33, 0xdf, 0x84, 0x22, 0x89, 0x7c, 0x0c, - 0x6d, 0xd9, 0x65, 0x30, 0x21, 0x82, 0x71, 0xc4, 0x7d, 0xfd, 0x49, 0xd9, 0x79, 0x6c, 0x69, 0x14, - 0xd9, 0x83, 0xab, 0xca, 0xcb, 0xf2, 0x21, 0x46, 0x5e, 0x78, 0x7e, 0xb2, 0x50, 0xa5, 0xa8, 0x66, - 0x6b, 0x3b, 0xe7, 0x52, 0xed, 0xe4, 0xf2, 0x78, 0x0e, 0xb9, 0xb2, 0x05, 0xd7, 0x2e, 0x61, 0xfb, - 0x59, 0x7d, 0xf3, 0x4d, 0x58, 0x92, 0x7d, 0x66, 0x30, 0xe1, 0x22, 0x63, 0x93, 0x04, 0xd3, 0xb5, - 0x8e, 0x92, 0x75, 0x6a, 0x66, 0xc2, 0xfd, 0x14, 0xda, 0x47, 0x9c, 0xa7, 0x94, 0x8b, 0x24, 0x8e, - 0x54, 0xde, 0x12, 0x78, 0x69, 0x1d, 0x92, 0x35, 0xe4, 0xfe, 0x0b, 0x38, 0xb2, 0x10, 0x7d, 0xc2, - 0x32, 0xef, 0xf4, 0xe7, 0x14, 0xaa, 0x9f, 0x42, 0x33, 0x51, 0x66, 0xa2, 0xcb, 0xca, 0x36, 0x46, - 0x05, 0x6d, 0x3a, 0x34, 0x27, 0xba, 0x14, 0x6a, 0x07, 0xd3, 0x49, 0xf5, 0xdf, 0x87, 0xba, 0xfa, - 0xf7, 0xe1, 0x03, 0x70, 0xb0, 0xa6, 0xc5, 0xa1, 0x96, 0xaa, 0xb6, 0x6c, 0x89, 0x38, 0x8c, 0xc2, - 0x0b, 0x69, 0x79, 0x27, 0x71, 0xfa, 0xef, 0x2c, 0xf5, 0xb9, 0xaf, 0xfb, 0xb2, 0x12, 0xe1, 0x7e, - 0x0f, 0xad, 0xfc, 0x65, 0x76, 0x7d, 0xfc, 0x83, 0x01, 0x4d, 0x63, 0xd7, 0x9f, 0xb3, 0x14, 0xd5, - 0xf4, 0xf0, 0xc8, 0xdf, 0xcd, 0x9f, 0x54, 0x01, 0xf3, 0x3b, 0xeb, 0xbe, 0x3d, 0xdf, 0xd9, 0x7d, - 0x0a, 0xed, 0xbc, 0x94, 0xdc, 0xe7, 0x19, 0x43, 0x63, 0x0b, 0x03, 0x1e, 0x55, 0x0c, 0xd1, 0x56, - 0x88, 0x81, 0x78, 0xc3, 0x84, 0xd0, 0xdd, 0x00, 0x4b, 0x5b, 0x32, 0x81, 0xba, 0x17, 0xfb, 0xca, - 0x81, 0x1a, 0x14, 0xd7, 0x52, 0x1d, 0x13, 0x31, 0xce, 0x13, 0xcb, 0x44, 0x8c, 0xdd, 0x19, 0x2c, - 0x3d, 0x61, 0xde, 0xd9, 0x34, 0xc9, 0x03, 0x7b, 0xa5, 0xe6, 0x37, 0xe6, 0x6a, 0xfe, 0x37, 0x8c, - 0x25, 0xdf, 0x83, 0xe6, 0x34, 0x0a, 0x66, 0x79, 0x66, 0x77, 0xa8, 0x25, 0x41, 0x35, 0x8e, 0x0b, - 0x63, 0x0f, 0xcb, 0x7c, 0xf4, 0x39, 0x87, 0x16, 0xb0, 0xfb, 0xcf, 0xb0, 0xd4, 0x9b, 0x25, 0x38, - 0xa4, 0x7d, 0x6b, 0x4a, 0xa9, 0x1c, 0xca, 0x9c, 0x3b, 0xd4, 0xc2, 0xce, 0xb5, 0x7c, 0xe7, 0xcd, - 0x5f, 0x18, 0x50, 0x97, 0x06, 0x24, 0x3b, 0x91, 0xbf, 0xe7, 0x2c, 0xcd, 0x46, 0x9c, 0x65, 0x64, - 0xce, 0x58, 0x56, 0xe6, 0x20, 0xf7, 0xca, 0x23, 0x83, 0x6c, 0xa8, 0xf9, 0x6f, 0x3e, 0xd6, 0x5e, - 0xca, 0xcd, 0x10, 0xcd, 0x74, 0x91, 0x7f, 0x1d, 0xf9, 0xbf, 0x89, 0x83, 0x68, 0x5b, 0x0d, 0x45, - 0xc9, 0xa2, 0xd9, 0x2e, 0x4a, 0x90, 0x07, 0x60, 0xed, 0x0a, 0xe9, 0x1f, 0xaf, 0xb2, 0x62, 0x87, - 0x58, 0x75, 0x1d, 0xf7, 0xca, 0xe6, 0xff, 0xd7, 0xa0, 0xfe, 0x3d, 0x4f, 0x63, 0xf2, 0x19, 0x34, - 0xf5, 0xc8, 0x83, 0x54, 0x46, 0x1b, 0x2b, 0x98, 0xb1, 0x16, 0x66, 0x21, 0xb8, 0x4b, 0x47, 0x65, - 0xa3, 0xb2, 0x59, 0x22, 0xe5, 0x44, 0xe6, 0x95, 0x43, 0x3d, 0x86, 0x4e, 0x3f, 0x4b, 0x39, 0x9b, - 0x54, 0xd8, 0xe7, 0x15, 0x75, 0x59, 0xe7, 0x85, 0xfa, 0xba, 0x0f, 0x96, 0x0a, 0x42, 0x0b, 0x02, - 0x8b, 0x4d, 0x14, 0x32, 0xdf, 0x81, 0x56, 0xff, 0x34, 0x9e, 0x86, 0x7e, 0x9f, 0xa7, 0xe7, 0x9c, - 0x54, 0xc6, 0x8e, 0x2b, 0x95, 0xb5, 0x7b, 0x85, 0xac, 0x03, 0x28, 0x3f, 0x3b, 0x0e, 0x7c, 0x41, - 0x9a, 0x92, 0x76, 0x30, 0x9d, 0xa8, 0x8f, 0x56, 0x1c, 0x50, 0x71, 0x56, 0x62, 0xd1, 0x9b, 0x38, - 0xbf, 0x80, 0xa5, 0x6d, 0x8c, 0xd5, 0x87, 0xe9, 0xd6, 0x28, 0x4e, 0x33, 0xb2, 0x38, 0x7a, 0x5c, - 0x59, 0x44, 0xb8, 0x57, 0xc8, 0x23, 0xb0, 0x07, 0xe9, 0x85, 0xe2, 0x7f, 0x47, 0x87, 0xf0, 0x72, - 0xbf, 0x4b, 0x6e, 0xb9, 0xf9, 0xbf, 0x35, 0xb0, 0xbe, 0x8b, 0xd3, 0x33, 0x9e, 0x92, 0x7b, 0x60, - 0x61, 0xb7, 0xab, 0xcd, 0xa8, 0xe8, 0x7c, 0x2f, 0xdb, 0xe8, 0x16, 0x38, 0xa8, 0x94, 0x01, 0x13, - 0x67, 0xea, 0xa9, 0xf0, 0xff, 0x49, 0xa5, 0x17, 0x55, 0x0e, 0xe1, 0xbb, 0x2e, 0xab, 0x87, 0x2a, - 0x3a, 0xfc, 0xb9, 0x16, 0x74, 0xa5, 0xa9, 0xfa, 0xc9, 0xbe, 0x34, 0xcd, 0x47, 0x06, 0xb9, 0x0b, - 0xf5, 0xbe, 0xba, 0xa9, 0x64, 0x2a, 0xff, 0xad, 0x59, 0x59, 0xce, 0x11, 0xc5, 0x97, 0x1f, 0x82, - 0xa5, 0xaa, 0x18, 0x75, 0xcd, 0xb9, 0x52, 0x6f, 0xa5, 0x53, 0x45, 0x69, 0x81, 0xbb, 0x60, 0xa9, - 0xb0, 0xa1, 0x04, 0xe6, 0x42, 0x88, 0x3a, 0xb5, 0x8a, 0x42, 0x8a, 0x55, 0xf9, 0xb9, 0x62, 0x9d, - 0xf3, 0xf9, 0x05, 0xd6, 0x07, 0xd0, 0xa1, 0xdc, 0xe3, 0x41, 0xa5, 0x26, 0x20, 0xf9, 0xa5, 0x2e, - 0xf1, 0xbe, 0xc7, 0xb0, 0x34, 0x57, 0x3f, 0x90, 0x2e, 0x2a, 0xfa, 0x92, 0x92, 0x62, 0x51, 0xf8, - 0x49, 0xe7, 0x57, 0x2f, 0x57, 0x8d, 0x5f, 0xbf, 0x5c, 0x35, 0x7e, 0xfb, 0x72, 0xd5, 0xf8, 0xe1, - 0x77, 0xab, 0x57, 0x46, 0x16, 0xfe, 0xaf, 0xfd, 0xc5, 0x9f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xde, - 0x7d, 0xfc, 0x89, 0x1b, 0x1f, 0x00, 0x00, + 0x03, 0xea, 0x96, 0x43, 0x0e, 0x39, 0xe7, 0xe2, 0x43, 0x2a, 0xb7, 0x5c, 0x72, 0xc9, 0xd5, 0xe7, + 0x54, 0x6d, 0xd5, 0x1e, 0xf7, 0xba, 0xb7, 0x2d, 0xed, 0x5e, 0xf6, 0x27, 0xec, 0x6d, 0xab, 0x5f, + 0xf7, 0x7c, 0x00, 0xa2, 0x24, 0x7b, 0xab, 0xf6, 0x84, 0x7e, 0x5f, 0xd3, 0xdd, 0xef, 0xab, 0xdf, + 0x7b, 0x00, 0x3b, 0x19, 0x6d, 0x24, 0x69, 0x9c, 0xc5, 0xc4, 0x4c, 0x46, 0x2b, 0x0e, 0x4b, 0x02, + 0x05, 0xae, 0xdc, 0x19, 0x07, 0xd9, 0xe9, 0x74, 0xb4, 0xe1, 0xc5, 0x93, 0x87, 0xfe, 0x38, 0x65, + 0xc9, 0xe9, 0x83, 0x20, 0x7e, 0x38, 0x62, 0xfe, 0x98, 0xa7, 0x0f, 0x93, 0xd1, 0xc3, 0x5c, 0xce, + 0x5d, 0x81, 0xfa, 0x5e, 0x20, 0x32, 0x42, 0xa0, 0x3e, 0x0d, 0x7c, 0xd1, 0x35, 0xd6, 0x6a, 0xeb, + 0x16, 0xc5, 0xb5, 0xbb, 0x0f, 0xce, 0x80, 0x89, 0xb3, 0xe7, 0x2c, 0x9c, 0x72, 0xd2, 0x81, 0xda, + 0x39, 0x0b, 0xbb, 0xc6, 0x9a, 0xb1, 0xde, 0xa6, 0x72, 0x49, 0x36, 0xc0, 0x3e, 0x67, 0xe1, 0x30, + 0xbb, 0x48, 0x78, 0xd7, 0x5c, 0x33, 0xd6, 0x97, 0x37, 0xaf, 0x6d, 0x24, 0xa3, 0x8d, 0xa3, 0x58, + 0x64, 0x41, 0x34, 0xde, 0x78, 0xce, 0xc2, 0xc1, 0x45, 0xc2, 0x69, 0xf3, 0x5c, 0x2d, 0xdc, 0x43, + 0x68, 0xf5, 0x53, 0xef, 0xe9, 0x34, 0xf2, 0xb2, 0x20, 0x8e, 0xe4, 0x8e, 0x11, 0x9b, 0x70, 0xfc, + 0xa2, 0x43, 0x71, 0x2d, 0x71, 0x2c, 0x1d, 0x8b, 0x6e, 0x6d, 0xad, 0x26, 0x71, 0x72, 0x4d, 0xba, + 0xd0, 0x0c, 0xc4, 0x76, 0x3c, 0x8d, 0xb2, 0x6e, 0x7d, 0xcd, 0x58, 0xb7, 0x69, 0x0e, 0xba, 0xff, + 0x51, 0x83, 0xc6, 0xdf, 0x4d, 0x79, 0x7a, 0x81, 0x72, 0x59, 0x96, 0xe6, 0xdf, 0x92, 0x6b, 0x72, + 0x1d, 0x1a, 0x21, 0x8b, 0xc6, 0xa2, 0x6b, 0xe2, 0xc7, 0x14, 0x40, 0x3e, 0x00, 0x87, 0x9d, 0x64, + 0x3c, 0x1d, 0x4e, 0x03, 0xbf, 0x5b, 0x5b, 0x33, 0xd6, 0x2d, 0x6a, 0x23, 0xe2, 0x38, 0xf0, 0xc9, + 0xfb, 0x60, 0xfb, 0xf1, 0xd0, 0xab, 0xee, 0xe5, 0xc7, 0xb8, 0x17, 0xf9, 0x04, 0xec, 0x69, 0xe0, + 0x0f, 0xc3, 0x40, 0x64, 0xdd, 0xc6, 0x9a, 0xb1, 0xde, 0xda, 0xb4, 0xe5, 0x65, 0xa5, 0xee, 0x68, + 0x73, 0x1a, 0xf8, 0xa8, 0xc4, 0x7b, 0x60, 0x8b, 0xd4, 0x1b, 0x9e, 0x4c, 0x23, 0xaf, 0x6b, 0x21, + 0xd3, 0x55, 0xc9, 0x54, 0xb9, 0x35, 0x6d, 0x0a, 0x05, 0xc8, 0x6b, 0xa5, 0xfc, 0x9c, 0xa7, 0x82, + 0x77, 0x9b, 0x6a, 0x2b, 0x0d, 0x92, 0x47, 0xd0, 0x3a, 0x61, 0x1e, 0xcf, 0x86, 0x09, 0x4b, 0xd9, + 0xa4, 0x6b, 0x97, 0x1f, 0x7a, 0x2a, 0xd1, 0x47, 0x12, 0x2b, 0x28, 0x9c, 0x14, 0x00, 0xf9, 0x02, + 0x96, 0x10, 0x12, 0xc3, 0x93, 0x20, 0xcc, 0x78, 0xda, 0x75, 0x50, 0x66, 0x19, 0x65, 0x10, 0x33, + 0x48, 0x39, 0xa7, 0x6d, 0xc5, 0xa4, 0x30, 0xe4, 0x23, 0x00, 0x3e, 0x4b, 0x58, 0xe4, 0x0f, 0x59, + 0x18, 0x76, 0x01, 0xcf, 0xe0, 0x28, 0xcc, 0x56, 0x18, 0x92, 0xf7, 0xe4, 0xf9, 0x98, 0x3f, 0xcc, + 0x44, 0x77, 0x69, 0xcd, 0x58, 0xaf, 0x53, 0x4b, 0x82, 0x03, 0x21, 0xf5, 0xea, 0x31, 0xef, 0x94, + 0x77, 0x97, 0xd7, 0x8c, 0xf5, 0x06, 0x55, 0x80, 0xbb, 0x09, 0x0e, 0xfa, 0x09, 0xea, 0xe1, 0x36, + 0x58, 0xe7, 0x12, 0x50, 0xee, 0xd4, 0xda, 0x5c, 0x92, 0x07, 0x29, 0x5c, 0x89, 0x6a, 0xa2, 0xbb, + 0x0a, 0xf6, 0x1e, 0x8b, 0xc6, 0xb9, 0xff, 0x49, 0x03, 0xa1, 0x80, 0x43, 0x71, 0xed, 0xfe, 0x60, + 0x82, 0x45, 0xb9, 0x98, 0x86, 0x19, 0xb9, 0x03, 0x20, 0xd5, 0x3f, 0x61, 0x59, 0x1a, 0xcc, 0xf4, + 0x57, 0x4b, 0x03, 0x38, 0xd3, 0xc0, 0xdf, 0x47, 0x12, 0x79, 0x04, 0x6d, 0xfc, 0x7a, 0xce, 0x6a, + 0x96, 0x07, 0x28, 0xce, 0x47, 0x5b, 0xc8, 0xa2, 0x25, 0x6e, 0x80, 0x85, 0x16, 0x57, 0x5e, 0xb7, + 0x44, 0x35, 0x44, 0x6e, 0xc3, 0x72, 0x10, 0x65, 0xd2, 0x22, 0x5e, 0x36, 0xf4, 0xb9, 0xc8, 0x5d, + 0x62, 0xa9, 0xc0, 0xee, 0x70, 0x91, 0x91, 0xcf, 0x41, 0xa9, 0x35, 0xdf, 0xb0, 0x81, 0x1b, 0x2e, + 0x17, 0xe6, 0x12, 0x6a, 0x47, 0xe4, 0xd1, 0x3b, 0x3e, 0x80, 0x96, 0xbc, 0x5f, 0x2e, 0x61, 0xa1, + 0x44, 0x1b, 0x6f, 0xa3, 0xd5, 0x41, 0x41, 0x32, 0x68, 0x76, 0xa9, 0x1a, 0xe9, 0x76, 0xca, 0x4d, + 0x70, 0xed, 0xf6, 0xa0, 0x71, 0x98, 0xfa, 0x3c, 0xbd, 0xd4, 0xf3, 0x09, 0xd4, 0x7d, 0x2e, 0x3c, + 0x0c, 0x4a, 0x9b, 0xe2, 0xba, 0x8c, 0x86, 0x5a, 0x25, 0x1a, 0xdc, 0xff, 0x36, 0xa0, 0xd5, 0x8f, + 0xd3, 0x6c, 0x9f, 0x0b, 0xc1, 0xc6, 0x9c, 0xdc, 0x84, 0x46, 0x2c, 0x3f, 0xab, 0x35, 0xec, 0xc8, + 0x33, 0xe1, 0x3e, 0x54, 0xe1, 0x17, 0xec, 0x60, 0xbe, 0xde, 0x0e, 0xd2, 0x4b, 0x30, 0x8e, 0x6a, + 0xda, 0x4b, 0x30, 0x8a, 0x6e, 0x80, 0x15, 0x9f, 0x9c, 0x08, 0xae, 0x74, 0xd9, 0xa0, 0x1a, 0x7a, + 0xad, 0xb3, 0xb9, 0x7f, 0x01, 0x20, 0xcf, 0xf7, 0x33, 0xbd, 0xc0, 0x3d, 0x85, 0x16, 0x65, 0x27, + 0xd9, 0x76, 0x1c, 0x65, 0x7c, 0x96, 0x91, 0x65, 0x30, 0x03, 0x1f, 0x55, 0x64, 0x51, 0x33, 0xf0, + 0xe5, 0xe1, 0xc6, 0x69, 0x3c, 0x4d, 0x50, 0x43, 0x4b, 0x54, 0x01, 0xa8, 0x4a, 0xdf, 0x4f, 0xf1, + 0xc4, 0x52, 0x95, 0xbe, 0x9f, 0x92, 0x9b, 0xd0, 0x12, 0x11, 0x4b, 0xc4, 0x69, 0x9c, 0xc9, 0xc3, + 0xd5, 0xf1, 0x70, 0x90, 0xa3, 0x06, 0xc2, 0xfd, 0x85, 0x01, 0xd6, 0x3e, 0x9f, 0x8c, 0x78, 0xfa, + 0xca, 0x2e, 0xef, 0x83, 0x8d, 0x1f, 0x1e, 0x06, 0xbe, 0xde, 0xa8, 0x89, 0xf0, 0xae, 0x7f, 0xe9, + 0x56, 0x37, 0xc0, 0x0a, 0x39, 0x93, 0xca, 0x57, 0x7e, 0xa6, 0x21, 0xa9, 0x1b, 0x36, 0x19, 0xfa, + 0x9c, 0xf9, 0x98, 0x78, 0x6c, 0x6a, 0xb1, 0xc9, 0x0e, 0x67, 0xbe, 0x3c, 0x5b, 0xc8, 0x44, 0x36, + 0x9c, 0x26, 0x3e, 0xcb, 0x38, 0x26, 0x9c, 0xba, 0x74, 0x1c, 0x91, 0x1d, 0x23, 0x86, 0xdc, 0x83, + 0x77, 0xbc, 0x70, 0x2a, 0x64, 0xb6, 0x0b, 0xa2, 0x93, 0x78, 0x18, 0x47, 0xe1, 0x05, 0xea, 0xd7, + 0xa6, 0x57, 0x35, 0x61, 0x37, 0x3a, 0x89, 0x0f, 0xa3, 0xf0, 0xc2, 0xfd, 0xd1, 0x84, 0xc6, 0x33, + 0x54, 0xc3, 0x23, 0x68, 0x4e, 0xf0, 0x42, 0x79, 0xf4, 0xde, 0x90, 0x1a, 0x46, 0xda, 0x86, 0xba, + 0xa9, 0xe8, 0x45, 0x59, 0x7a, 0x41, 0x73, 0x36, 0x29, 0x91, 0xb1, 0x51, 0xc8, 0x33, 0xa1, 0x3d, + 0xa2, 0x22, 0x31, 0x50, 0x04, 0x2d, 0xa1, 0xd9, 0x16, 0xd5, 0x5a, 0x5b, 0x54, 0x2b, 0x59, 0x01, + 0xdb, 0x3b, 0xe5, 0xde, 0x99, 0x98, 0x4e, 0xb4, 0xd2, 0x0b, 0x78, 0xe5, 0x29, 0xb4, 0xab, 0xe7, + 0x90, 0x2f, 0xd3, 0x19, 0xbf, 0x40, 0xc5, 0xd7, 0xa9, 0x5c, 0x92, 0x35, 0x68, 0x60, 0x84, 0xa3, + 0xda, 0x5b, 0x9b, 0x20, 0x8f, 0xa3, 0x44, 0xa8, 0x22, 0x7c, 0x6d, 0x7e, 0x65, 0xc8, 0xef, 0x54, + 0x4f, 0x57, 0xfd, 0x8e, 0xf3, 0xfa, 0xef, 0x28, 0x91, 0xca, 0x77, 0xdc, 0x3f, 0x98, 0xd0, 0xfe, + 0x9e, 0xa7, 0xf1, 0x51, 0x1a, 0x27, 0xb1, 0x60, 0x21, 0xd9, 0x9a, 0xbf, 0x9d, 0xd2, 0xe2, 0x9a, + 0x14, 0xae, 0xb2, 0x6d, 0xf4, 0x8b, 0xeb, 0x2a, 0xed, 0x54, 0xef, 0xef, 0x82, 0xa5, 0xb4, 0x7b, + 0xc9, 0x15, 0x34, 0x45, 0xf2, 0x28, 0x7d, 0xa2, 0xfe, 0xe6, 0x8f, 0xa7, 0x29, 0x64, 0x15, 0x60, + 0xc2, 0x66, 0x7b, 0x9c, 0x09, 0xbe, 0xeb, 0xe7, 0xee, 0x5b, 0x62, 0xa4, 0x9e, 0x27, 0x6c, 0x36, + 0x98, 0x45, 0x03, 0x81, 0xde, 0x55, 0xa7, 0x05, 0x4c, 0x3e, 0x04, 0x67, 0xc2, 0x66, 0x32, 0x8e, + 0x76, 0x7d, 0xed, 0x5d, 0x25, 0x82, 0x7c, 0x0c, 0xb5, 0x6c, 0x16, 0x61, 0x52, 0x92, 0xaf, 0x93, + 0x2c, 0x3d, 0x06, 0xb3, 0x48, 0x47, 0x1c, 0x95, 0xb4, 0x5c, 0xa1, 0x76, 0xa9, 0xd0, 0x0e, 0xd4, + 0xbc, 0xc0, 0xc7, 0xe7, 0xc9, 0xa1, 0x72, 0xb9, 0xf2, 0x37, 0x70, 0x75, 0x41, 0x0f, 0x55, 0x3b, + 0x2c, 0x29, 0xb1, 0xeb, 0x55, 0x3b, 0xd4, 0xab, 0xba, 0xff, 0xb1, 0x06, 0x57, 0xb5, 0x33, 0x9c, + 0x06, 0x49, 0x3f, 0x93, 0x6e, 0xdf, 0x85, 0x26, 0x66, 0x1b, 0x9e, 0x6a, 0x9f, 0xc8, 0x41, 0xf2, + 0x57, 0x60, 0x61, 0x04, 0xe6, 0x7e, 0x7a, 0xb3, 0xd4, 0x6a, 0x21, 0xae, 0xfc, 0x56, 0x9b, 0x44, + 0xb3, 0x93, 0x2f, 0xa1, 0xf1, 0x82, 0xa7, 0xb1, 0xca, 0x9e, 0xad, 0xcd, 0xd5, 0xcb, 0xe4, 0xa4, + 0x6d, 0xb5, 0x98, 0x62, 0xfe, 0x33, 0x2a, 0xff, 0x96, 0xcc, 0x97, 0x93, 0xf8, 0x9c, 0xfb, 0xdd, + 0x26, 0x9e, 0xa8, 0xea, 0x1f, 0x39, 0x29, 0xd7, 0xb6, 0x5d, 0x6a, 0x7b, 0x07, 0x5a, 0x95, 0xeb, + 0x5d, 0xa2, 0xe9, 0x9b, 0xf3, 0x1e, 0xef, 0x14, 0x81, 0x5c, 0x0d, 0x9c, 0x1d, 0x80, 0xf2, 0xb2, + 0x7f, 0x6a, 0xf8, 0xb9, 0xff, 0x66, 0xc0, 0xd5, 0xed, 0x38, 0x8a, 0x38, 0x16, 0x46, 0xca, 0x74, + 0xa5, 0xdb, 0x1b, 0xaf, 0x75, 0xfb, 0xbb, 0xd0, 0x10, 0x92, 0x59, 0x7f, 0xfd, 0xda, 0x25, 0xb6, + 0xa0, 0x8a, 0x43, 0xa6, 0x99, 0x09, 0x9b, 0x0d, 0x13, 0x1e, 0xf9, 0x41, 0x34, 0xce, 0xd3, 0xcc, + 0x84, 0xcd, 0x8e, 0x14, 0xc6, 0xfd, 0x77, 0x03, 0x2c, 0x15, 0x31, 0x73, 0xd9, 0xda, 0x98, 0xcf, + 0xd6, 0x1f, 0x82, 0x93, 0xa4, 0xdc, 0x0f, 0xbc, 0x7c, 0x57, 0x87, 0x96, 0x08, 0xe9, 0x9c, 0x27, + 0x71, 0xea, 0x71, 0xfc, 0xbc, 0x4d, 0x15, 0x20, 0xb1, 0x22, 0x61, 0x9e, 0x2a, 0xee, 0x6a, 0x54, + 0x01, 0x32, 0xc7, 0x2b, 0xe3, 0xa0, 0x51, 0x6c, 0xaa, 0x21, 0xf7, 0x7f, 0x4d, 0x68, 0xef, 0x04, + 0x29, 0xf7, 0x32, 0xee, 0xf7, 0xfc, 0x31, 0x32, 0xf2, 0x28, 0x0b, 0xb2, 0x0b, 0xfd, 0x9e, 0x68, + 0xa8, 0x78, 0xee, 0xcd, 0xf9, 0x42, 0x57, 0xa9, 0xbb, 0x86, 0xb5, 0xb9, 0x02, 0xc8, 0x26, 0x80, + 0x2a, 0x84, 0xb0, 0x3e, 0xaf, 0xbf, 0xbe, 0x3e, 0x77, 0x90, 0x4d, 0x2e, 0xa5, 0x0e, 0x94, 0x4c, + 0xa0, 0xde, 0x1a, 0x0b, 0x8b, 0xf7, 0xa9, 0xf4, 0x55, 0xac, 0x1f, 0x46, 0x3c, 0x44, 0x5f, 0xc4, + 0xfa, 0x61, 0xc4, 0xc3, 0xa2, 0x6a, 0x6b, 0xaa, 0xe3, 0xc8, 0x35, 0xf9, 0x04, 0xcc, 0x38, 0xc1, + 0xfb, 0xe9, 0x0d, 0xab, 0x17, 0xdb, 0x38, 0x4c, 0xa8, 0x19, 0x27, 0xd2, 0xd0, 0xaa, 0x18, 0xed, + 0x3a, 0xda, 0x7f, 0x65, 0x02, 0xc1, 0x82, 0x89, 0x6a, 0x8a, 0x7b, 0x03, 0xcc, 0xc3, 0x84, 0x34, + 0xa1, 0xd6, 0xef, 0x0d, 0x3a, 0x57, 0xe4, 0x62, 0xa7, 0xb7, 0xd7, 0x31, 0xdc, 0x97, 0x06, 0x38, + 0xfb, 0xd3, 0x8c, 0x49, 0xb7, 0x11, 0x6f, 0xb2, 0xdb, 0xfb, 0x60, 0x8b, 0x8c, 0xa5, 0x98, 0x84, + 0x55, 0xe6, 0x68, 0x22, 0x3c, 0x10, 0xe4, 0x53, 0x68, 0x70, 0x7f, 0xcc, 0xf3, 0x80, 0xee, 0x2c, + 0x9e, 0x93, 0x2a, 0x32, 0x59, 0x07, 0x4b, 0x78, 0xa7, 0x7c, 0xc2, 0xba, 0xf5, 0x92, 0xb1, 0x8f, + 0x18, 0xf5, 0xc8, 0x52, 0x4d, 0xc7, 0xde, 0x21, 0x8d, 0x13, 0x2c, 0xa6, 0x1b, 0xba, 0x77, 0x48, + 0xe3, 0x44, 0x96, 0xd2, 0x9b, 0xf0, 0x6e, 0x30, 0x8e, 0xe2, 0x94, 0x0f, 0x83, 0xc8, 0xe7, 0xb3, + 0xa1, 0x17, 0x47, 0x27, 0x61, 0xe0, 0x65, 0xa8, 0x4b, 0x9b, 0x5e, 0x53, 0xc4, 0x5d, 0x49, 0xdb, + 0xd6, 0x24, 0xf7, 0x3f, 0x0d, 0xb0, 0xf3, 0xc4, 0x48, 0xee, 0xca, 0x8c, 0x86, 0x89, 0x55, 0xc7, + 0x05, 0x76, 0x03, 0x95, 0x0a, 0x87, 0xe6, 0x74, 0x69, 0x27, 0xdc, 0x24, 0x4f, 0x95, 0x08, 0x54, + 0xeb, 0xab, 0xda, 0x5c, 0x31, 0x2f, 0x4b, 0xc5, 0x38, 0xe2, 0xba, 0xe4, 0xc0, 0x35, 0xaa, 0x2d, + 0x88, 0x3c, 0x2e, 0xb9, 0x1b, 0x5a, 0x6d, 0x12, 0x1e, 0x08, 0xf7, 0xbf, 0x4c, 0xb0, 0x8b, 0x67, + 0xee, 0x3e, 0x38, 0x93, 0xdc, 0x0c, 0x3a, 0x18, 0xb1, 0xce, 0x2e, 0x6c, 0x43, 0x4b, 0x3a, 0xb9, + 0x01, 0xe6, 0xd9, 0xb9, 0x56, 0xa2, 0x25, 0xb9, 0xbe, 0x7d, 0x4e, 0xcd, 0xb3, 0xf3, 0x32, 0x9a, + 0x1b, 0x6f, 0x8d, 0xe6, 0x3b, 0x70, 0xd5, 0x0b, 0x39, 0x8b, 0x86, 0x65, 0x30, 0x2a, 0x67, 0x5c, + 0x46, 0xf4, 0x51, 0x11, 0x91, 0x3a, 0x23, 0x35, 0xcb, 0x77, 0xe7, 0x36, 0x34, 0x7c, 0x1e, 0x66, + 0xac, 0xda, 0x4c, 0x1d, 0xa6, 0xcc, 0x0b, 0xf9, 0x8e, 0x44, 0x53, 0x45, 0x25, 0xeb, 0x60, 0xe7, + 0x6f, 0xb0, 0x6e, 0xa1, 0xb0, 0x2a, 0xcf, 0xed, 0x40, 0x0b, 0x6a, 0xa9, 0x66, 0xa8, 0xa8, 0xd9, + 0xfd, 0x1c, 0x6a, 0xdf, 0x3e, 0xef, 0xeb, 0xbb, 0x1a, 0xaf, 0xdc, 0x35, 0x57, 0xb6, 0x59, 0x2a, + 0xdb, 0xfd, 0x7d, 0x0d, 0x9a, 0x3a, 0x22, 0xe5, 0xb9, 0xa7, 0x45, 0x05, 0x29, 0x97, 0xf3, 0x0f, + 0x5f, 0x11, 0xda, 0xd5, 0xc6, 0xbb, 0xf6, 0xf6, 0xc6, 0x9b, 0x7c, 0x0d, 0xed, 0x44, 0xd1, 0xaa, + 0xc9, 0xe0, 0xbd, 0xaa, 0x8c, 0xfe, 0x45, 0xb9, 0x56, 0x52, 0x02, 0xd2, 0x19, 0xb0, 0x57, 0xc9, + 0xd8, 0x18, 0x4d, 0xd4, 0xa6, 0x4d, 0x09, 0x0f, 0xd8, 0xf8, 0x35, 0x29, 0xe1, 0x27, 0x44, 0xb6, + 0xac, 0x94, 0xe3, 0xa4, 0xdb, 0xc6, 0x68, 0x95, 0xd9, 0xa0, 0x1a, 0xa8, 0x4b, 0xf3, 0x81, 0xfa, + 0x01, 0x38, 0x5e, 0x3c, 0x99, 0x04, 0x48, 0x5b, 0xd6, 0x95, 0x20, 0x22, 0x06, 0xc2, 0x7d, 0x01, + 0x4d, 0x7d, 0x59, 0xd2, 0x82, 0xe6, 0x4e, 0xef, 0xe9, 0xd6, 0xf1, 0x9e, 0x4c, 0x15, 0x00, 0xd6, + 0x93, 0xdd, 0x83, 0x2d, 0xfa, 0x0f, 0x1d, 0x43, 0xa6, 0x8d, 0xdd, 0x83, 0x41, 0xc7, 0x24, 0x0e, + 0x34, 0x9e, 0xee, 0x1d, 0x6e, 0x0d, 0x3a, 0x35, 0x62, 0x43, 0xfd, 0xc9, 0xe1, 0xe1, 0x5e, 0xa7, + 0x4e, 0xda, 0x60, 0xef, 0x6c, 0x0d, 0x7a, 0x83, 0xdd, 0xfd, 0x5e, 0xa7, 0x21, 0x79, 0x9f, 0xf5, + 0x0e, 0x3b, 0x96, 0x5c, 0x1c, 0xef, 0xee, 0x74, 0x9a, 0x92, 0x7e, 0xb4, 0xd5, 0xef, 0x7f, 0x77, + 0x48, 0x77, 0x3a, 0xb6, 0xfc, 0x6e, 0x7f, 0x40, 0x77, 0x0f, 0x9e, 0x75, 0x1c, 0xf7, 0x73, 0x68, + 0x55, 0x94, 0x26, 0x25, 0x68, 0xef, 0x69, 0xe7, 0x8a, 0xdc, 0xe6, 0xf9, 0xd6, 0xde, 0x71, 0xaf, + 0x63, 0x90, 0x65, 0x00, 0x5c, 0x0e, 0xf7, 0xb6, 0x0e, 0x9e, 0x75, 0x4c, 0xf7, 0x2f, 0xc1, 0x3e, + 0x0e, 0xfc, 0x27, 0x61, 0xec, 0x9d, 0x49, 0x5f, 0x18, 0x31, 0xc1, 0xf5, 0xb3, 0x89, 0x6b, 0x99, + 0xf4, 0xd1, 0x0f, 0x85, 0x36, 0xb7, 0x86, 0xdc, 0x03, 0x68, 0x1e, 0x07, 0xfe, 0x11, 0xf3, 0xce, + 0x64, 0xd3, 0x3e, 0x92, 0xf2, 0x43, 0x11, 0xbc, 0xe0, 0x3a, 0xdf, 0x39, 0x88, 0xe9, 0x07, 0x2f, + 0x38, 0xb9, 0x05, 0x16, 0x02, 0x79, 0x81, 0x83, 0xee, 0x9b, 0xef, 0x49, 0x35, 0xcd, 0xcd, 0x8a, + 0xa3, 0x63, 0xeb, 0x7d, 0x13, 0xea, 0x09, 0xf3, 0xce, 0x74, 0x6a, 0x69, 0x69, 0x11, 0xb9, 0x1d, + 0x45, 0x02, 0xb9, 0x03, 0xb6, 0x76, 0x89, 0xfc, 0xbb, 0xad, 0x8a, 0xef, 0xd0, 0x82, 0x38, 0x6f, + 0xac, 0xda, 0x82, 0xb1, 0xbe, 0x04, 0x28, 0xe7, 0x17, 0x97, 0x14, 0xdb, 0xd7, 0xa1, 0xc1, 0xc2, + 0x40, 0x5f, 0xde, 0xa1, 0x0a, 0x70, 0x0f, 0xa0, 0x55, 0x99, 0x7a, 0x48, 0x4f, 0x61, 0x61, 0x38, + 0x3c, 0xe3, 0x17, 0x02, 0x65, 0x6d, 0xda, 0x64, 0x61, 0xf8, 0x2d, 0xbf, 0x10, 0xe4, 0x16, 0x34, + 0xd4, 0xc0, 0xc4, 0x5c, 0xe8, 0xc0, 0x51, 0x94, 0x2a, 0xa2, 0xfb, 0x19, 0x58, 0xaa, 0x2d, 0xaf, + 0x38, 0xaa, 0xf1, 0xda, 0x27, 0xe8, 0xb1, 0x3e, 0x33, 0x36, 0xf1, 0xe4, 0xbe, 0x1e, 0xcc, 0x08, + 0x35, 0x06, 0x32, 0xca, 0xca, 0x4b, 0x31, 0xe9, 0x99, 0x0c, 0x32, 0xbb, 0x3b, 0x60, 0xbf, 0x71, + 0xd4, 0xa5, 0x15, 0x60, 0x96, 0x0a, 0xb8, 0x64, 0xf8, 0xe5, 0xfe, 0x33, 0x40, 0x39, 0xc0, 0xd1, + 0x71, 0xa3, 0xbe, 0x22, 0xe3, 0xe6, 0x9e, 0xec, 0x92, 0x82, 0xd0, 0x4f, 0x79, 0x34, 0x77, 0xeb, + 0x72, 0xe4, 0x53, 0xd0, 0xc9, 0x1a, 0xd4, 0x71, 0x2e, 0x55, 0x2b, 0xf3, 0x5a, 0x31, 0x94, 0x42, + 0x8a, 0x3b, 0x82, 0x25, 0xf5, 0xb2, 0x51, 0xfe, 0x2f, 0x53, 0x2e, 0xde, 0x58, 0x12, 0xad, 0x02, + 0x14, 0x59, 0x38, 0x9f, 0xb0, 0x55, 0x30, 0xd2, 0x95, 0x4f, 0x02, 0x1e, 0xfa, 0xf9, 0x6d, 0x34, + 0xe4, 0xfe, 0x35, 0xb4, 0xf3, 0x3d, 0xb0, 0xa3, 0xbf, 0x5f, 0xbc, 0xaf, 0x4a, 0x9b, 0xaa, 0x91, + 0x50, 0x2c, 0x07, 0xb1, 0xcf, 0x9f, 0x98, 0x5d, 0x23, 0x7f, 0x62, 0xdd, 0x5f, 0x9b, 0xb9, 0xb4, + 0x6e, 0x70, 0xe7, 0x0a, 0x33, 0x63, 0xb1, 0x30, 0x9b, 0xaf, 0x80, 0xcc, 0x9f, 0x54, 0x01, 0x7d, + 0x05, 0x8e, 0x8f, 0x65, 0x40, 0x70, 0x9e, 0xe7, 0xd6, 0x95, 0xc5, 0x27, 0x5f, 0x17, 0x0a, 0xc1, + 0x39, 0xa7, 0x25, 0xb3, 0x3c, 0x4b, 0x16, 0x9f, 0xf1, 0x28, 0x78, 0x81, 0x1d, 0xbc, 0xbc, 0x74, + 0x89, 0x28, 0xc7, 0x21, 0xaa, 0x34, 0xd0, 0xe3, 0x90, 0x7c, 0xb2, 0x63, 0x95, 0x93, 0x1d, 0xa9, + 0xb9, 0x69, 0x22, 0x78, 0x9a, 0xe5, 0x25, 0xa2, 0x82, 0x8a, 0x52, 0xcb, 0xd1, 0xbc, 0x2c, 0x1a, + 0xbb, 0x8f, 0xc1, 0x29, 0xce, 0x22, 0x93, 0xda, 0xc1, 0xe1, 0x41, 0x4f, 0xa5, 0xa0, 0xdd, 0x83, + 0x9d, 0xde, 0xdf, 0x77, 0x0c, 0x99, 0x16, 0x69, 0xef, 0x79, 0x8f, 0xf6, 0x7b, 0x1d, 0x53, 0xa6, + 0xaf, 0x9d, 0xde, 0x5e, 0x6f, 0xd0, 0xeb, 0xd4, 0xbe, 0xa9, 0xdb, 0xcd, 0x8e, 0x4d, 0x6d, 0x3e, + 0x4b, 0xc2, 0xc0, 0x0b, 0x32, 0xf7, 0x18, 0xec, 0x7d, 0x96, 0xbc, 0x52, 0xd1, 0xb7, 0x8b, 0xbe, + 0x6d, 0xaa, 0xa7, 0x18, 0xfa, 0x65, 0xba, 0x0d, 0x4d, 0x1d, 0xf6, 0xda, 0xa3, 0xe6, 0x52, 0x42, + 0x4e, 0x93, 0x05, 0xf6, 0xf5, 0xfd, 0xf8, 0x9c, 0x17, 0x8f, 0xf3, 0x11, 0xbb, 0x08, 0x63, 0xe6, + 0xbf, 0xc5, 0x74, 0x1f, 0x01, 0x88, 0x78, 0x9a, 0x7a, 0x7c, 0x38, 0x2e, 0x86, 0x27, 0x8e, 0xc2, + 0x3c, 0xd3, 0x73, 0x5a, 0x2e, 0x32, 0x24, 0xd6, 0x94, 0x63, 0x4a, 0x58, 0x92, 0xde, 0x05, 0x2b, + 0x9b, 0x45, 0xe5, 0xac, 0xa6, 0x91, 0xc9, 0x76, 0xca, 0xdd, 0x06, 0x67, 0x30, 0xc3, 0x26, 0x63, + 0x2a, 0xe6, 0x9e, 0x1b, 0xe3, 0x0d, 0xcf, 0x8d, 0xb9, 0x90, 0xc1, 0x7e, 0x67, 0x40, 0xab, 0x52, + 0x35, 0x90, 0x8f, 0xa1, 0x9e, 0xcd, 0xa2, 0xf9, 0x21, 0x67, 0xbe, 0x09, 0x45, 0x12, 0xf9, 0x18, + 0xda, 0xb2, 0x03, 0x61, 0x42, 0x04, 0xe3, 0x88, 0xfb, 0xfa, 0x93, 0xb2, 0x2b, 0xd9, 0xd2, 0x28, + 0xb2, 0x07, 0x57, 0x55, 0x94, 0xe5, 0x03, 0x8e, 0xbc, 0x28, 0xfd, 0x64, 0xa1, 0x4a, 0x51, 0x8d, + 0xd8, 0x76, 0xce, 0xa5, 0x5a, 0xcd, 0xe5, 0xf1, 0x1c, 0x72, 0x65, 0x0b, 0xae, 0x5d, 0xc2, 0xf6, + 0xb3, 0x7a, 0xea, 0x9b, 0xb0, 0x24, 0x7b, 0xd0, 0x60, 0xc2, 0x45, 0xc6, 0x26, 0x09, 0x3e, 0xd7, + 0x3a, 0x4b, 0xd6, 0xa9, 0x99, 0x09, 0xf7, 0x53, 0x68, 0x1f, 0x71, 0x9e, 0x52, 0x2e, 0x92, 0x38, + 0x52, 0xef, 0x96, 0xc0, 0x4b, 0xeb, 0x94, 0xac, 0x21, 0xf7, 0x9f, 0xc0, 0x91, 0x35, 0xea, 0x13, + 0x96, 0x79, 0xa7, 0x3f, 0xa7, 0x86, 0xfd, 0x14, 0x9a, 0x89, 0x72, 0x13, 0x5d, 0x56, 0xb6, 0x31, + 0x2b, 0x68, 0xd7, 0xa1, 0x39, 0xd1, 0xa5, 0x50, 0x3b, 0x98, 0x4e, 0xaa, 0xff, 0x4c, 0xd4, 0xd5, + 0x3f, 0x13, 0x1f, 0x80, 0x83, 0xe5, 0x2e, 0x0e, 0xbc, 0x54, 0xb5, 0x65, 0x4b, 0xc4, 0x61, 0x14, + 0x5e, 0x48, 0xcf, 0x3b, 0x89, 0xd3, 0x7f, 0x65, 0xa9, 0xcf, 0x7d, 0xdd, 0xb3, 0x95, 0x08, 0xf7, + 0x7b, 0x68, 0xe5, 0x96, 0xd9, 0xf5, 0xf1, 0xcf, 0x07, 0x74, 0x8d, 0x5d, 0x7f, 0xce, 0x53, 0x54, + 0x43, 0xc4, 0x23, 0x7f, 0x37, 0x37, 0xa9, 0x02, 0xe6, 0x77, 0xd6, 0x3d, 0x7d, 0xbe, 0xb3, 0xfb, + 0x14, 0xda, 0x79, 0x29, 0xb9, 0xcf, 0x33, 0x86, 0xce, 0x16, 0x06, 0x3c, 0xaa, 0x38, 0xa2, 0xad, + 0x10, 0x03, 0xf1, 0x86, 0xe9, 0xa1, 0xbb, 0x01, 0x96, 0xf6, 0x64, 0x02, 0x75, 0x2f, 0xf6, 0x55, + 0x00, 0x35, 0x28, 0xae, 0xa5, 0x3a, 0x26, 0x62, 0x9c, 0x3f, 0x2c, 0x13, 0x31, 0x76, 0x67, 0xb0, + 0xf4, 0x84, 0x79, 0x67, 0xd3, 0x24, 0x4f, 0xec, 0x95, 0x76, 0xc0, 0x98, 0x6b, 0x07, 0xde, 0x30, + 0xb2, 0x7c, 0x0f, 0x9a, 0xd3, 0x28, 0x98, 0xe5, 0x2f, 0xbb, 0x43, 0x2d, 0x09, 0xaa, 0x51, 0x5d, + 0x18, 0x7b, 0x58, 0xe6, 0x63, 0xcc, 0x39, 0xb4, 0x80, 0xdd, 0x7f, 0x84, 0xa5, 0xde, 0x2c, 0xc1, + 0x01, 0xee, 0x5b, 0x9f, 0x94, 0xca, 0xa1, 0xcc, 0xb9, 0x43, 0x2d, 0xec, 0x5c, 0xcb, 0x77, 0xde, + 0xfc, 0x7f, 0x03, 0xea, 0xd2, 0x81, 0x64, 0x27, 0xf2, 0xb7, 0x9c, 0xa5, 0xd9, 0x88, 0xb3, 0x8c, + 0xcc, 0x39, 0xcb, 0xca, 0x1c, 0xe4, 0x5e, 0x79, 0x64, 0x90, 0x0d, 0x35, 0x1b, 0xce, 0x47, 0xde, + 0x4b, 0xb9, 0x1b, 0xa2, 0x9b, 0x2e, 0xf2, 0xaf, 0x23, 0xff, 0x37, 0x71, 0x10, 0x6d, 0xab, 0x81, + 0x29, 0x59, 0x74, 0xdb, 0x45, 0x09, 0xf2, 0x00, 0xac, 0x5d, 0x21, 0xe3, 0xe3, 0x55, 0x56, 0xec, + 0x1e, 0xab, 0xa1, 0xe3, 0x5e, 0xd9, 0xfc, 0xbf, 0x1a, 0xd4, 0xbf, 0xe7, 0x69, 0x4c, 0x3e, 0x83, + 0xa6, 0x1e, 0x87, 0x90, 0xca, 0xd8, 0x63, 0x05, 0x5f, 0xac, 0x85, 0x39, 0x09, 0xee, 0xd2, 0x51, + 0xaf, 0x51, 0xd9, 0x2c, 0x91, 0x72, 0x5a, 0xf3, 0xca, 0xa1, 0x1e, 0x43, 0xa7, 0x9f, 0xa5, 0x9c, + 0x4d, 0x2a, 0xec, 0xf3, 0x8a, 0xba, 0xac, 0xf3, 0x42, 0x7d, 0xdd, 0x07, 0x4b, 0x25, 0xa1, 0x05, + 0x81, 0xc5, 0x26, 0x0a, 0x99, 0xef, 0x40, 0xab, 0x7f, 0x1a, 0x4f, 0x43, 0xbf, 0xcf, 0xd3, 0x73, + 0x4e, 0x2a, 0x23, 0xc9, 0x95, 0xca, 0xda, 0xbd, 0x42, 0xd6, 0x01, 0x54, 0x9c, 0x1d, 0x07, 0xbe, + 0x20, 0x4d, 0x49, 0x3b, 0x98, 0x4e, 0xd4, 0x47, 0x2b, 0x01, 0xa8, 0x38, 0x2b, 0xb9, 0xe8, 0x4d, + 0x9c, 0x5f, 0xc0, 0xd2, 0x36, 0xe6, 0xea, 0xc3, 0x74, 0x6b, 0x14, 0xa7, 0x19, 0x59, 0x1c, 0x4b, + 0xae, 0x2c, 0x22, 0xdc, 0x2b, 0xe4, 0x11, 0xd8, 0x83, 0xf4, 0x42, 0xf1, 0xbf, 0xa3, 0x53, 0x78, + 0xb9, 0xdf, 0x25, 0xb7, 0xdc, 0xfc, 0x9f, 0x1a, 0x58, 0xdf, 0xc5, 0xe9, 0x19, 0x4f, 0xc9, 0x3d, + 0xb0, 0xb0, 0xdb, 0xd5, 0x6e, 0x54, 0x74, 0xbe, 0x97, 0x6d, 0x74, 0x0b, 0x1c, 0x54, 0xca, 0x80, + 0x89, 0x33, 0x65, 0x2a, 0xfc, 0xef, 0x52, 0xe9, 0x45, 0x95, 0x43, 0x68, 0xd7, 0x65, 0x65, 0xa8, + 0xa2, 0xf9, 0x9f, 0x6b, 0x41, 0x57, 0x9a, 0xaa, 0x9f, 0xec, 0x4b, 0xd7, 0x7c, 0x64, 0x90, 0xbb, + 0x50, 0xef, 0xab, 0x9b, 0x4a, 0xa6, 0xf2, 0x9f, 0x9c, 0x95, 0xe5, 0x1c, 0x51, 0x7c, 0xf9, 0x21, + 0x58, 0xaa, 0x8a, 0x51, 0xd7, 0x9c, 0x2b, 0xf5, 0x56, 0x3a, 0x55, 0x94, 0x16, 0xb8, 0x0b, 0x96, + 0x4a, 0x1b, 0x4a, 0x60, 0x2e, 0x85, 0xa8, 0x53, 0xab, 0x2c, 0xa4, 0x58, 0x55, 0x9c, 0x2b, 0xd6, + 0xb9, 0x98, 0x5f, 0x60, 0x7d, 0x00, 0x1d, 0xca, 0x3d, 0x1e, 0x54, 0x6a, 0x02, 0x92, 0x5f, 0xea, + 0x92, 0xe8, 0x7b, 0x0c, 0x4b, 0x73, 0xf5, 0x03, 0xe9, 0xa2, 0xa2, 0x2f, 0x29, 0x29, 0x16, 0x85, + 0x9f, 0x74, 0x7e, 0xf9, 0x72, 0xd5, 0xf8, 0xd5, 0xcb, 0x55, 0xe3, 0x37, 0x2f, 0x57, 0x8d, 0x1f, + 0x7e, 0xbb, 0x7a, 0x65, 0x64, 0xe1, 0x7f, 0xde, 0x5f, 0xfc, 0x31, 0x00, 0x00, 0xff, 0xff, 0x95, + 0x15, 0xd3, 0x7c, 0x37, 0x1f, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -6044,6 +6054,11 @@ func (m *Snapshot) MarshalTo(dAtA []byte) (int, error) { } i++ } + if m.SinceTs != 0 { + dAtA[i] = 0x28 + i++ + i = encodeVarintPb(dAtA, i, uint64(m.SinceTs)) + } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) } @@ -7955,6 +7970,9 @@ func (m *Snapshot) Size() (n int) { if m.Done { n += 2 } + if m.SinceTs != 0 { + n += 1 + sovPb(uint64(m.SinceTs)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -12628,6 +12646,25 @@ func (m *Snapshot) Unmarshal(dAtA []byte) error { } } m.Done = bool(v != 0) + case 5: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field SinceTs", wireType) + } + m.SinceTs = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPb + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.SinceTs |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipPb(dAtA[iNdEx:]) diff --git a/worker/draft.go b/worker/draft.go index 800f890389e..e6071f2f7e3 100644 --- a/worker/draft.go +++ b/worker/draft.go @@ -805,8 +805,19 @@ func (n *node) Run() { " retrieving snapshot\n", maxIndex) n.Applied.WaitForMark(context.Background(), maxIndex) + if currSnap, err := n.Snapshot(); err != nil { + // Retrieve entire snapshot from leader if node does not have + // a current snapshot. + glog.Errorf("Could not retrieve previous snapshot. Setting SinceTs to 0.") + snap.SinceTs = 0 + } else { + snap.SinceTs = currSnap.ReadTs + } + // It's ok to block ticks while retrieving snapshot, since it's a follower. - glog.Infof("---> SNAPSHOT: %+v. Group %d from node id %#x\n", snap, n.gid, rc.Id) + glog.Infof("---> SNAPSHOT: %+v. Group %d from node id %#x\n", + snap, n.gid, rc.Id) + for { err := n.retrieveSnapshot(snap) if err == nil { diff --git a/worker/snapshot.go b/worker/snapshot.go index 3cbbdd430f9..cac3f16b9ca 100644 --- a/worker/snapshot.go +++ b/worker/snapshot.go @@ -23,6 +23,7 @@ import ( "github.com/golang/glog" "go.etcd.io/etcd/raft" + "github.com/dgraph-io/badger" "github.com/dgraph-io/dgraph/conn" "github.com/dgraph-io/dgraph/posting" "github.com/dgraph-io/dgraph/protos/pb" @@ -45,12 +46,16 @@ func (n *node) populateSnapshot(snap pb.Snapshot, pl *conn.Pool) (int, error) { if err != nil { return 0, err } + if err := stream.Send(&snap); err != nil { return 0, err } - // Before we write anything, we should drop all the data stored in ps. - if err := pstore.DropAll(); err != nil { - return 0, err + + if snap.SinceTs == 0 { + // Before we write anything, we should drop all the data stored in ps. + if err := pstore.DropAll(); err != nil { + return 0, err + } } // We can use count to check the number of posting lists returned in tests. @@ -126,6 +131,9 @@ func doStreamSnapshot(snap *pb.Snapshot, out pb.Worker_StreamSnapshotServer) err num += len(kvs.Kv) return out.Send(kvs) } + stream.ChooseKey = func(item *badger.Item) bool { + return item.Version() >= snap.SinceTs + } if err := stream.Orchestrate(out.Context()); err != nil { return err }