From 2000284435a7f3958cab6e4ed88128b12000da0b Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sat, 28 Dec 2019 11:21:49 -0800 Subject: [PATCH] rename volume tier info to volume info --- weed/pb/volume_server.proto | 2 +- weed/pb/volume_server_pb/volume_server.pb.go | 380 +++++++++--------- weed/server/volume_grpc_tier_download.go | 4 +- weed/server/volume_grpc_tier_upload.go | 6 +- weed/storage/backend/backend.go | 2 +- weed/storage/backend/s3_backend/s3_backend.go | 4 +- weed/storage/volume.go | 8 +- weed/storage/volume_loading.go | 2 +- weed/storage/volume_tier.go | 30 +- 9 files changed, 219 insertions(+), 219 deletions(-) diff --git a/weed/pb/volume_server.proto b/weed/pb/volume_server.proto index 351ca8d3d..bc639da07 100644 --- a/weed/pb/volume_server.proto +++ b/weed/pb/volume_server.proto @@ -351,7 +351,7 @@ message RemoteFile { uint64 modified_time = 6; string extension = 7; } -message VolumeTierInfo { +message VolumeInfo { repeated RemoteFile files = 1; } diff --git a/weed/pb/volume_server_pb/volume_server.pb.go b/weed/pb/volume_server_pb/volume_server.pb.go index 67afe34dc..1bf0bbcd2 100644 --- a/weed/pb/volume_server_pb/volume_server.pb.go +++ b/weed/pb/volume_server_pb/volume_server.pb.go @@ -68,7 +68,7 @@ It has these top-level messages: DiskStatus MemStatus RemoteFile - VolumeTierInfo + VolumeInfo VolumeTierMoveDatToRemoteRequest VolumeTierMoveDatToRemoteResponse VolumeTierMoveDatFromRemoteRequest @@ -1515,16 +1515,16 @@ func (m *RemoteFile) GetExtension() string { return "" } -type VolumeTierInfo struct { +type VolumeInfo struct { Files []*RemoteFile `protobuf:"bytes,1,rep,name=files" json:"files,omitempty"` } -func (m *VolumeTierInfo) Reset() { *m = VolumeTierInfo{} } -func (m *VolumeTierInfo) String() string { return proto.CompactTextString(m) } -func (*VolumeTierInfo) ProtoMessage() {} -func (*VolumeTierInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{59} } +func (m *VolumeInfo) Reset() { *m = VolumeInfo{} } +func (m *VolumeInfo) String() string { return proto.CompactTextString(m) } +func (*VolumeInfo) ProtoMessage() {} +func (*VolumeInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{59} } -func (m *VolumeTierInfo) GetFiles() []*RemoteFile { +func (m *VolumeInfo) GetFiles() []*RemoteFile { if m != nil { return m.Files } @@ -2064,7 +2064,7 @@ func init() { proto.RegisterType((*DiskStatus)(nil), "volume_server_pb.DiskStatus") proto.RegisterType((*MemStatus)(nil), "volume_server_pb.MemStatus") proto.RegisterType((*RemoteFile)(nil), "volume_server_pb.RemoteFile") - proto.RegisterType((*VolumeTierInfo)(nil), "volume_server_pb.VolumeTierInfo") + proto.RegisterType((*VolumeInfo)(nil), "volume_server_pb.VolumeInfo") proto.RegisterType((*VolumeTierMoveDatToRemoteRequest)(nil), "volume_server_pb.VolumeTierMoveDatToRemoteRequest") proto.RegisterType((*VolumeTierMoveDatToRemoteResponse)(nil), "volume_server_pb.VolumeTierMoveDatToRemoteResponse") proto.RegisterType((*VolumeTierMoveDatFromRemoteRequest)(nil), "volume_server_pb.VolumeTierMoveDatFromRemoteRequest") @@ -3313,186 +3313,186 @@ var _VolumeServer_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("volume_server.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 2886 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x3a, 0x4b, 0x73, 0xdc, 0xc6, - 0xd1, 0x5c, 0x2e, 0x1f, 0xbb, 0xbd, 0x4b, 0x91, 0x1a, 0xd2, 0xd4, 0x1a, 0xa2, 0x24, 0x1a, 0xf2, - 0x43, 0x92, 0x2d, 0x4a, 0xa6, 0xed, 0xcf, 0xfe, 0xec, 0xcf, 0xfe, 0x22, 0x51, 0x52, 0xa2, 0xd8, - 0xa2, 0x6c, 0x50, 0x56, 0x9c, 0xd8, 0x15, 0xd4, 0x10, 0x18, 0x8a, 0x30, 0x01, 0x0c, 0x04, 0xcc, - 0xd2, 0x5a, 0x55, 0x72, 0x72, 0x0e, 0xb9, 0x24, 0x87, 0x54, 0x2e, 0x39, 0xe7, 0x9e, 0x6b, 0xfe, - 0x40, 0x0e, 0xfe, 0x03, 0xa9, 0xca, 0x29, 0x97, 0x1c, 0x72, 0xca, 0x21, 0xb7, 0x54, 0xe5, 0x92, - 0x9a, 0x17, 0x16, 0x4f, 0x2e, 0x68, 0x31, 0x95, 0xca, 0x6d, 0xd0, 0xd3, 0x8f, 0xe9, 0x9e, 0xee, - 0x9e, 0xe9, 0x69, 0xc0, 0xf2, 0x21, 0xf5, 0x87, 0x01, 0xb1, 0x13, 0x12, 0x1f, 0x92, 0x78, 0x23, - 0x8a, 0x29, 0xa3, 0x68, 0x29, 0x07, 0xb4, 0xa3, 0x5d, 0xf3, 0x1a, 0xa0, 0x9b, 0x98, 0x39, 0xfb, - 0xb7, 0x88, 0x4f, 0x18, 0xb1, 0xc8, 0xe3, 0x21, 0x49, 0x18, 0x7a, 0x1e, 0x3a, 0x7b, 0x9e, 0x4f, - 0x6c, 0xcf, 0x4d, 0x06, 0xad, 0xf5, 0xf6, 0xa5, 0xae, 0x35, 0xcf, 0xbf, 0xef, 0xba, 0x89, 0x79, - 0x1f, 0x96, 0x73, 0x04, 0x49, 0x44, 0xc3, 0x84, 0xa0, 0x77, 0x60, 0x3e, 0x26, 0xc9, 0xd0, 0x67, - 0x92, 0xa0, 0xb7, 0x79, 0x7e, 0xa3, 0x28, 0x6b, 0x23, 0x25, 0x19, 0xfa, 0xcc, 0xd2, 0xe8, 0xe6, - 0xd7, 0x2d, 0xe8, 0x67, 0x67, 0xd0, 0x19, 0x98, 0x57, 0xc2, 0x07, 0xad, 0xf5, 0xd6, 0xa5, 0xae, - 0x35, 0x27, 0x65, 0xa3, 0x55, 0x98, 0x4b, 0x18, 0x66, 0xc3, 0x64, 0x30, 0xbd, 0xde, 0xba, 0x34, - 0x6b, 0xa9, 0x2f, 0xb4, 0x02, 0xb3, 0x24, 0x8e, 0x69, 0x3c, 0x68, 0x0b, 0x74, 0xf9, 0x81, 0x10, - 0xcc, 0x24, 0xde, 0x53, 0x32, 0x98, 0x59, 0x6f, 0x5d, 0x5a, 0xb0, 0xc4, 0x18, 0x0d, 0x60, 0xfe, - 0x90, 0xc4, 0x89, 0x47, 0xc3, 0xc1, 0xac, 0x00, 0xeb, 0x4f, 0x73, 0x1e, 0x66, 0x6f, 0x07, 0x11, - 0x1b, 0x99, 0x6f, 0xc3, 0xe0, 0x21, 0x76, 0x86, 0xc3, 0xe0, 0xa1, 0x58, 0xfe, 0xd6, 0x3e, 0x71, - 0x0e, 0xb4, 0x59, 0xce, 0x42, 0x57, 0x29, 0xa5, 0xd6, 0xb6, 0x60, 0x75, 0x24, 0xe0, 0xae, 0x6b, - 0x7e, 0x07, 0x9e, 0xaf, 0x20, 0x54, 0xe6, 0xb9, 0x08, 0x0b, 0x8f, 0x70, 0xbc, 0x8b, 0x1f, 0x11, - 0x3b, 0xc6, 0xcc, 0xa3, 0x82, 0xba, 0x65, 0xf5, 0x15, 0xd0, 0xe2, 0x30, 0xf3, 0x73, 0x30, 0x72, - 0x1c, 0x68, 0x10, 0x61, 0x87, 0x35, 0x11, 0x8e, 0xd6, 0xa1, 0x17, 0xc5, 0x04, 0xfb, 0x3e, 0x75, - 0x30, 0x23, 0xc2, 0x3e, 0x6d, 0x2b, 0x0b, 0x32, 0xcf, 0xc1, 0xd9, 0x4a, 0xe6, 0x72, 0x81, 0xe6, - 0x3b, 0x85, 0xd5, 0xd3, 0x20, 0xf0, 0x1a, 0x89, 0x36, 0xd7, 0x4a, 0xab, 0x16, 0x94, 0x8a, 0xef, - 0xff, 0x16, 0x66, 0x7d, 0x82, 0xc3, 0x61, 0xd4, 0x88, 0x71, 0x71, 0xc5, 0x9a, 0x34, 0xe5, 0x7c, - 0x46, 0xba, 0xcd, 0x16, 0xf5, 0x7d, 0xe2, 0x30, 0x8f, 0x86, 0x9a, 0xed, 0x79, 0x00, 0x27, 0x05, - 0x2a, 0x27, 0xca, 0x40, 0x4c, 0x03, 0x06, 0x65, 0x52, 0xc5, 0xf6, 0xcf, 0x2d, 0x78, 0xee, 0x86, - 0x32, 0x9a, 0x14, 0xdc, 0x68, 0x03, 0xf2, 0x22, 0xa7, 0x8b, 0x22, 0x8b, 0x1b, 0xd4, 0x2e, 0x6d, - 0x10, 0xc7, 0x88, 0x49, 0xe4, 0x7b, 0x0e, 0x16, 0x2c, 0x66, 0x04, 0x8b, 0x2c, 0x08, 0x2d, 0x41, - 0x9b, 0x31, 0x5f, 0x78, 0x6e, 0xd7, 0xe2, 0x43, 0xb4, 0x09, 0xab, 0x01, 0x09, 0x68, 0x3c, 0xb2, - 0x03, 0x1c, 0xd9, 0x01, 0x7e, 0x62, 0x73, 0x37, 0xb7, 0x83, 0xdd, 0xc1, 0x9c, 0x58, 0x1f, 0x92, - 0xb3, 0xf7, 0x70, 0x74, 0x0f, 0x3f, 0xd9, 0xf1, 0x9e, 0x92, 0x7b, 0xbb, 0xe6, 0x00, 0x56, 0x8b, - 0xfa, 0x29, 0xd5, 0xff, 0x07, 0xce, 0x48, 0xc8, 0xce, 0x28, 0x74, 0x76, 0x44, 0x6c, 0x35, 0xda, - 0xa8, 0x7f, 0xb6, 0x60, 0x50, 0x26, 0x54, 0x9e, 0xff, 0xac, 0x56, 0x3b, 0xb6, 0x4d, 0x2e, 0x40, - 0x8f, 0x61, 0xcf, 0xb7, 0xe9, 0xde, 0x5e, 0x42, 0x98, 0x30, 0xc4, 0x8c, 0x05, 0x1c, 0x74, 0x5f, - 0x40, 0xd0, 0x65, 0x58, 0x72, 0xa4, 0xf7, 0xdb, 0x31, 0x39, 0xf4, 0x44, 0x36, 0x98, 0x17, 0x0b, - 0x5b, 0x74, 0x74, 0x54, 0x48, 0x30, 0x32, 0x61, 0xc1, 0x73, 0x9f, 0xd8, 0x22, 0x1d, 0x89, 0x64, - 0xd2, 0x11, 0xdc, 0x7a, 0x9e, 0xfb, 0xe4, 0x8e, 0xe7, 0x13, 0x6e, 0x51, 0xf3, 0x21, 0xac, 0x49, - 0xe5, 0xef, 0x86, 0x4e, 0x4c, 0x02, 0x12, 0x32, 0xec, 0x6f, 0xd1, 0x68, 0xd4, 0xc8, 0x6d, 0x9e, - 0x87, 0x4e, 0xe2, 0x85, 0x0e, 0xb1, 0x43, 0x99, 0xd4, 0x66, 0xac, 0x79, 0xf1, 0xbd, 0x9d, 0x98, - 0x37, 0xe1, 0x5c, 0x0d, 0x5f, 0x65, 0xd9, 0x17, 0xa0, 0x2f, 0x16, 0xe6, 0xd0, 0x90, 0x91, 0x90, - 0x09, 0xde, 0x7d, 0xab, 0xc7, 0x61, 0x5b, 0x12, 0x64, 0xbe, 0x0e, 0x48, 0xf2, 0xb8, 0x47, 0x87, - 0x61, 0xb3, 0x70, 0x7e, 0x0e, 0x96, 0x73, 0x24, 0xca, 0x37, 0xde, 0x80, 0x15, 0x09, 0xfe, 0x34, - 0x0c, 0x1a, 0xf3, 0x3a, 0x03, 0xcf, 0x15, 0x88, 0x14, 0xb7, 0x4d, 0x2d, 0x24, 0x7f, 0xec, 0x1c, - 0xc9, 0x6c, 0x55, 0xaf, 0x20, 0x7f, 0xf2, 0x88, 0xcc, 0x25, 0x17, 0x8c, 0xe3, 0x03, 0x8b, 0x60, - 0x97, 0x86, 0xfe, 0xa8, 0x71, 0xe6, 0xaa, 0xa0, 0x54, 0x7c, 0x7f, 0xd7, 0x82, 0xd3, 0x3a, 0xa5, - 0x35, 0xdc, 0xcd, 0x63, 0xba, 0x73, 0xbb, 0xd6, 0x9d, 0x67, 0xc6, 0xee, 0x7c, 0x09, 0x96, 0x12, - 0x3a, 0x8c, 0x1d, 0x62, 0xbb, 0x98, 0x61, 0x3b, 0xa4, 0x2e, 0x51, 0xde, 0x7e, 0x4a, 0xc2, 0x6f, - 0x61, 0x86, 0xb7, 0xa9, 0x4b, 0xcc, 0xff, 0xd7, 0x9b, 0x9d, 0xf3, 0x92, 0xcb, 0x70, 0xda, 0xc7, - 0x09, 0xb3, 0x71, 0x14, 0x91, 0xd0, 0xb5, 0x31, 0xe3, 0xae, 0xd6, 0x12, 0xae, 0x76, 0x8a, 0x4f, - 0xdc, 0x10, 0xf0, 0x1b, 0x6c, 0x3b, 0x31, 0x7f, 0x3d, 0x0d, 0x8b, 0x9c, 0x96, 0xbb, 0x76, 0x23, - 0x7d, 0x97, 0xa0, 0x4d, 0x9e, 0x30, 0xa5, 0x28, 0x1f, 0xa2, 0x6b, 0xb0, 0xac, 0x62, 0xc8, 0xa3, - 0xe1, 0x38, 0xbc, 0xda, 0x32, 0x1b, 0x8d, 0xa7, 0xd2, 0x08, 0xbb, 0x00, 0xbd, 0x84, 0xd1, 0x48, - 0x47, 0xeb, 0x8c, 0x8c, 0x56, 0x0e, 0x52, 0xd1, 0x9a, 0xb7, 0xe9, 0x6c, 0x85, 0x4d, 0xfb, 0x5e, - 0x62, 0x13, 0xc7, 0x96, 0xab, 0x12, 0xf1, 0xde, 0xb1, 0xc0, 0x4b, 0x6e, 0x3b, 0xd2, 0x1a, 0xe8, - 0x03, 0x58, 0xf3, 0x1e, 0x85, 0x34, 0x26, 0xb6, 0x32, 0xa4, 0x88, 0x9a, 0x90, 0x32, 0x7b, 0x8f, - 0x0e, 0x43, 0x57, 0xc4, 0x7e, 0xc7, 0x1a, 0x48, 0x9c, 0x1d, 0x81, 0xc2, 0x2d, 0xb0, 0x4d, 0xd9, - 0x1d, 0x3e, 0x6f, 0xbe, 0x05, 0x4b, 0x63, 0xab, 0x34, 0x8f, 0xbd, 0xaf, 0x5b, 0x3a, 0x9d, 0x3e, - 0xc0, 0x9e, 0xbf, 0x43, 0x42, 0x97, 0xc4, 0xcf, 0x98, 0x13, 0xd0, 0x75, 0x58, 0xf1, 0x5c, 0x9f, - 0xd8, 0xcc, 0x0b, 0x08, 0x1d, 0x32, 0x3b, 0x21, 0x0e, 0x0d, 0xdd, 0x44, 0xdb, 0x97, 0xcf, 0x3d, - 0x90, 0x53, 0x3b, 0x72, 0xc6, 0xfc, 0x59, 0x9a, 0x9b, 0xb3, 0xab, 0x18, 0xdf, 0x4a, 0x42, 0x42, - 0x38, 0xc3, 0x7d, 0x82, 0x5d, 0x12, 0x2b, 0x35, 0xfa, 0x12, 0xf8, 0x3d, 0x01, 0xe3, 0x3b, 0xa4, - 0x90, 0x76, 0xa9, 0x3b, 0x12, 0x2b, 0xea, 0x5b, 0x20, 0x41, 0x37, 0xa9, 0x3b, 0x12, 0x49, 0x32, - 0xb1, 0x85, 0x93, 0x39, 0xfb, 0xc3, 0xf0, 0x40, 0xac, 0xa6, 0x63, 0xf5, 0xbc, 0xe4, 0x23, 0x9c, - 0xb0, 0x2d, 0x0e, 0x32, 0x7f, 0xdf, 0xd2, 0x51, 0xca, 0x97, 0x61, 0x11, 0x87, 0x78, 0x87, 0xff, - 0x01, 0x73, 0x70, 0x0a, 0xe5, 0x04, 0xb9, 0xdb, 0xa9, 0x0a, 0x38, 0x24, 0xe7, 0xd4, 0x59, 0x26, - 0x66, 0xc6, 0x49, 0x22, 0xbf, 0x70, 0x95, 0x24, 0xbe, 0xd0, 0x49, 0xfa, 0xb6, 0xb3, 0xb3, 0x8f, - 0x63, 0x37, 0xf9, 0x2e, 0x09, 0x49, 0x8c, 0xd9, 0x89, 0x5c, 0x1a, 0xcc, 0x75, 0x38, 0x5f, 0xc7, - 0x5d, 0xc9, 0xff, 0x5c, 0x1f, 0x3e, 0x1a, 0xc3, 0x22, 0xbb, 0x43, 0xcf, 0x77, 0x4f, 0x44, 0xfc, - 0x87, 0x45, 0xe5, 0x52, 0xe6, 0xca, 0x7f, 0xae, 0xc0, 0xe9, 0x58, 0x80, 0x98, 0x9d, 0x70, 0x84, - 0xb4, 0x5e, 0x58, 0xb0, 0x16, 0xd5, 0x84, 0x20, 0xe4, 0x75, 0xc3, 0x5f, 0x53, 0x0f, 0xd0, 0xdc, - 0x4e, 0x2c, 0xad, 0x9e, 0x85, 0xee, 0x58, 0x7c, 0x5b, 0x88, 0xef, 0x24, 0x4a, 0x2e, 0xf7, 0x4e, - 0x87, 0x46, 0x23, 0x9b, 0x38, 0xf2, 0x1c, 0x17, 0x5b, 0xdd, 0xb1, 0x7a, 0x1c, 0x78, 0xdb, 0x11, - 0xc7, 0x78, 0xf3, 0x1c, 0x9b, 0xe1, 0xf6, 0xa5, 0xe4, 0x36, 0x97, 0xe5, 0xf6, 0x25, 0xe7, 0x36, - 0xf6, 0x98, 0xbc, 0xa2, 0x6a, 0xc7, 0xbe, 0x82, 0xb3, 0xf9, 0xd9, 0xe6, 0x47, 0xe0, 0x33, 0x19, - 0xc2, 0x3c, 0x5f, 0x74, 0x95, 0xc2, 0x39, 0x7a, 0x58, 0x5c, 0x76, 0xe3, 0x3b, 0xc3, 0xb3, 0xad, - 0xeb, 0x5c, 0xd1, 0x20, 0xf9, 0x8b, 0xc7, 0x67, 0xc5, 0x65, 0x1f, 0xe3, 0x02, 0x72, 0xb4, 0xe0, - 0x0b, 0x45, 0xf7, 0x2e, 0xde, 0x52, 0x7e, 0x93, 0xe6, 0x4e, 0x85, 0xc1, 0xef, 0x08, 0x8d, 0x73, - 0x96, 0x92, 0x2b, 0xcc, 0xb1, 0x60, 0xcd, 0x2b, 0xb1, 0xbc, 0x88, 0x55, 0x67, 0x9d, 0xac, 0x01, - 0xd4, 0x57, 0xae, 0x5c, 0x6d, 0xab, 0x72, 0x55, 0x97, 0xe1, 0x07, 0x64, 0x24, 0xfc, 0x71, 0x46, - 0x96, 0xe1, 0x1f, 0x92, 0x91, 0xb9, 0x5d, 0x88, 0x26, 0xb9, 0x34, 0x15, 0x97, 0x08, 0x66, 0xb8, - 0x23, 0xab, 0x74, 0x2e, 0xc6, 0xe8, 0x1c, 0x80, 0x97, 0xd8, 0xae, 0xd8, 0x73, 0xb9, 0xa8, 0x8e, - 0xd5, 0xf5, 0x94, 0x13, 0xb8, 0xe6, 0x2f, 0x32, 0xe1, 0x79, 0xd3, 0xa7, 0xbb, 0x27, 0xe8, 0x95, - 0x59, 0x2d, 0xda, 0x39, 0x2d, 0xb2, 0xf5, 0xf8, 0x4c, 0xbe, 0x1e, 0xcf, 0x04, 0x51, 0x76, 0x39, - 0x75, 0x69, 0xf7, 0x01, 0x3d, 0xb9, 0x5a, 0xad, 0x9c, 0x76, 0xc7, 0xdc, 0x95, 0xfc, 0x77, 0xe1, - 0x2c, 0x37, 0xb8, 0x84, 0x8a, 0x4a, 0xa0, 0x79, 0xb5, 0xf4, 0xb7, 0x69, 0x58, 0xab, 0x26, 0x6e, - 0x52, 0x31, 0xbd, 0x07, 0x46, 0x5a, 0x91, 0xf0, 0x63, 0x2f, 0x61, 0x38, 0x88, 0xd2, 0x83, 0x4f, - 0x9e, 0x8f, 0x67, 0x54, 0x79, 0xf2, 0x40, 0xcf, 0xeb, 0xd3, 0xaf, 0x54, 0xce, 0xb4, 0x4b, 0xe5, - 0x0c, 0x17, 0xe0, 0x62, 0x56, 0x27, 0x40, 0xde, 0xcf, 0xce, 0xb8, 0x98, 0xd5, 0x09, 0x48, 0x89, - 0x85, 0x00, 0xe9, 0xb5, 0x3d, 0x85, 0x2f, 0x04, 0x9c, 0x03, 0x50, 0x57, 0xa7, 0x61, 0xa8, 0xcb, - 0xb3, 0xae, 0xbc, 0x38, 0x0d, 0xc3, 0xda, 0x1b, 0xe4, 0x7c, 0xed, 0x0d, 0x32, 0xbf, 0x9b, 0x9d, - 0xd2, 0x6e, 0x7e, 0x06, 0x70, 0xcb, 0x4b, 0x0e, 0xa4, 0x91, 0xf9, 0x95, 0xd5, 0xf5, 0x62, 0xf5, - 0x26, 0xc0, 0x87, 0x1c, 0x82, 0x7d, 0x5f, 0x99, 0x8e, 0x0f, 0x79, 0xf8, 0x0c, 0x13, 0xe2, 0x2a, - 0xeb, 0x88, 0x31, 0x87, 0xed, 0xc5, 0x84, 0x28, 0x03, 0x88, 0xb1, 0xf9, 0xdb, 0x16, 0x74, 0xef, - 0x91, 0x40, 0x71, 0x3e, 0x0f, 0xf0, 0x88, 0xc6, 0x74, 0xc8, 0xbc, 0x90, 0xc8, 0x1b, 0xf6, 0xac, - 0x95, 0x81, 0x7c, 0x7b, 0x39, 0x22, 0x35, 0x10, 0x7f, 0x4f, 0x19, 0x53, 0x8c, 0x39, 0x6c, 0x9f, - 0xe0, 0x48, 0xd9, 0x4f, 0x8c, 0xd1, 0x0a, 0xcc, 0x26, 0x0c, 0x3b, 0x07, 0xc2, 0x58, 0x33, 0x96, - 0xfc, 0x30, 0xff, 0xd4, 0x02, 0xb0, 0x48, 0x40, 0x99, 0xf0, 0x35, 0x7e, 0x73, 0xdd, 0xc5, 0xce, - 0x01, 0xaf, 0x05, 0xd8, 0x28, 0x22, 0xca, 0x12, 0x3d, 0x05, 0x7b, 0x30, 0x8a, 0xc4, 0x0e, 0x69, - 0x14, 0x95, 0xbf, 0xba, 0x56, 0x57, 0x41, 0xe4, 0xad, 0x5f, 0x87, 0x72, 0xd7, 0xe2, 0xc3, 0x4c, - 0x4e, 0x93, 0xcb, 0xd6, 0x39, 0xed, 0x2c, 0x74, 0x8b, 0xae, 0x20, 0x52, 0x81, 0xf0, 0x83, 0x8b, - 0xb0, 0x10, 0x50, 0xd7, 0xdb, 0xf3, 0x88, 0x2b, 0x1c, 0x4d, 0xa9, 0xd2, 0xd7, 0x40, 0xee, 0x5c, - 0x68, 0x0d, 0xba, 0xe4, 0x09, 0x23, 0x61, 0xea, 0x03, 0x5d, 0x6b, 0x0c, 0x30, 0x6f, 0xc1, 0x29, - 0x75, 0x37, 0xf3, 0x48, 0x7c, 0x37, 0xdc, 0xa3, 0x68, 0x13, 0x66, 0xb9, 0x00, 0xfd, 0x08, 0xb9, - 0x56, 0x7e, 0x84, 0x1c, 0x9b, 0xc2, 0x92, 0xa8, 0xe6, 0x37, 0x2d, 0x58, 0x1f, 0xb3, 0xb9, 0x47, - 0x0f, 0xf9, 0x71, 0xff, 0x80, 0x4a, 0xc4, 0x13, 0xc9, 0x80, 0xef, 0xc0, 0xc0, 0x25, 0x09, 0xf3, - 0x42, 0x51, 0xe4, 0xd9, 0xda, 0xb8, 0x21, 0x0e, 0x88, 0x32, 0xe3, 0x6a, 0x66, 0xfe, 0xa6, 0x9c, - 0xde, 0xc6, 0x01, 0x41, 0x57, 0x61, 0xf9, 0x80, 0x90, 0xc8, 0xf6, 0xa9, 0x83, 0x7d, 0x5b, 0xc7, - 0x96, 0xba, 0xc3, 0x2c, 0xf1, 0xa9, 0x8f, 0xf8, 0xcc, 0x2d, 0x19, 0x5f, 0x66, 0x02, 0x2f, 0x1c, - 0xa1, 0x89, 0xca, 0x2f, 0x6b, 0xd0, 0x8d, 0x62, 0xea, 0x90, 0x84, 0xfb, 0x5e, 0x4b, 0x1c, 0x37, - 0x63, 0x00, 0xba, 0x0e, 0xcb, 0xe9, 0xc7, 0xc7, 0x24, 0x76, 0x48, 0xc8, 0xf0, 0x23, 0xf9, 0xa2, - 0x38, 0x6d, 0x55, 0x4d, 0x99, 0xbf, 0x6a, 0x81, 0x59, 0x92, 0x7a, 0x27, 0xa6, 0xc1, 0x09, 0x5a, - 0xf0, 0x1a, 0xac, 0x08, 0x3b, 0xc4, 0x82, 0xe5, 0xd8, 0x10, 0xb2, 0xd4, 0x38, 0xcd, 0xe7, 0xa4, - 0x34, 0x6d, 0x89, 0x21, 0x5c, 0x3c, 0x72, 0x4d, 0xff, 0x26, 0x5b, 0xfc, 0xa3, 0x0f, 0xfd, 0x4f, - 0x86, 0x24, 0x1e, 0x65, 0x9e, 0x22, 0x13, 0xa2, 0xb4, 0xd0, 0x6f, 0xe9, 0x19, 0x08, 0xcf, 0x98, - 0x7b, 0x31, 0x0d, 0xec, 0xf4, 0xb9, 0x7d, 0x5a, 0xa0, 0xf4, 0x38, 0xf0, 0x8e, 0x7c, 0x72, 0x47, - 0xef, 0xc3, 0xdc, 0x9e, 0xe7, 0x33, 0x22, 0x1f, 0xb8, 0x7b, 0x9b, 0x2f, 0x95, 0xbd, 0x3a, 0x2b, - 0x73, 0xe3, 0x8e, 0x40, 0xb6, 0x14, 0x11, 0xda, 0x85, 0x65, 0x2f, 0x8c, 0x44, 0x79, 0x14, 0x7b, - 0xd8, 0xf7, 0x9e, 0x8e, 0x1f, 0xd3, 0x7a, 0x9b, 0xaf, 0x4f, 0xe0, 0x75, 0x97, 0x53, 0xee, 0x64, - 0x09, 0x2d, 0xe4, 0x95, 0x60, 0x88, 0xc0, 0x0a, 0x1d, 0xb2, 0xb2, 0x90, 0x59, 0x21, 0x64, 0x73, - 0x82, 0x90, 0xfb, 0x82, 0x34, 0x2f, 0x65, 0x99, 0x96, 0x81, 0xc6, 0x36, 0xcc, 0x49, 0xe5, 0x78, - 0xae, 0xdb, 0xf3, 0x88, 0xaf, 0x5b, 0x04, 0xf2, 0x83, 0xdf, 0x27, 0x68, 0x44, 0x62, 0x1c, 0xea, - 0xb4, 0xa5, 0x3f, 0x39, 0xfe, 0x21, 0xf6, 0x87, 0x3a, 0xde, 0xe4, 0x87, 0xf1, 0xc7, 0x59, 0x40, - 0x65, 0x0d, 0xf5, 0x0b, 0x61, 0x4c, 0x12, 0x9e, 0x66, 0xb2, 0x79, 0x72, 0x31, 0x03, 0x17, 0xb9, - 0xf2, 0x07, 0xd0, 0x75, 0x92, 0x43, 0x5b, 0x98, 0x44, 0xc8, 0xec, 0x6d, 0xbe, 0x7b, 0x6c, 0x93, - 0x6e, 0x6c, 0xed, 0x3c, 0x14, 0x50, 0xab, 0xe3, 0x24, 0x87, 0x62, 0x84, 0x7e, 0x04, 0xf0, 0x65, - 0x42, 0x43, 0xc5, 0x59, 0x6e, 0xfc, 0x7b, 0xc7, 0xe7, 0xfc, 0xfd, 0x9d, 0xfb, 0xdb, 0x92, 0x75, - 0x97, 0xb3, 0x93, 0xbc, 0x1d, 0x58, 0x88, 0x70, 0xfc, 0x78, 0x48, 0x98, 0x62, 0x2f, 0x7d, 0xe1, - 0x83, 0xe3, 0xb3, 0xff, 0x58, 0xb2, 0x91, 0x12, 0xfa, 0x51, 0xe6, 0xcb, 0xf8, 0x66, 0x1a, 0x3a, - 0x5a, 0x2f, 0x5e, 0x61, 0x09, 0x0f, 0x97, 0xef, 0x0c, 0xb6, 0x17, 0xee, 0x51, 0x65, 0xd1, 0x53, - 0x1c, 0x2e, 0x9f, 0x1a, 0x44, 0x06, 0xbf, 0x0c, 0x4b, 0x31, 0x71, 0x68, 0xec, 0xf2, 0xbb, 0xaa, - 0x17, 0x78, 0xdc, 0xed, 0xe5, 0x5e, 0x2e, 0x4a, 0xf8, 0x2d, 0x0d, 0x46, 0xaf, 0xc0, 0xa2, 0xd8, - 0xf6, 0x0c, 0x66, 0x5b, 0xf3, 0x24, 0x7e, 0x06, 0xf1, 0x32, 0x2c, 0x3d, 0x1e, 0xf2, 0xbc, 0xe1, - 0xec, 0xe3, 0x18, 0x3b, 0x8c, 0xa6, 0x15, 0xff, 0xa2, 0x80, 0x6f, 0xa5, 0x60, 0xf4, 0x26, 0xac, - 0x4a, 0x54, 0x92, 0x38, 0x38, 0x4a, 0x29, 0x48, 0xac, 0x0a, 0xc2, 0x15, 0x31, 0x7b, 0x5b, 0x4c, - 0x6e, 0xe9, 0x39, 0x64, 0x40, 0xc7, 0xa1, 0x41, 0x40, 0x42, 0x96, 0x88, 0x63, 0xac, 0x6b, 0xa5, - 0xdf, 0xe8, 0x06, 0x9c, 0xc3, 0xbe, 0x4f, 0xbf, 0xb2, 0x05, 0xa5, 0x6b, 0x97, 0xb4, 0x93, 0xef, - 0x4f, 0x86, 0x40, 0xfa, 0x44, 0xe0, 0x58, 0x79, 0x45, 0x8d, 0x0b, 0xd0, 0x4d, 0xf7, 0x91, 0x9f, - 0xfc, 0x19, 0x87, 0x14, 0x63, 0xe3, 0x14, 0xf4, 0xb3, 0x3b, 0x61, 0xfc, 0xbd, 0x0d, 0xcb, 0x15, - 0x41, 0x85, 0x3e, 0x07, 0xe0, 0xde, 0x2a, 0x43, 0x4b, 0xb9, 0xeb, 0xff, 0x1d, 0x3f, 0x38, 0xb9, - 0xbf, 0x4a, 0xb0, 0xc5, 0xbd, 0x5f, 0x0e, 0xd1, 0x8f, 0xa1, 0x27, 0x3c, 0x56, 0x71, 0x97, 0x2e, - 0xfb, 0xfe, 0xb7, 0xe0, 0xce, 0x75, 0x55, 0xec, 0x45, 0x0c, 0xc8, 0xb1, 0xf1, 0x97, 0x16, 0x74, - 0x53, 0xc1, 0xfc, 0x1e, 0x23, 0x37, 0x4a, 0xec, 0x75, 0xa2, 0xef, 0x31, 0x02, 0x76, 0x47, 0x80, - 0xfe, 0x2b, 0x5d, 0xc9, 0x78, 0x1b, 0x60, 0xac, 0x7f, 0xa5, 0x0a, 0xad, 0x4a, 0x15, 0xcc, 0xcb, - 0xb0, 0xc0, 0x2d, 0xeb, 0x11, 0x77, 0x87, 0xc5, 0x5e, 0x24, 0x9a, 0x9d, 0x12, 0x27, 0x51, 0x85, - 0xa0, 0xfe, 0xdc, 0xfc, 0x83, 0x01, 0xfd, 0xec, 0x23, 0x17, 0xfa, 0x02, 0x7a, 0x99, 0xa6, 0x2e, - 0x7a, 0xb1, 0xbc, 0x69, 0xe5, 0x26, 0xb1, 0xf1, 0xd2, 0x04, 0x2c, 0x55, 0x2b, 0x4d, 0xa1, 0x10, - 0x4e, 0x97, 0x3a, 0xa3, 0xe8, 0x4a, 0x99, 0xba, 0xae, 0xef, 0x6a, 0xbc, 0xda, 0x08, 0x37, 0x95, - 0xc7, 0x60, 0xb9, 0xa2, 0xd5, 0x89, 0x5e, 0x9b, 0xc0, 0x25, 0xd7, 0x6e, 0x35, 0xae, 0x36, 0xc4, - 0x4e, 0xa5, 0x3e, 0x06, 0x54, 0xee, 0x83, 0xa2, 0x57, 0x27, 0xb2, 0x19, 0xf7, 0x59, 0x8d, 0xd7, - 0x9a, 0x21, 0xd7, 0x2a, 0x2a, 0x3b, 0xa4, 0x13, 0x15, 0xcd, 0xf5, 0x60, 0x27, 0x2a, 0x5a, 0x68, - 0xbb, 0x4e, 0xa1, 0x03, 0x58, 0x2a, 0x76, 0x4f, 0xd1, 0xe5, 0xba, 0x6e, 0x7f, 0xa9, 0x39, 0x6b, - 0x5c, 0x69, 0x82, 0x9a, 0x0a, 0x23, 0x70, 0x2a, 0xdf, 0xad, 0x44, 0xaf, 0x94, 0xe9, 0x2b, 0xfb, - 0xb5, 0xc6, 0xa5, 0xc9, 0x88, 0x59, 0x9d, 0x8a, 0x1d, 0xcc, 0x2a, 0x9d, 0x6a, 0xda, 0xa3, 0x55, - 0x3a, 0xd5, 0x35, 0x44, 0xcd, 0x29, 0xf4, 0x13, 0xdd, 0x16, 0x2b, 0x74, 0xf6, 0xd0, 0x46, 0x1d, - 0x9b, 0xea, 0xd6, 0xa2, 0x71, 0xad, 0x31, 0xbe, 0x96, 0x7d, 0xbd, 0xc5, 0x63, 0x3d, 0xd3, 0xe0, - 0xab, 0x8a, 0xf5, 0x72, 0xcb, 0xb0, 0x2a, 0xd6, 0xab, 0xba, 0x84, 0x53, 0x68, 0x17, 0x16, 0x72, - 0x2d, 0x3f, 0xf4, 0x72, 0x1d, 0x65, 0xfe, 0x1d, 0xcf, 0x78, 0x65, 0x22, 0x5e, 0x2a, 0xc3, 0xd6, - 0xd9, 0x4b, 0xa5, 0xab, 0xda, 0xc5, 0xe5, 0xf3, 0xd5, 0xcb, 0x93, 0xd0, 0x72, 0xa1, 0x5c, 0x6a, - 0x0c, 0x56, 0x86, 0x72, 0x5d, 0xe3, 0xb1, 0x32, 0x94, 0xeb, 0x7b, 0x8d, 0x53, 0xe8, 0x87, 0x00, - 0xe3, 0xe6, 0x1d, 0xba, 0x58, 0x47, 0x9d, 0xdd, 0xfd, 0x17, 0x8f, 0x46, 0x4a, 0x59, 0x7f, 0x05, - 0x2b, 0x55, 0xef, 0x4d, 0xe8, 0x6a, 0x55, 0x71, 0x5c, 0xfb, 0xa8, 0x65, 0x6c, 0x34, 0x45, 0x4f, - 0x05, 0x7f, 0x0a, 0x1d, 0xdd, 0x38, 0x43, 0x2f, 0x94, 0xa9, 0x0b, 0xad, 0x46, 0xc3, 0x3c, 0x0a, - 0x25, 0xe3, 0xc0, 0x81, 0x8e, 0xd5, 0x71, 0x47, 0xab, 0x3e, 0x56, 0x4b, 0xbd, 0xb7, 0xfa, 0x58, - 0x2d, 0x37, 0xc8, 0x84, 0xb8, 0xd4, 0x19, 0xb2, 0x0d, 0xa0, 0x7a, 0x67, 0xa8, 0xe8, 0x6f, 0xd5, - 0x3b, 0x43, 0x65, 0x4f, 0x69, 0x0a, 0xfd, 0x14, 0x56, 0xab, 0xfb, 0x3e, 0xa8, 0x36, 0xe2, 0x6b, - 0xfa, 0x4f, 0xc6, 0xf5, 0xe6, 0x04, 0xa9, 0xf8, 0xa7, 0x3a, 0x3f, 0x15, 0xfa, 0x3e, 0xf5, 0xf9, - 0xa9, 0xba, 0xfb, 0x64, 0x5c, 0x6b, 0x8c, 0x5f, 0x0e, 0xbd, 0x6c, 0xf3, 0xa4, 0xde, 0xda, 0x15, - 0xbd, 0xa4, 0x7a, 0x6b, 0x57, 0xf6, 0x63, 0x44, 0x7c, 0x54, 0x35, 0x46, 0xaa, 0xe2, 0xe3, 0x88, - 0xce, 0x8d, 0xb1, 0xd1, 0x14, 0x3d, 0x77, 0x7c, 0x97, 0x3b, 0x1f, 0x68, 0xe2, 0xfa, 0x73, 0x99, - 0xf9, 0x6a, 0x43, 0xec, 0xfa, 0xdd, 0xd5, 0x99, 0x7a, 0xa2, 0x02, 0x85, 0x8c, 0x7d, 0xad, 0x31, - 0x7e, 0x2a, 0x3b, 0xd2, 0xbf, 0x54, 0x64, 0xba, 0x16, 0xe8, 0xca, 0x04, 0x3e, 0x99, 0xae, 0x8b, - 0xf1, 0x6a, 0x23, 0xdc, 0xaa, 0xe8, 0xcd, 0xf6, 0x11, 0x8e, 0xf2, 0xa7, 0x52, 0xf3, 0xe3, 0x28, - 0x7f, 0xaa, 0x68, 0x4d, 0x54, 0x44, 0xaf, 0x6e, 0x1f, 0x4c, 0x8e, 0xde, 0x42, 0x1b, 0x63, 0x72, - 0xf4, 0x96, 0x3a, 0x13, 0x53, 0xe8, 0xe7, 0xe3, 0x56, 0x7b, 0xf9, 0x11, 0x10, 0x6d, 0xd6, 0xa6, - 0xa2, 0xda, 0xb7, 0x4f, 0xe3, 0x8d, 0x63, 0xd1, 0x64, 0x8c, 0xff, 0xcb, 0x96, 0xee, 0xed, 0x55, - 0xbe, 0xc2, 0xa1, 0x37, 0x1b, 0x30, 0x2e, 0x3d, 0x24, 0x1a, 0x6f, 0x1d, 0x93, 0x2a, 0xb3, 0xa0, - 0x8f, 0x60, 0x56, 0x54, 0x9f, 0xe8, 0xfc, 0xd1, 0x65, 0xa9, 0x71, 0xa1, 0x7a, 0x3e, 0x2d, 0xae, - 0x38, 0xb7, 0xdd, 0x39, 0xf1, 0x53, 0xed, 0x1b, 0xff, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x45, 0x99, - 0xc4, 0xf9, 0x6b, 0x2b, 0x00, 0x00, + // 2885 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x3a, 0x4d, 0x73, 0xdc, 0xc6, + 0xb1, 0x5c, 0x2e, 0x3f, 0x76, 0x7b, 0x97, 0x22, 0x35, 0xa4, 0xa9, 0x35, 0x44, 0x49, 0x34, 0xe4, + 0x0f, 0x49, 0xb6, 0x28, 0x99, 0xb6, 0x9f, 0xfd, 0xec, 0x67, 0x3f, 0x4b, 0x94, 0xf4, 0x9e, 0x62, + 0x8b, 0xb2, 0x41, 0x59, 0x71, 0x62, 0x57, 0x50, 0x43, 0x60, 0x28, 0xc2, 0x04, 0x30, 0x10, 0x30, + 0x4b, 0x6b, 0x55, 0xc9, 0xc9, 0x39, 0xe4, 0x92, 0x1c, 0x52, 0xb9, 0xe4, 0x9c, 0x7b, 0xae, 0xf9, + 0x03, 0x39, 0xf8, 0x0f, 0xa4, 0x2a, 0xa7, 0x5c, 0x72, 0xc8, 0x29, 0x87, 0xdc, 0x52, 0x95, 0x4b, + 0x6a, 0xbe, 0xb0, 0xf8, 0xe4, 0x82, 0x16, 0x53, 0xa9, 0xdc, 0x06, 0x3d, 0xfd, 0x31, 0xdd, 0xd3, + 0xdd, 0x33, 0x3d, 0x0d, 0x58, 0x3e, 0xa4, 0xfe, 0x30, 0x20, 0x76, 0x42, 0xe2, 0x43, 0x12, 0x6f, + 0x44, 0x31, 0x65, 0x14, 0x2d, 0xe5, 0x80, 0x76, 0xb4, 0x6b, 0x5e, 0x03, 0x74, 0x13, 0x33, 0x67, + 0xff, 0x16, 0xf1, 0x09, 0x23, 0x16, 0x79, 0x3c, 0x24, 0x09, 0x43, 0xcf, 0x43, 0x67, 0xcf, 0xf3, + 0x89, 0xed, 0xb9, 0xc9, 0xa0, 0xb5, 0xde, 0xbe, 0xd4, 0xb5, 0xe6, 0xf9, 0xf7, 0x5d, 0x37, 0x31, + 0xef, 0xc3, 0x72, 0x8e, 0x20, 0x89, 0x68, 0x98, 0x10, 0xf4, 0x0e, 0xcc, 0xc7, 0x24, 0x19, 0xfa, + 0x4c, 0x12, 0xf4, 0x36, 0xcf, 0x6f, 0x14, 0x65, 0x6d, 0xa4, 0x24, 0x43, 0x9f, 0x59, 0x1a, 0xdd, + 0xfc, 0xa6, 0x05, 0xfd, 0xec, 0x0c, 0x3a, 0x03, 0xf3, 0x4a, 0xf8, 0xa0, 0xb5, 0xde, 0xba, 0xd4, + 0xb5, 0xe6, 0xa4, 0x6c, 0xb4, 0x0a, 0x73, 0x09, 0xc3, 0x6c, 0x98, 0x0c, 0xa6, 0xd7, 0x5b, 0x97, + 0x66, 0x2d, 0xf5, 0x85, 0x56, 0x60, 0x96, 0xc4, 0x31, 0x8d, 0x07, 0x6d, 0x81, 0x2e, 0x3f, 0x10, + 0x82, 0x99, 0xc4, 0x7b, 0x4a, 0x06, 0x33, 0xeb, 0xad, 0x4b, 0x0b, 0x96, 0x18, 0xa3, 0x01, 0xcc, + 0x1f, 0x92, 0x38, 0xf1, 0x68, 0x38, 0x98, 0x15, 0x60, 0xfd, 0x69, 0xce, 0xc3, 0xec, 0xed, 0x20, + 0x62, 0x23, 0xf3, 0x6d, 0x18, 0x3c, 0xc4, 0xce, 0x70, 0x18, 0x3c, 0x14, 0xcb, 0xdf, 0xda, 0x27, + 0xce, 0x81, 0x36, 0xcb, 0x59, 0xe8, 0x2a, 0xa5, 0xd4, 0xda, 0x16, 0xac, 0x8e, 0x04, 0xdc, 0x75, + 0xcd, 0x0f, 0xe1, 0xf9, 0x0a, 0x42, 0x65, 0x9e, 0x8b, 0xb0, 0xf0, 0x08, 0xc7, 0xbb, 0xf8, 0x11, + 0xb1, 0x63, 0xcc, 0x3c, 0x2a, 0xa8, 0x5b, 0x56, 0x5f, 0x01, 0x2d, 0x0e, 0x33, 0xbf, 0x00, 0x23, + 0xc7, 0x81, 0x06, 0x11, 0x76, 0x58, 0x13, 0xe1, 0x68, 0x1d, 0x7a, 0x51, 0x4c, 0xb0, 0xef, 0x53, + 0x07, 0x33, 0x22, 0xec, 0xd3, 0xb6, 0xb2, 0x20, 0xf3, 0x1c, 0x9c, 0xad, 0x64, 0x2e, 0x17, 0x68, + 0xbe, 0x53, 0x58, 0x3d, 0x0d, 0x02, 0xaf, 0x91, 0x68, 0x73, 0xad, 0xb4, 0x6a, 0x41, 0xa9, 0xf8, + 0xfe, 0x77, 0x61, 0xd6, 0x27, 0x38, 0x1c, 0x46, 0x8d, 0x18, 0x17, 0x57, 0xac, 0x49, 0x53, 0xce, + 0x67, 0xa4, 0xdb, 0x6c, 0x51, 0xdf, 0x27, 0x0e, 0xf3, 0x68, 0xa8, 0xd9, 0x9e, 0x07, 0x70, 0x52, + 0xa0, 0x72, 0xa2, 0x0c, 0xc4, 0x34, 0x60, 0x50, 0x26, 0x55, 0x6c, 0xff, 0xd4, 0x82, 0xe7, 0x6e, + 0x28, 0xa3, 0x49, 0xc1, 0x8d, 0x36, 0x20, 0x2f, 0x72, 0xba, 0x28, 0xb2, 0xb8, 0x41, 0xed, 0xd2, + 0x06, 0x71, 0x8c, 0x98, 0x44, 0xbe, 0xe7, 0x60, 0xc1, 0x62, 0x46, 0xb0, 0xc8, 0x82, 0xd0, 0x12, + 0xb4, 0x19, 0xf3, 0x85, 0xe7, 0x76, 0x2d, 0x3e, 0x44, 0x9b, 0xb0, 0x1a, 0x90, 0x80, 0xc6, 0x23, + 0x3b, 0xc0, 0x91, 0x1d, 0xe0, 0x27, 0x36, 0x77, 0x73, 0x3b, 0xd8, 0x1d, 0xcc, 0x89, 0xf5, 0x21, + 0x39, 0x7b, 0x0f, 0x47, 0xf7, 0xf0, 0x93, 0x1d, 0xef, 0x29, 0xb9, 0xb7, 0x6b, 0x0e, 0x60, 0xb5, + 0xa8, 0x9f, 0x52, 0xfd, 0xbf, 0xe0, 0x8c, 0x84, 0xec, 0x8c, 0x42, 0x67, 0x47, 0xc4, 0x56, 0xa3, + 0x8d, 0xfa, 0x47, 0x0b, 0x06, 0x65, 0x42, 0xe5, 0xf9, 0xcf, 0x6a, 0xb5, 0x63, 0xdb, 0xe4, 0x02, + 0xf4, 0x18, 0xf6, 0x7c, 0x9b, 0xee, 0xed, 0x25, 0x84, 0x09, 0x43, 0xcc, 0x58, 0xc0, 0x41, 0xf7, + 0x05, 0x04, 0x5d, 0x86, 0x25, 0x47, 0x7a, 0xbf, 0x1d, 0x93, 0x43, 0x4f, 0x64, 0x83, 0x79, 0xb1, + 0xb0, 0x45, 0x47, 0x47, 0x85, 0x04, 0x23, 0x13, 0x16, 0x3c, 0xf7, 0x89, 0x2d, 0xd2, 0x91, 0x48, + 0x26, 0x1d, 0xc1, 0xad, 0xe7, 0xb9, 0x4f, 0xee, 0x78, 0x3e, 0xe1, 0x16, 0x35, 0x1f, 0xc2, 0x9a, + 0x54, 0xfe, 0x6e, 0xe8, 0xc4, 0x24, 0x20, 0x21, 0xc3, 0xfe, 0x16, 0x8d, 0x46, 0x8d, 0xdc, 0xe6, + 0x79, 0xe8, 0x24, 0x5e, 0xe8, 0x10, 0x3b, 0x94, 0x49, 0x6d, 0xc6, 0x9a, 0x17, 0xdf, 0xdb, 0x89, + 0x79, 0x13, 0xce, 0xd5, 0xf0, 0x55, 0x96, 0x7d, 0x01, 0xfa, 0x62, 0x61, 0x0e, 0x0d, 0x19, 0x09, + 0x99, 0xe0, 0xdd, 0xb7, 0x7a, 0x1c, 0xb6, 0x25, 0x41, 0xe6, 0xeb, 0x80, 0x24, 0x8f, 0x7b, 0x74, + 0x18, 0x36, 0x0b, 0xe7, 0xe7, 0x60, 0x39, 0x47, 0xa2, 0x7c, 0xe3, 0x0d, 0x58, 0x91, 0xe0, 0xcf, + 0xc2, 0xa0, 0x31, 0xaf, 0x33, 0xf0, 0x5c, 0x81, 0x48, 0x71, 0xdb, 0xd4, 0x42, 0xf2, 0xc7, 0xce, + 0x91, 0xcc, 0x56, 0xf5, 0x0a, 0xf2, 0x27, 0x8f, 0xc8, 0x5c, 0x72, 0xc1, 0x38, 0x3e, 0xb0, 0x08, + 0x76, 0x69, 0xe8, 0x8f, 0x1a, 0x67, 0xae, 0x0a, 0x4a, 0xc5, 0xf7, 0xb7, 0x2d, 0x38, 0xad, 0x53, + 0x5a, 0xc3, 0xdd, 0x3c, 0xa6, 0x3b, 0xb7, 0x6b, 0xdd, 0x79, 0x66, 0xec, 0xce, 0x97, 0x60, 0x29, + 0xa1, 0xc3, 0xd8, 0x21, 0xb6, 0x8b, 0x19, 0xb6, 0x43, 0xea, 0x12, 0xe5, 0xed, 0xa7, 0x24, 0xfc, + 0x16, 0x66, 0x78, 0x9b, 0xba, 0xc4, 0xfc, 0x5f, 0xbd, 0xd9, 0x39, 0x2f, 0xb9, 0x0c, 0xa7, 0x7d, + 0x9c, 0x30, 0x1b, 0x47, 0x11, 0x09, 0x5d, 0x1b, 0x33, 0xee, 0x6a, 0x2d, 0xe1, 0x6a, 0xa7, 0xf8, + 0xc4, 0x0d, 0x01, 0xbf, 0xc1, 0xb6, 0x13, 0xf3, 0x57, 0xd3, 0xb0, 0xc8, 0x69, 0xb9, 0x6b, 0x37, + 0xd2, 0x77, 0x09, 0xda, 0xe4, 0x09, 0x53, 0x8a, 0xf2, 0x21, 0xba, 0x06, 0xcb, 0x2a, 0x86, 0x3c, + 0x1a, 0x8e, 0xc3, 0xab, 0x2d, 0xb3, 0xd1, 0x78, 0x2a, 0x8d, 0xb0, 0x0b, 0xd0, 0x4b, 0x18, 0x8d, + 0x74, 0xb4, 0xce, 0xc8, 0x68, 0xe5, 0x20, 0x15, 0xad, 0x79, 0x9b, 0xce, 0x56, 0xd8, 0xb4, 0xef, + 0x25, 0x36, 0x71, 0x6c, 0xb9, 0x2a, 0x11, 0xef, 0x1d, 0x0b, 0xbc, 0xe4, 0xb6, 0x23, 0xad, 0x81, + 0x3e, 0x80, 0x35, 0xef, 0x51, 0x48, 0x63, 0x62, 0x2b, 0x43, 0x8a, 0xa8, 0x09, 0x29, 0xb3, 0xf7, + 0xe8, 0x30, 0x74, 0x45, 0xec, 0x77, 0xac, 0x81, 0xc4, 0xd9, 0x11, 0x28, 0xdc, 0x02, 0xdb, 0x94, + 0xdd, 0xe1, 0xf3, 0xe6, 0x5b, 0xb0, 0x34, 0xb6, 0x4a, 0xf3, 0xd8, 0xfb, 0xa6, 0xa5, 0xd3, 0xe9, + 0x03, 0xec, 0xf9, 0x3b, 0x24, 0x74, 0x49, 0xfc, 0x8c, 0x39, 0x01, 0x5d, 0x87, 0x15, 0xcf, 0xf5, + 0x89, 0xcd, 0xbc, 0x80, 0xd0, 0x21, 0xb3, 0x13, 0xe2, 0xd0, 0xd0, 0x4d, 0xb4, 0x7d, 0xf9, 0xdc, + 0x03, 0x39, 0xb5, 0x23, 0x67, 0xcc, 0x9f, 0xa6, 0xb9, 0x39, 0xbb, 0x8a, 0xf1, 0xad, 0x24, 0x24, + 0x84, 0x33, 0xdc, 0x27, 0xd8, 0x25, 0xb1, 0x52, 0xa3, 0x2f, 0x81, 0xff, 0x2f, 0x60, 0x7c, 0x87, + 0x14, 0xd2, 0x2e, 0x75, 0x47, 0x62, 0x45, 0x7d, 0x0b, 0x24, 0xe8, 0x26, 0x75, 0x47, 0x22, 0x49, + 0x26, 0xb6, 0x70, 0x32, 0x67, 0x7f, 0x18, 0x1e, 0x88, 0xd5, 0x74, 0xac, 0x9e, 0x97, 0x7c, 0x8c, + 0x13, 0xb6, 0xc5, 0x41, 0xe6, 0xef, 0x5a, 0x3a, 0x4a, 0xf9, 0x32, 0x2c, 0xe2, 0x10, 0xef, 0xf0, + 0xdf, 0x60, 0x0e, 0x4e, 0xa1, 0x9c, 0x20, 0x77, 0x3b, 0x55, 0x01, 0x87, 0xe4, 0x9c, 0x3a, 0xcb, + 0xc4, 0xcc, 0x38, 0x49, 0xe4, 0x17, 0xae, 0x92, 0xc4, 0x97, 0x3a, 0x49, 0xdf, 0x76, 0x76, 0xf6, + 0x71, 0xec, 0x26, 0xff, 0x47, 0x42, 0x12, 0x63, 0x76, 0x22, 0x97, 0x06, 0x73, 0x1d, 0xce, 0xd7, + 0x71, 0x57, 0xf2, 0xbf, 0xd0, 0x87, 0x8f, 0xc6, 0xb0, 0xc8, 0xee, 0xd0, 0xf3, 0xdd, 0x13, 0x11, + 0xff, 0x51, 0x51, 0xb9, 0x94, 0xb9, 0xf2, 0x9f, 0x2b, 0x70, 0x3a, 0x16, 0x20, 0x66, 0x27, 0x1c, + 0x21, 0xad, 0x17, 0x16, 0xac, 0x45, 0x35, 0x21, 0x08, 0x79, 0xdd, 0xf0, 0x97, 0xd4, 0x03, 0x34, + 0xb7, 0x13, 0x4b, 0xab, 0x67, 0xa1, 0x3b, 0x16, 0xdf, 0x16, 0xe2, 0x3b, 0x89, 0x92, 0xcb, 0xbd, + 0xd3, 0xa1, 0xd1, 0xc8, 0x26, 0x8e, 0x3c, 0xc7, 0xc5, 0x56, 0x77, 0xac, 0x1e, 0x07, 0xde, 0x76, + 0xc4, 0x31, 0xde, 0x3c, 0xc7, 0x66, 0xb8, 0x7d, 0x25, 0xb9, 0xcd, 0x65, 0xb9, 0x7d, 0xc5, 0xb9, + 0x8d, 0x3d, 0x26, 0xaf, 0xa8, 0xda, 0xb1, 0xaf, 0xe1, 0x6c, 0x7e, 0xb6, 0xf9, 0x11, 0xf8, 0x4c, + 0x86, 0x30, 0xcf, 0x17, 0x5d, 0xa5, 0x70, 0x8e, 0x1e, 0x16, 0x97, 0xdd, 0xf8, 0xce, 0xf0, 0x6c, + 0xeb, 0x3a, 0x57, 0x34, 0x48, 0xfe, 0xe2, 0xf1, 0x79, 0x71, 0xd9, 0xc7, 0xb8, 0x80, 0x1c, 0x2d, + 0xf8, 0x42, 0xd1, 0xbd, 0x8b, 0xb7, 0x94, 0x5f, 0xa7, 0xb9, 0x53, 0x61, 0xf0, 0x3b, 0x42, 0xe3, + 0x9c, 0xa5, 0xe4, 0x0a, 0x73, 0x2c, 0x58, 0xf3, 0x4a, 0x2c, 0x2f, 0x62, 0xd5, 0x59, 0x27, 0x6b, + 0x00, 0xf5, 0x95, 0x2b, 0x57, 0xdb, 0xaa, 0x5c, 0xd5, 0x65, 0xf8, 0x01, 0x19, 0x09, 0x7f, 0x9c, + 0x91, 0x65, 0xf8, 0x47, 0x64, 0x64, 0x6e, 0x17, 0xa2, 0x49, 0x2e, 0x4d, 0xc5, 0x25, 0x82, 0x19, + 0xee, 0xc8, 0x2a, 0x9d, 0x8b, 0x31, 0x3a, 0x07, 0xe0, 0x25, 0xb6, 0x2b, 0xf6, 0x5c, 0x2e, 0xaa, + 0x63, 0x75, 0x3d, 0xe5, 0x04, 0xae, 0xf9, 0xf3, 0x4c, 0x78, 0xde, 0xf4, 0xe9, 0xee, 0x09, 0x7a, + 0x65, 0x56, 0x8b, 0x76, 0x4e, 0x8b, 0x6c, 0x3d, 0x3e, 0x93, 0xaf, 0xc7, 0x33, 0x41, 0x94, 0x5d, + 0x4e, 0x5d, 0xda, 0x7d, 0x40, 0x4f, 0xae, 0x56, 0x2b, 0xa7, 0xdd, 0x31, 0x77, 0x25, 0xff, 0x5d, + 0x38, 0xcb, 0x0d, 0x2e, 0xa1, 0xa2, 0x12, 0x68, 0x5e, 0x2d, 0xfd, 0x75, 0x1a, 0xd6, 0xaa, 0x89, + 0x9b, 0x54, 0x4c, 0xef, 0x81, 0x91, 0x56, 0x24, 0xfc, 0xd8, 0x4b, 0x18, 0x0e, 0xa2, 0xf4, 0xe0, + 0x93, 0xe7, 0xe3, 0x19, 0x55, 0x9e, 0x3c, 0xd0, 0xf3, 0xfa, 0xf4, 0x2b, 0x95, 0x33, 0xed, 0x52, + 0x39, 0xc3, 0x05, 0xb8, 0x98, 0xd5, 0x09, 0x90, 0xf7, 0xb3, 0x33, 0x2e, 0x66, 0x75, 0x02, 0x52, + 0x62, 0x21, 0x40, 0x7a, 0x6d, 0x4f, 0xe1, 0x0b, 0x01, 0xe7, 0x00, 0xd4, 0xd5, 0x69, 0x18, 0xea, + 0xf2, 0xac, 0x2b, 0x2f, 0x4e, 0xc3, 0xb0, 0xf6, 0x06, 0x39, 0x5f, 0x7b, 0x83, 0xcc, 0xef, 0x66, + 0xa7, 0xb4, 0x9b, 0x9f, 0x03, 0xdc, 0xf2, 0x92, 0x03, 0x69, 0x64, 0x7e, 0x65, 0x75, 0xbd, 0x58, + 0xbd, 0x09, 0xf0, 0x21, 0x87, 0x60, 0xdf, 0x57, 0xa6, 0xe3, 0x43, 0x1e, 0x3e, 0xc3, 0x84, 0xb8, + 0xca, 0x3a, 0x62, 0xcc, 0x61, 0x7b, 0x31, 0x21, 0xca, 0x00, 0x62, 0x6c, 0xfe, 0xa6, 0x05, 0xdd, + 0x7b, 0x24, 0x50, 0x9c, 0xcf, 0x03, 0x3c, 0xa2, 0x31, 0x1d, 0x32, 0x2f, 0x24, 0xf2, 0x86, 0x3d, + 0x6b, 0x65, 0x20, 0xdf, 0x5d, 0x8e, 0x48, 0x0d, 0xc4, 0xdf, 0x53, 0xc6, 0x14, 0x63, 0x0e, 0xdb, + 0x27, 0x38, 0x52, 0xf6, 0x13, 0x63, 0xb4, 0x02, 0xb3, 0x09, 0xc3, 0xce, 0x81, 0x30, 0xd6, 0x8c, + 0x25, 0x3f, 0xcc, 0x3f, 0xb6, 0x00, 0x2c, 0x12, 0x50, 0x26, 0x7c, 0x8d, 0xdf, 0x5c, 0x77, 0xb1, + 0x73, 0xc0, 0x6b, 0x01, 0x36, 0x8a, 0x88, 0xb2, 0x44, 0x4f, 0xc1, 0x1e, 0x8c, 0x22, 0xb1, 0x43, + 0x1a, 0x45, 0xe5, 0xaf, 0xae, 0xd5, 0x55, 0x10, 0x79, 0xeb, 0xd7, 0xa1, 0xdc, 0xb5, 0xf8, 0x30, + 0x93, 0xd3, 0xe4, 0xb2, 0x75, 0x4e, 0x3b, 0x0b, 0xdd, 0xa2, 0x2b, 0x88, 0x54, 0x20, 0xfc, 0xe0, + 0x22, 0x2c, 0x04, 0xd4, 0xf5, 0xf6, 0x3c, 0xe2, 0x0a, 0x47, 0x53, 0xaa, 0xf4, 0x35, 0x90, 0x3b, + 0x17, 0x5a, 0x83, 0x2e, 0x79, 0xc2, 0x48, 0x98, 0xfa, 0x40, 0xd7, 0x1a, 0x03, 0xcc, 0x0f, 0x01, + 0x74, 0x89, 0xbc, 0x47, 0xd1, 0x26, 0xcc, 0x72, 0xe6, 0xfa, 0x01, 0x72, 0xad, 0xfc, 0x00, 0x39, + 0x36, 0x83, 0x25, 0x51, 0xcd, 0x6f, 0x5b, 0xb0, 0xae, 0xae, 0x77, 0x1e, 0x89, 0xef, 0xd1, 0x43, + 0x7e, 0xd4, 0x3f, 0xa0, 0x12, 0xf1, 0x44, 0xb2, 0xdf, 0x3b, 0x30, 0x70, 0x49, 0xc2, 0xbc, 0x50, + 0x14, 0x78, 0xb6, 0x36, 0x6c, 0x88, 0x03, 0xa2, 0x4c, 0xb8, 0x9a, 0x99, 0xbf, 0x29, 0xa7, 0xb7, + 0x71, 0x40, 0xd0, 0x55, 0x58, 0x3e, 0x20, 0x24, 0xb2, 0x7d, 0xea, 0x60, 0xdf, 0xd6, 0x71, 0xa5, + 0xee, 0x2f, 0x4b, 0x7c, 0xea, 0x63, 0x3e, 0x73, 0x4b, 0xc6, 0x96, 0x99, 0xc0, 0x0b, 0x47, 0x68, + 0xa2, 0x72, 0xcb, 0x1a, 0x74, 0xa3, 0x98, 0x3a, 0x24, 0xe1, 0x7e, 0xd7, 0x12, 0x47, 0xcd, 0x18, + 0x80, 0xae, 0xc3, 0x72, 0xfa, 0xf1, 0x09, 0x89, 0x1d, 0x12, 0x32, 0xfc, 0x48, 0xbe, 0x26, 0x4e, + 0x5b, 0x55, 0x53, 0xe6, 0x2f, 0x5b, 0x60, 0x96, 0xa4, 0xde, 0x89, 0x69, 0x70, 0x82, 0x16, 0xbc, + 0x06, 0x2b, 0xc2, 0x0e, 0xb1, 0x60, 0x39, 0x36, 0x84, 0x2c, 0x33, 0x4e, 0xf3, 0x39, 0x29, 0x4d, + 0x5b, 0x62, 0x08, 0x17, 0x8f, 0x5c, 0xd3, 0xbf, 0xc8, 0x16, 0x7f, 0xef, 0x43, 0xff, 0xd3, 0x21, + 0x89, 0x47, 0x99, 0x67, 0xc8, 0x84, 0x28, 0x2d, 0xf4, 0x3b, 0x7a, 0x06, 0xc2, 0xb3, 0xe5, 0x5e, + 0x4c, 0x03, 0x3b, 0x7d, 0x6a, 0x9f, 0x16, 0x28, 0x3d, 0x0e, 0xbc, 0x23, 0x9f, 0xdb, 0xd1, 0xfb, + 0x30, 0xb7, 0xe7, 0xf9, 0x8c, 0xc8, 0xc7, 0xed, 0xde, 0xe6, 0x4b, 0x65, 0xaf, 0xce, 0xca, 0xdc, + 0xb8, 0x23, 0x90, 0x2d, 0x45, 0x84, 0x76, 0x61, 0xd9, 0x0b, 0x23, 0x51, 0x1a, 0xc5, 0x1e, 0xf6, + 0xbd, 0xa7, 0xe3, 0x87, 0xb4, 0xde, 0xe6, 0xeb, 0x13, 0x78, 0xdd, 0xe5, 0x94, 0x3b, 0x59, 0x42, + 0x0b, 0x79, 0x25, 0x18, 0x22, 0xb0, 0x42, 0x87, 0xac, 0x2c, 0x64, 0x56, 0x08, 0xd9, 0x9c, 0x20, + 0xe4, 0xbe, 0x20, 0xcd, 0x4b, 0x59, 0xa6, 0x65, 0xa0, 0xb1, 0x0d, 0x73, 0x52, 0x39, 0x9e, 0xe7, + 0xf6, 0x3c, 0xe2, 0xeb, 0xf6, 0x80, 0xfc, 0xe0, 0x77, 0x09, 0x1a, 0x91, 0x18, 0x87, 0x3a, 0x65, + 0xe9, 0x4f, 0x8e, 0x7f, 0x88, 0xfd, 0xa1, 0x8e, 0x37, 0xf9, 0x61, 0xfc, 0x61, 0x16, 0x50, 0x59, + 0x43, 0xfd, 0x3a, 0x18, 0x93, 0x84, 0xa7, 0x98, 0x6c, 0x8e, 0x5c, 0xcc, 0xc0, 0x45, 0x9e, 0xfc, + 0x3e, 0x74, 0x9d, 0xe4, 0xd0, 0x16, 0x26, 0x11, 0x32, 0x7b, 0x9b, 0xef, 0x1e, 0xdb, 0xa4, 0x1b, + 0x5b, 0x3b, 0x0f, 0x05, 0xd4, 0xea, 0x38, 0xc9, 0xa1, 0x18, 0xa1, 0x1f, 0x02, 0x7c, 0x95, 0xd0, + 0x50, 0x71, 0x96, 0x1b, 0xff, 0xde, 0xf1, 0x39, 0x7f, 0x6f, 0xe7, 0xfe, 0xb6, 0x64, 0xdd, 0xe5, + 0xec, 0x24, 0x6f, 0x07, 0x16, 0x22, 0x1c, 0x3f, 0x1e, 0x12, 0xa6, 0xd8, 0x4b, 0x5f, 0xf8, 0xe0, + 0xf8, 0xec, 0x3f, 0x91, 0x6c, 0xa4, 0x84, 0x7e, 0x94, 0xf9, 0x32, 0xbe, 0x9d, 0x86, 0x8e, 0xd6, + 0x8b, 0x57, 0x57, 0xc2, 0xc3, 0xe5, 0x1b, 0x83, 0xed, 0x85, 0x7b, 0x54, 0x59, 0xf4, 0x14, 0x87, + 0xcb, 0x67, 0x06, 0x91, 0xc1, 0x2f, 0xc3, 0x52, 0x4c, 0x1c, 0x1a, 0xbb, 0xfc, 0x9e, 0xea, 0x05, + 0x1e, 0x77, 0x7b, 0xb9, 0x97, 0x8b, 0x12, 0x7e, 0x4b, 0x83, 0xd1, 0x2b, 0xb0, 0x28, 0xb6, 0x3d, + 0x83, 0xd9, 0xd6, 0x3c, 0x89, 0x9f, 0x41, 0xbc, 0x0c, 0x4b, 0x8f, 0x87, 0x3c, 0x6f, 0x38, 0xfb, + 0x38, 0xc6, 0x0e, 0xa3, 0x69, 0xb5, 0xbf, 0x28, 0xe0, 0x5b, 0x29, 0x18, 0xbd, 0x09, 0xab, 0x12, + 0x95, 0x24, 0x0e, 0x8e, 0x52, 0x0a, 0x12, 0xab, 0x62, 0x70, 0x45, 0xcc, 0xde, 0x16, 0x93, 0x5b, + 0x7a, 0x0e, 0x19, 0xd0, 0x71, 0x68, 0x10, 0x90, 0x90, 0x25, 0xe2, 0x08, 0xeb, 0x5a, 0xe9, 0x37, + 0xba, 0x01, 0xe7, 0xb0, 0xef, 0xd3, 0xaf, 0x6d, 0x41, 0xe9, 0xda, 0x25, 0xed, 0xe4, 0xdb, 0x93, + 0x21, 0x90, 0x3e, 0x15, 0x38, 0x56, 0x5e, 0x51, 0xe3, 0x02, 0x74, 0xd3, 0x7d, 0xe4, 0xa7, 0x7e, + 0xc6, 0x21, 0xc5, 0xd8, 0x38, 0x05, 0xfd, 0xec, 0x4e, 0x18, 0x7f, 0x6b, 0xc3, 0x72, 0x45, 0x50, + 0xa1, 0x2f, 0x00, 0xb8, 0xb7, 0xca, 0xd0, 0x52, 0xee, 0xfa, 0x3f, 0xc7, 0x0f, 0x4e, 0xee, 0xaf, + 0x12, 0x6c, 0x71, 0xef, 0x97, 0x43, 0xf4, 0x23, 0xe8, 0x09, 0x8f, 0x55, 0xdc, 0xa5, 0xcb, 0xbe, + 0xff, 0x1d, 0xb8, 0x73, 0x5d, 0x15, 0x7b, 0x11, 0x03, 0x72, 0x6c, 0xfc, 0xb9, 0x05, 0xdd, 0x54, + 0x30, 0xbf, 0xc3, 0xc8, 0x8d, 0x12, 0x7b, 0x9d, 0xe8, 0x3b, 0x8c, 0x80, 0xdd, 0x11, 0xa0, 0xff, + 0x48, 0x57, 0x32, 0xde, 0x06, 0x18, 0xeb, 0x5f, 0xa9, 0x42, 0xab, 0x52, 0x05, 0xf3, 0x32, 0x2c, + 0x70, 0xcb, 0x7a, 0xc4, 0xdd, 0x61, 0xb1, 0x17, 0x89, 0x46, 0xa7, 0xc4, 0x49, 0x54, 0x11, 0xa8, + 0x3f, 0x37, 0x7f, 0x6f, 0x40, 0x3f, 0xfb, 0xc0, 0x85, 0xbe, 0x84, 0x5e, 0xa6, 0xa1, 0x8b, 0x5e, + 0x2c, 0x6f, 0x5a, 0xb9, 0x41, 0x6c, 0xbc, 0x34, 0x01, 0x4b, 0xd5, 0x49, 0x53, 0x28, 0x84, 0xd3, + 0xa5, 0xae, 0x28, 0xba, 0x52, 0xa6, 0xae, 0xeb, 0xb9, 0x1a, 0xaf, 0x36, 0xc2, 0x4d, 0xe5, 0x31, + 0x58, 0xae, 0x68, 0x73, 0xa2, 0xd7, 0x26, 0x70, 0xc9, 0xb5, 0x5a, 0x8d, 0xab, 0x0d, 0xb1, 0x53, + 0xa9, 0x8f, 0x01, 0x95, 0x7b, 0xa0, 0xe8, 0xd5, 0x89, 0x6c, 0xc6, 0x3d, 0x56, 0xe3, 0xb5, 0x66, + 0xc8, 0xb5, 0x8a, 0xca, 0xee, 0xe8, 0x44, 0x45, 0x73, 0xfd, 0xd7, 0x89, 0x8a, 0x16, 0x5a, 0xae, + 0x53, 0xe8, 0x00, 0x96, 0x8a, 0x9d, 0x53, 0x74, 0xb9, 0xae, 0xd3, 0x5f, 0x6a, 0xcc, 0x1a, 0x57, + 0x9a, 0xa0, 0xa6, 0xc2, 0x08, 0x9c, 0xca, 0x77, 0x2a, 0xd1, 0x2b, 0x65, 0xfa, 0xca, 0x5e, 0xad, + 0x71, 0x69, 0x32, 0x62, 0x56, 0xa7, 0x62, 0xf7, 0xb2, 0x4a, 0xa7, 0x9a, 0xd6, 0x68, 0x95, 0x4e, + 0x75, 0xcd, 0x50, 0x73, 0x0a, 0xfd, 0x58, 0xb7, 0xc4, 0x0a, 0x5d, 0x3d, 0xb4, 0x51, 0xc7, 0xa6, + 0xba, 0xad, 0x68, 0x5c, 0x6b, 0x8c, 0xaf, 0x65, 0x5f, 0x6f, 0xf1, 0x58, 0xcf, 0x34, 0xf7, 0xaa, + 0x62, 0xbd, 0xdc, 0x2e, 0xac, 0x8a, 0xf5, 0xaa, 0x0e, 0xe1, 0x14, 0xda, 0x85, 0x85, 0x5c, 0xbb, + 0x0f, 0xbd, 0x5c, 0x47, 0x99, 0x7f, 0xc3, 0x33, 0x5e, 0x99, 0x88, 0x97, 0xca, 0xb0, 0x75, 0xf6, + 0x52, 0xe9, 0xaa, 0x76, 0x71, 0xf9, 0x7c, 0xf5, 0xf2, 0x24, 0xb4, 0x5c, 0x28, 0x97, 0x9a, 0x82, + 0x95, 0xa1, 0x5c, 0xd7, 0x74, 0xac, 0x0c, 0xe5, 0xfa, 0x3e, 0xe3, 0x14, 0xfa, 0x81, 0x2e, 0x63, + 0x85, 0x23, 0x5c, 0xac, 0xa3, 0xce, 0xee, 0xfe, 0x8b, 0x47, 0x23, 0xa5, 0xac, 0xbf, 0x86, 0x95, + 0xaa, 0xb7, 0x26, 0x74, 0xb5, 0xaa, 0x38, 0xae, 0x7d, 0xd0, 0x32, 0x36, 0x9a, 0xa2, 0xa7, 0x82, + 0x3f, 0x83, 0x8e, 0x6e, 0x9a, 0xa1, 0x17, 0xca, 0xd4, 0x85, 0x36, 0xa3, 0x61, 0x1e, 0x85, 0x92, + 0x71, 0xe0, 0x40, 0xc7, 0xea, 0xb8, 0x9b, 0x55, 0x1f, 0xab, 0xa5, 0xbe, 0x5b, 0x7d, 0xac, 0x96, + 0x9b, 0x63, 0x42, 0x5c, 0xea, 0x0c, 0xd9, 0xe6, 0x4f, 0xbd, 0x33, 0x54, 0xf4, 0xb6, 0xea, 0x9d, + 0xa1, 0xb2, 0x9f, 0x34, 0x85, 0x7e, 0x02, 0xab, 0xd5, 0x3d, 0x1f, 0x54, 0x1b, 0xf1, 0x35, 0xbd, + 0x27, 0xe3, 0x7a, 0x73, 0x82, 0x54, 0xfc, 0x53, 0x9d, 0x9f, 0x0a, 0x3d, 0x9f, 0xfa, 0xfc, 0x54, + 0xdd, 0x79, 0x32, 0xae, 0x35, 0xc6, 0x2f, 0x87, 0x5e, 0xb6, 0x71, 0x52, 0x6f, 0xed, 0x8a, 0x3e, + 0x52, 0xbd, 0xb5, 0x2b, 0x7b, 0x31, 0x22, 0x3e, 0xaa, 0x9a, 0x22, 0x55, 0xf1, 0x71, 0x44, 0xd7, + 0xc6, 0xd8, 0x68, 0x8a, 0x9e, 0x3b, 0xbe, 0xcb, 0x5d, 0x0f, 0x34, 0x71, 0xfd, 0xb9, 0xcc, 0x7c, + 0xb5, 0x21, 0x76, 0xfd, 0xee, 0xea, 0x4c, 0x3d, 0x51, 0x81, 0x42, 0xc6, 0xbe, 0xd6, 0x18, 0x3f, + 0x95, 0x1d, 0xe9, 0xdf, 0x29, 0x32, 0x1d, 0x0b, 0x74, 0x65, 0x02, 0x9f, 0x4c, 0xc7, 0xc5, 0x78, + 0xb5, 0x11, 0x6e, 0x55, 0xf4, 0x66, 0x7b, 0x08, 0x47, 0xf9, 0x53, 0xa9, 0xf1, 0x71, 0x94, 0x3f, + 0x55, 0xb4, 0x25, 0x2a, 0xa2, 0x57, 0xb7, 0x0e, 0x26, 0x47, 0x6f, 0xa1, 0x85, 0x31, 0x39, 0x7a, + 0x4b, 0x5d, 0x89, 0x29, 0xf4, 0xb3, 0x71, 0x9b, 0xbd, 0xfc, 0x08, 0x88, 0x36, 0x6b, 0x53, 0x51, + 0xed, 0xdb, 0xa7, 0xf1, 0xc6, 0xb1, 0x68, 0x32, 0xc6, 0xff, 0x45, 0x4b, 0xf7, 0xf5, 0x2a, 0x5f, + 0xe1, 0xd0, 0x9b, 0x0d, 0x18, 0x97, 0x1e, 0x12, 0x8d, 0xb7, 0x8e, 0x49, 0x95, 0x59, 0xd0, 0xc7, + 0x30, 0x2b, 0xaa, 0x4f, 0x74, 0xfe, 0xe8, 0xb2, 0xd4, 0xb8, 0x50, 0x3d, 0x9f, 0x16, 0x57, 0x9c, + 0xdb, 0xee, 0x9c, 0xf8, 0xa1, 0xf6, 0x8d, 0x7f, 0x06, 0x00, 0x00, 0xff, 0xff, 0x53, 0x96, 0x4c, + 0x89, 0x67, 0x2b, 0x00, 0x00, } diff --git a/weed/server/volume_grpc_tier_download.go b/weed/server/volume_grpc_tier_download.go index 3c18e39ec..7b3982e40 100644 --- a/weed/server/volume_grpc_tier_download.go +++ b/weed/server/volume_grpc_tier_download.go @@ -73,8 +73,8 @@ func (vs *VolumeServer) VolumeTierMoveDatFromRemote(req *volume_server_pb.Volume } // forget remote file - v.GetVolumeTierInfo().Files = v.GetVolumeTierInfo().Files[1:] - if err := v.SaveVolumeTierInfo(); err != nil { + v.GetVolumeInfo().Files = v.GetVolumeInfo().Files[1:] + if err := v.SaveVolumeInfo(); err != nil { return fmt.Errorf("volume %d fail to save remote file info: %v", v.Id, err) } diff --git a/weed/server/volume_grpc_tier_upload.go b/weed/server/volume_grpc_tier_upload.go index 6e430f783..d60aa5c3a 100644 --- a/weed/server/volume_grpc_tier_upload.go +++ b/weed/server/volume_grpc_tier_upload.go @@ -43,7 +43,7 @@ func (vs *VolumeServer) VolumeTierMoveDatToRemote(req *volume_server_pb.VolumeTi // check whether the existing backend storage is the same as requested // if same, skip backendType, backendId := backend.BackendNameToTypeId(req.DestinationBackendName) - for _, remoteFile := range v.GetVolumeTierInfo().GetFiles() { + for _, remoteFile := range v.GetVolumeInfo().GetFiles() { if remoteFile.BackendType == backendType && remoteFile.BackendId == backendId { return fmt.Errorf("destination %s already exists", req.DestinationBackendName) } @@ -74,7 +74,7 @@ func (vs *VolumeServer) VolumeTierMoveDatToRemote(req *volume_server_pb.VolumeTi } // save the remote file to volume tier info - v.GetVolumeTierInfo().Files = append(v.GetVolumeTierInfo().GetFiles(), &volume_server_pb.RemoteFile{ + v.GetVolumeInfo().Files = append(v.GetVolumeInfo().GetFiles(), &volume_server_pb.RemoteFile{ BackendType: backendType, BackendId: backendId, Key: key, @@ -84,7 +84,7 @@ func (vs *VolumeServer) VolumeTierMoveDatToRemote(req *volume_server_pb.VolumeTi Extension: ".dat", }) - if err := v.SaveVolumeTierInfo(); err != nil { + if err := v.SaveVolumeInfo(); err != nil { return fmt.Errorf("volume %d fail to save remote file info: %v", v.Id, err) } diff --git a/weed/storage/backend/backend.go b/weed/storage/backend/backend.go index 58633e76a..6ea850543 100644 --- a/weed/storage/backend/backend.go +++ b/weed/storage/backend/backend.go @@ -23,7 +23,7 @@ type BackendStorageFile interface { type BackendStorage interface { ToProperties() map[string]string - NewStorageFile(key string, tierInfo *volume_server_pb.VolumeTierInfo) BackendStorageFile + NewStorageFile(key string, tierInfo *volume_server_pb.VolumeInfo) BackendStorageFile CopyFile(f *os.File, attributes map[string]string, fn func(progressed int64, percentage float32) error) (key string, size int64, err error) DownloadFile(fileName string, key string, fn func(progressed int64, percentage float32) error) (size int64, err error) DeleteFile(key string) (err error) diff --git a/weed/storage/backend/s3_backend/s3_backend.go b/weed/storage/backend/s3_backend/s3_backend.go index 96a85e504..9f03cfa81 100644 --- a/weed/storage/backend/s3_backend/s3_backend.go +++ b/weed/storage/backend/s3_backend/s3_backend.go @@ -61,7 +61,7 @@ func (s *S3BackendStorage) ToProperties() map[string]string { return m } -func (s *S3BackendStorage) NewStorageFile(key string, tierInfo *volume_server_pb.VolumeTierInfo) backend.BackendStorageFile { +func (s *S3BackendStorage) NewStorageFile(key string, tierInfo *volume_server_pb.VolumeInfo) backend.BackendStorageFile { if strings.HasPrefix(key, "/") { key = key[1:] } @@ -107,7 +107,7 @@ func (s *S3BackendStorage) DeleteFile(key string) (err error) { type S3BackendStorageFile struct { backendStorage *S3BackendStorage key string - tierInfo *volume_server_pb.VolumeTierInfo + tierInfo *volume_server_pb.VolumeInfo } func (s3backendStorageFile S3BackendStorageFile) ReadAt(p []byte, off int64) (n int, err error) { diff --git a/weed/storage/volume.go b/weed/storage/volume.go index 139f433c7..9af70c86f 100644 --- a/weed/storage/volume.go +++ b/weed/storage/volume.go @@ -40,7 +40,7 @@ type Volume struct { isCompacting bool - volumeTierInfo *volume_server_pb.VolumeTierInfo + volumeInfo *volume_server_pb.VolumeInfo } func NewVolume(dirname string, collection string, id needle.VolumeId, needleMapKind NeedleMapType, replicaPlacement *super_block.ReplicaPlacement, ttl *needle.TTL, preallocate int64, memoryMapMaxSizeMb uint32) (v *Volume, e error) { @@ -225,11 +225,11 @@ func (v *Volume) ToVolumeInformationMessage() *master_pb.VolumeInformationMessag } func (v *Volume) RemoteStorageNameKey() (storageName, storageKey string) { - if v.volumeTierInfo == nil { + if v.volumeInfo == nil { return } - if len(v.volumeTierInfo.GetFiles()) == 0 { + if len(v.volumeInfo.GetFiles()) == 0 { return } - return v.volumeTierInfo.GetFiles()[0].BackendName(), v.volumeTierInfo.GetFiles()[0].GetKey() + return v.volumeInfo.GetFiles()[0].BackendName(), v.volumeInfo.GetFiles()[0].GetKey() } diff --git a/weed/storage/volume_loading.go b/weed/storage/volume_loading.go index a09939447..42562d233 100644 --- a/weed/storage/volume_loading.go +++ b/weed/storage/volume_loading.go @@ -26,7 +26,7 @@ func (v *Volume) load(alsoLoadIndex bool, createDatIfMissing bool, needleMapKind fileName := v.FileName() alreadyHasSuperBlock := false - if v.maybeLoadVolumeTierInfo() { + if v.maybeLoadVolumeInfo() { v.noWriteCanDelete = true // open remote file alreadyHasSuperBlock = true diff --git a/weed/storage/volume_tier.go b/weed/storage/volume_tier.go index 5e27562f7..82b822393 100644 --- a/weed/storage/volume_tier.go +++ b/weed/storage/volume_tier.go @@ -13,13 +13,13 @@ import ( "github.com/golang/protobuf/jsonpb" ) -func (v *Volume) GetVolumeTierInfo() *volume_server_pb.VolumeTierInfo { - return v.volumeTierInfo +func (v *Volume) GetVolumeInfo() *volume_server_pb.VolumeInfo { + return v.volumeInfo } -func (v *Volume) maybeLoadVolumeTierInfo() bool { +func (v *Volume) maybeLoadVolumeInfo() bool { - v.volumeTierInfo = &volume_server_pb.VolumeTierInfo{} + v.volumeInfo = &volume_server_pb.VolumeInfo{} tierFileName := v.FileName() + ".vif" @@ -33,7 +33,7 @@ func (v *Volume) maybeLoadVolumeTierInfo() bool { return false } - glog.V(0).Infof("maybeLoadVolumeTierInfo loading volume %d check file", v.Id) + glog.V(0).Infof("maybeLoadVolumeInfo loading volume %d check file", v.Id) tierData, readErr := ioutil.ReadFile(tierFileName) if readErr != nil { @@ -41,26 +41,26 @@ func (v *Volume) maybeLoadVolumeTierInfo() bool { return false } - glog.V(0).Infof("maybeLoadVolumeTierInfo loading volume %d ReadFile", v.Id) + glog.V(0).Infof("maybeLoadVolumeInfo loading volume %d ReadFile", v.Id) - if err := jsonpb.Unmarshal(bytes.NewReader(tierData), v.volumeTierInfo); err != nil { + if err := jsonpb.Unmarshal(bytes.NewReader(tierData), v.volumeInfo); err != nil { glog.Warningf("unmarshal error: %v", err) return false } - glog.V(0).Infof("maybeLoadVolumeTierInfo loading volume %d Unmarshal tierInfo %v", v.Id, v.volumeTierInfo) + glog.V(0).Infof("maybeLoadVolumeInfo loading volume %d Unmarshal tierInfo %v", v.Id, v.volumeInfo) - if len(v.volumeTierInfo.GetFiles()) == 0 { + if len(v.volumeInfo.GetFiles()) == 0 { return false } glog.V(0).Infof("volume %d is tiered to %s as %s and read only", v.Id, - v.volumeTierInfo.Files[0].BackendName(), v.volumeTierInfo.Files[0].Key) + v.volumeInfo.Files[0].BackendName(), v.volumeInfo.Files[0].Key) v.noWriteCanDelete = true v.noWriteOrDelete = false - glog.V(0).Infof("loading volume %d from remote %v", v.Id, v.volumeTierInfo.Files) + glog.V(0).Infof("loading volume %d from remote %v", v.Id, v.volumeInfo.Files) v.LoadRemoteFile() return true @@ -75,18 +75,18 @@ func (v *Volume) HasRemoteFile() bool { } func (v *Volume) LoadRemoteFile() error { - tierFile := v.volumeTierInfo.GetFiles()[0] + tierFile := v.volumeInfo.GetFiles()[0] backendStorage := backend.BackendStorages[tierFile.BackendName()] if v.DataBackend != nil { v.DataBackend.Close() } - v.DataBackend = backendStorage.NewStorageFile(tierFile.Key, v.volumeTierInfo) + v.DataBackend = backendStorage.NewStorageFile(tierFile.Key, v.volumeInfo) return nil } -func (v *Volume) SaveVolumeTierInfo() error { +func (v *Volume) SaveVolumeInfo() error { tierFileName := v.FileName() + ".vif" @@ -99,7 +99,7 @@ func (v *Volume) SaveVolumeTierInfo() error { Indent: " ", } - text, marshalErr := m.MarshalToString(v.GetVolumeTierInfo()) + text, marshalErr := m.MarshalToString(v.GetVolumeInfo()) if marshalErr != nil { return fmt.Errorf("marshal volume %d tier info: %v", v.Id, marshalErr) }