From c1efa5377937385da87264703af7a86c302a4f74 Mon Sep 17 00:00:00 2001 From: sunby Date: Fri, 21 May 2021 14:51:25 +0800 Subject: [PATCH] Remove redundant fields in SegmentInfo and related structure (#5280) Signed-off-by: sunby --- internal/core/src/pb/milvus.pb.cc | 228 ++----------- internal/core/src/pb/milvus.pb.h | 96 +----- internal/dataservice/meta.go | 22 +- internal/dataservice/meta_test.go | 20 +- internal/dataservice/server.go | 3 - internal/dataservice/server_test.go | 4 - internal/dataservice/stats_handler.go | 5 +- internal/masterservice/master_service_test.go | 5 +- internal/proto/data_service.proto | 21 +- internal/proto/datapb/data_service.pb.go | 292 +++++++--------- internal/proto/milvus.proto | 8 +- internal/proto/milvuspb/milvus.pb.go | 322 ++++++++---------- internal/proxynode/impl.go | 4 - internal/querynode/meta_service_test.go | 1 - internal/queryservice/mock.go | 1 - tests/python_test/requirements.txt | 2 +- 16 files changed, 311 insertions(+), 723 deletions(-) diff --git a/internal/core/src/pb/milvus.pb.cc b/internal/core/src/pb/milvus.pb.cc index 4ad1cec0e3..cbe0196c43 100644 --- a/internal/core/src/pb/milvus.pb.cc +++ b/internal/core/src/pb/milvus.pb.cc @@ -1447,11 +1447,7 @@ const ::PROTOBUF_NAMESPACE_ID::uint32 TableStruct_milvus_2eproto::offsets[] PROT PROTOBUF_FIELD_OFFSET(::milvus::proto::milvus::PersistentSegmentInfo, segmentid_), PROTOBUF_FIELD_OFFSET(::milvus::proto::milvus::PersistentSegmentInfo, collectionid_), PROTOBUF_FIELD_OFFSET(::milvus::proto::milvus::PersistentSegmentInfo, partitionid_), - PROTOBUF_FIELD_OFFSET(::milvus::proto::milvus::PersistentSegmentInfo, open_time_), - PROTOBUF_FIELD_OFFSET(::milvus::proto::milvus::PersistentSegmentInfo, sealed_time_), - PROTOBUF_FIELD_OFFSET(::milvus::proto::milvus::PersistentSegmentInfo, flushed_time_), PROTOBUF_FIELD_OFFSET(::milvus::proto::milvus::PersistentSegmentInfo, num_rows_), - PROTOBUF_FIELD_OFFSET(::milvus::proto::milvus::PersistentSegmentInfo, mem_size_), PROTOBUF_FIELD_OFFSET(::milvus::proto::milvus::PersistentSegmentInfo, state_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::milvus::proto::milvus::GetPersistentSegmentInfoRequest, _internal_metadata_), @@ -1555,13 +1551,13 @@ static const ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema schemas[] PROTOB { 371, -1, sizeof(::milvus::proto::milvus::SearchResults)}, { 378, -1, sizeof(::milvus::proto::milvus::FlushRequest)}, { 386, -1, sizeof(::milvus::proto::milvus::PersistentSegmentInfo)}, - { 400, -1, sizeof(::milvus::proto::milvus::GetPersistentSegmentInfoRequest)}, - { 408, -1, sizeof(::milvus::proto::milvus::GetPersistentSegmentInfoResponse)}, - { 415, -1, sizeof(::milvus::proto::milvus::QuerySegmentInfo)}, - { 427, -1, sizeof(::milvus::proto::milvus::GetQuerySegmentInfoRequest)}, - { 435, -1, sizeof(::milvus::proto::milvus::GetQuerySegmentInfoResponse)}, - { 442, -1, sizeof(::milvus::proto::milvus::RegisterLinkRequest)}, - { 447, -1, sizeof(::milvus::proto::milvus::RegisterLinkResponse)}, + { 396, -1, sizeof(::milvus::proto::milvus::GetPersistentSegmentInfoRequest)}, + { 404, -1, sizeof(::milvus::proto::milvus::GetPersistentSegmentInfoResponse)}, + { 411, -1, sizeof(::milvus::proto::milvus::QuerySegmentInfo)}, + { 423, -1, sizeof(::milvus::proto::milvus::GetQuerySegmentInfoRequest)}, + { 431, -1, sizeof(::milvus::proto::milvus::GetQuerySegmentInfoResponse)}, + { 438, -1, sizeof(::milvus::proto::milvus::RegisterLinkRequest)}, + { 443, -1, sizeof(::milvus::proto::milvus::RegisterLinkResponse)}, }; static ::PROTOBUF_NAMESPACE_ID::Message const * const file_default_instances[] = { @@ -1769,12 +1765,10 @@ const char descriptor_table_protodef_milvus_2eproto[] PROTOBUF_SECTION_VARIABLE( ".milvus.proto.common.Status\022\014\n\004hits\030\002 \003(" "\014\"e\n\014FlushRequest\022*\n\004base\030\001 \001(\0132\034.milvus" ".proto.common.MsgBase\022\017\n\007db_name\030\002 \001(\t\022\030" - "\n\020collection_names\030\003 \003(\t\"\351\001\n\025PersistentS" + "\n\020collection_names\030\003 \003(\t\"\231\001\n\025PersistentS" "egmentInfo\022\021\n\tsegmentID\030\001 \001(\003\022\024\n\014collect" - "ionID\030\002 \001(\003\022\023\n\013partitionID\030\003 \001(\003\022\021\n\topen" - "_time\030\004 \001(\004\022\023\n\013sealed_time\030\005 \001(\004\022\024\n\014flus" - "hed_time\030\006 \001(\004\022\020\n\010num_rows\030\007 \001(\003\022\020\n\010mem_" - "size\030\010 \001(\003\0220\n\005state\030\t \001(\0162!.milvus.proto" + "ionID\030\002 \001(\003\022\023\n\013partitionID\030\003 \001(\003\022\020\n\010num_" + "rows\030\004 \001(\003\0220\n\005state\030\005 \001(\0162!.milvus.proto" ".common.SegmentState\"u\n\037GetPersistentSeg" "mentInfoRequest\022*\n\004base\030\001 \001(\0132\034.milvus.p" "roto.common.MsgBase\022\016\n\006dbName\030\002 \001(\t\022\026\n\016c" @@ -1935,7 +1929,7 @@ static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_mil static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_milvus_2eproto_once; static bool descriptor_table_milvus_2eproto_initialized = false; const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_milvus_2eproto = { - &descriptor_table_milvus_2eproto_initialized, descriptor_table_protodef_milvus_2eproto, "milvus.proto", 10023, + &descriptor_table_milvus_2eproto_initialized, descriptor_table_protodef_milvus_2eproto, "milvus.proto", 9943, &descriptor_table_milvus_2eproto_once, descriptor_table_milvus_2eproto_sccs, descriptor_table_milvus_2eproto_deps, 53, 2, schemas, file_default_instances, TableStruct_milvus_2eproto::offsets, file_level_metadata_milvus_2eproto, 53, file_level_enum_descriptors_milvus_2eproto, file_level_service_descriptors_milvus_2eproto, @@ -21055,44 +21049,16 @@ const char* PersistentSegmentInfo::_InternalParse(const char* ptr, ::PROTOBUF_NA CHK_(ptr); } else goto handle_unusual; continue; - // uint64 open_time = 4; + // int64 num_rows = 4; case 4: if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 32)) { - open_time_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr); - CHK_(ptr); - } else goto handle_unusual; - continue; - // uint64 sealed_time = 5; - case 5: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 40)) { - sealed_time_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr); - CHK_(ptr); - } else goto handle_unusual; - continue; - // uint64 flushed_time = 6; - case 6: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 48)) { - flushed_time_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr); - CHK_(ptr); - } else goto handle_unusual; - continue; - // int64 num_rows = 7; - case 7: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 56)) { num_rows_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr); CHK_(ptr); } else goto handle_unusual; continue; - // int64 mem_size = 8; - case 8: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 64)) { - mem_size_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr); - CHK_(ptr); - } else goto handle_unusual; - continue; - // .milvus.proto.common.SegmentState state = 9; - case 9: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 72)) { + // .milvus.proto.common.SegmentState state = 5; + case 5: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 40)) { ::PROTOBUF_NAMESPACE_ID::uint64 val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr); CHK_(ptr); set_state(static_cast<::milvus::proto::common::SegmentState>(val)); @@ -21167,49 +21133,10 @@ bool PersistentSegmentInfo::MergePartialFromCodedStream( break; } - // uint64 open_time = 4; + // int64 num_rows = 4; case 4: { if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (32 & 0xFF)) { - DO_((::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::ReadPrimitive< - ::PROTOBUF_NAMESPACE_ID::uint64, ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_UINT64>( - input, &open_time_))); - } else { - goto handle_unusual; - } - break; - } - - // uint64 sealed_time = 5; - case 5: { - if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (40 & 0xFF)) { - - DO_((::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::ReadPrimitive< - ::PROTOBUF_NAMESPACE_ID::uint64, ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_UINT64>( - input, &sealed_time_))); - } else { - goto handle_unusual; - } - break; - } - - // uint64 flushed_time = 6; - case 6: { - if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (48 & 0xFF)) { - - DO_((::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::ReadPrimitive< - ::PROTOBUF_NAMESPACE_ID::uint64, ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_UINT64>( - input, &flushed_time_))); - } else { - goto handle_unusual; - } - break; - } - - // int64 num_rows = 7; - case 7: { - if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (56 & 0xFF)) { - DO_((::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::ReadPrimitive< ::PROTOBUF_NAMESPACE_ID::int64, ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_INT64>( input, &num_rows_))); @@ -21219,22 +21146,9 @@ bool PersistentSegmentInfo::MergePartialFromCodedStream( break; } - // int64 mem_size = 8; - case 8: { - if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (64 & 0xFF)) { - - DO_((::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::ReadPrimitive< - ::PROTOBUF_NAMESPACE_ID::int64, ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_INT64>( - input, &mem_size_))); - } else { - goto handle_unusual; - } - break; - } - - // .milvus.proto.common.SegmentState state = 9; - case 9: { - if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (72 & 0xFF)) { + // .milvus.proto.common.SegmentState state = 5; + case 5: { + if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (40 & 0xFF)) { int value = 0; DO_((::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::ReadPrimitive< int, ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_ENUM>( @@ -21288,35 +21202,15 @@ void PersistentSegmentInfo::SerializeWithCachedSizes( ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64(3, this->partitionid(), output); } - // uint64 open_time = 4; - if (this->open_time() != 0) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteUInt64(4, this->open_time(), output); - } - - // uint64 sealed_time = 5; - if (this->sealed_time() != 0) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteUInt64(5, this->sealed_time(), output); - } - - // uint64 flushed_time = 6; - if (this->flushed_time() != 0) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteUInt64(6, this->flushed_time(), output); - } - - // int64 num_rows = 7; + // int64 num_rows = 4; if (this->num_rows() != 0) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64(7, this->num_rows(), output); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64(4, this->num_rows(), output); } - // int64 mem_size = 8; - if (this->mem_size() != 0) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64(8, this->mem_size(), output); - } - - // .milvus.proto.common.SegmentState state = 9; + // .milvus.proto.common.SegmentState state = 5; if (this->state() != 0) { ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteEnum( - 9, this->state(), output); + 5, this->state(), output); } if (_internal_metadata_.have_unknown_fields()) { @@ -21347,35 +21241,15 @@ void PersistentSegmentInfo::SerializeWithCachedSizes( target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(3, this->partitionid(), target); } - // uint64 open_time = 4; - if (this->open_time() != 0) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteUInt64ToArray(4, this->open_time(), target); - } - - // uint64 sealed_time = 5; - if (this->sealed_time() != 0) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteUInt64ToArray(5, this->sealed_time(), target); - } - - // uint64 flushed_time = 6; - if (this->flushed_time() != 0) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteUInt64ToArray(6, this->flushed_time(), target); - } - - // int64 num_rows = 7; + // int64 num_rows = 4; if (this->num_rows() != 0) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(7, this->num_rows(), target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(4, this->num_rows(), target); } - // int64 mem_size = 8; - if (this->mem_size() != 0) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(8, this->mem_size(), target); - } - - // .milvus.proto.common.SegmentState state = 9; + // .milvus.proto.common.SegmentState state = 5; if (this->state() != 0) { target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteEnumToArray( - 9, this->state(), target); + 5, this->state(), target); } if (_internal_metadata_.have_unknown_fields()) { @@ -21420,42 +21294,14 @@ size_t PersistentSegmentInfo::ByteSizeLong() const { this->partitionid()); } - // uint64 open_time = 4; - if (this->open_time() != 0) { - total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::UInt64Size( - this->open_time()); - } - - // uint64 sealed_time = 5; - if (this->sealed_time() != 0) { - total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::UInt64Size( - this->sealed_time()); - } - - // uint64 flushed_time = 6; - if (this->flushed_time() != 0) { - total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::UInt64Size( - this->flushed_time()); - } - - // int64 num_rows = 7; + // int64 num_rows = 4; if (this->num_rows() != 0) { total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64Size( this->num_rows()); } - // int64 mem_size = 8; - if (this->mem_size() != 0) { - total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64Size( - this->mem_size()); - } - - // .milvus.proto.common.SegmentState state = 9; + // .milvus.proto.common.SegmentState state = 5; if (this->state() != 0) { total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::EnumSize(this->state()); @@ -21497,21 +21343,9 @@ void PersistentSegmentInfo::MergeFrom(const PersistentSegmentInfo& from) { if (from.partitionid() != 0) { set_partitionid(from.partitionid()); } - if (from.open_time() != 0) { - set_open_time(from.open_time()); - } - if (from.sealed_time() != 0) { - set_sealed_time(from.sealed_time()); - } - if (from.flushed_time() != 0) { - set_flushed_time(from.flushed_time()); - } if (from.num_rows() != 0) { set_num_rows(from.num_rows()); } - if (from.mem_size() != 0) { - set_mem_size(from.mem_size()); - } if (from.state() != 0) { set_state(from.state()); } @@ -21541,11 +21375,7 @@ void PersistentSegmentInfo::InternalSwap(PersistentSegmentInfo* other) { swap(segmentid_, other->segmentid_); swap(collectionid_, other->collectionid_); swap(partitionid_, other->partitionid_); - swap(open_time_, other->open_time_); - swap(sealed_time_, other->sealed_time_); - swap(flushed_time_, other->flushed_time_); swap(num_rows_, other->num_rows_); - swap(mem_size_, other->mem_size_); swap(state_, other->state_); } diff --git a/internal/core/src/pb/milvus.pb.h b/internal/core/src/pb/milvus.pb.h index 3c01f2adb0..dbadcbc80d 100644 --- a/internal/core/src/pb/milvus.pb.h +++ b/internal/core/src/pb/milvus.pb.h @@ -7911,12 +7911,8 @@ class PersistentSegmentInfo : kSegmentIDFieldNumber = 1, kCollectionIDFieldNumber = 2, kPartitionIDFieldNumber = 3, - kOpenTimeFieldNumber = 4, - kSealedTimeFieldNumber = 5, - kFlushedTimeFieldNumber = 6, - kNumRowsFieldNumber = 7, - kMemSizeFieldNumber = 8, - kStateFieldNumber = 9, + kNumRowsFieldNumber = 4, + kStateFieldNumber = 5, }; // int64 segmentID = 1; void clear_segmentid(); @@ -7933,32 +7929,12 @@ class PersistentSegmentInfo : ::PROTOBUF_NAMESPACE_ID::int64 partitionid() const; void set_partitionid(::PROTOBUF_NAMESPACE_ID::int64 value); - // uint64 open_time = 4; - void clear_open_time(); - ::PROTOBUF_NAMESPACE_ID::uint64 open_time() const; - void set_open_time(::PROTOBUF_NAMESPACE_ID::uint64 value); - - // uint64 sealed_time = 5; - void clear_sealed_time(); - ::PROTOBUF_NAMESPACE_ID::uint64 sealed_time() const; - void set_sealed_time(::PROTOBUF_NAMESPACE_ID::uint64 value); - - // uint64 flushed_time = 6; - void clear_flushed_time(); - ::PROTOBUF_NAMESPACE_ID::uint64 flushed_time() const; - void set_flushed_time(::PROTOBUF_NAMESPACE_ID::uint64 value); - - // int64 num_rows = 7; + // int64 num_rows = 4; void clear_num_rows(); ::PROTOBUF_NAMESPACE_ID::int64 num_rows() const; void set_num_rows(::PROTOBUF_NAMESPACE_ID::int64 value); - // int64 mem_size = 8; - void clear_mem_size(); - ::PROTOBUF_NAMESPACE_ID::int64 mem_size() const; - void set_mem_size(::PROTOBUF_NAMESPACE_ID::int64 value); - - // .milvus.proto.common.SegmentState state = 9; + // .milvus.proto.common.SegmentState state = 5; void clear_state(); ::milvus::proto::common::SegmentState state() const; void set_state(::milvus::proto::common::SegmentState value); @@ -7971,11 +7947,7 @@ class PersistentSegmentInfo : ::PROTOBUF_NAMESPACE_ID::int64 segmentid_; ::PROTOBUF_NAMESPACE_ID::int64 collectionid_; ::PROTOBUF_NAMESPACE_ID::int64 partitionid_; - ::PROTOBUF_NAMESPACE_ID::uint64 open_time_; - ::PROTOBUF_NAMESPACE_ID::uint64 sealed_time_; - ::PROTOBUF_NAMESPACE_ID::uint64 flushed_time_; ::PROTOBUF_NAMESPACE_ID::int64 num_rows_; - ::PROTOBUF_NAMESPACE_ID::int64 mem_size_; int state_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; friend struct ::TableStruct_milvus_2eproto; @@ -16235,49 +16207,7 @@ inline void PersistentSegmentInfo::set_partitionid(::PROTOBUF_NAMESPACE_ID::int6 // @@protoc_insertion_point(field_set:milvus.proto.milvus.PersistentSegmentInfo.partitionID) } -// uint64 open_time = 4; -inline void PersistentSegmentInfo::clear_open_time() { - open_time_ = PROTOBUF_ULONGLONG(0); -} -inline ::PROTOBUF_NAMESPACE_ID::uint64 PersistentSegmentInfo::open_time() const { - // @@protoc_insertion_point(field_get:milvus.proto.milvus.PersistentSegmentInfo.open_time) - return open_time_; -} -inline void PersistentSegmentInfo::set_open_time(::PROTOBUF_NAMESPACE_ID::uint64 value) { - - open_time_ = value; - // @@protoc_insertion_point(field_set:milvus.proto.milvus.PersistentSegmentInfo.open_time) -} - -// uint64 sealed_time = 5; -inline void PersistentSegmentInfo::clear_sealed_time() { - sealed_time_ = PROTOBUF_ULONGLONG(0); -} -inline ::PROTOBUF_NAMESPACE_ID::uint64 PersistentSegmentInfo::sealed_time() const { - // @@protoc_insertion_point(field_get:milvus.proto.milvus.PersistentSegmentInfo.sealed_time) - return sealed_time_; -} -inline void PersistentSegmentInfo::set_sealed_time(::PROTOBUF_NAMESPACE_ID::uint64 value) { - - sealed_time_ = value; - // @@protoc_insertion_point(field_set:milvus.proto.milvus.PersistentSegmentInfo.sealed_time) -} - -// uint64 flushed_time = 6; -inline void PersistentSegmentInfo::clear_flushed_time() { - flushed_time_ = PROTOBUF_ULONGLONG(0); -} -inline ::PROTOBUF_NAMESPACE_ID::uint64 PersistentSegmentInfo::flushed_time() const { - // @@protoc_insertion_point(field_get:milvus.proto.milvus.PersistentSegmentInfo.flushed_time) - return flushed_time_; -} -inline void PersistentSegmentInfo::set_flushed_time(::PROTOBUF_NAMESPACE_ID::uint64 value) { - - flushed_time_ = value; - // @@protoc_insertion_point(field_set:milvus.proto.milvus.PersistentSegmentInfo.flushed_time) -} - -// int64 num_rows = 7; +// int64 num_rows = 4; inline void PersistentSegmentInfo::clear_num_rows() { num_rows_ = PROTOBUF_LONGLONG(0); } @@ -16291,21 +16221,7 @@ inline void PersistentSegmentInfo::set_num_rows(::PROTOBUF_NAMESPACE_ID::int64 v // @@protoc_insertion_point(field_set:milvus.proto.milvus.PersistentSegmentInfo.num_rows) } -// int64 mem_size = 8; -inline void PersistentSegmentInfo::clear_mem_size() { - mem_size_ = PROTOBUF_LONGLONG(0); -} -inline ::PROTOBUF_NAMESPACE_ID::int64 PersistentSegmentInfo::mem_size() const { - // @@protoc_insertion_point(field_get:milvus.proto.milvus.PersistentSegmentInfo.mem_size) - return mem_size_; -} -inline void PersistentSegmentInfo::set_mem_size(::PROTOBUF_NAMESPACE_ID::int64 value) { - - mem_size_ = value; - // @@protoc_insertion_point(field_set:milvus.proto.milvus.PersistentSegmentInfo.mem_size) -} - -// .milvus.proto.common.SegmentState state = 9; +// .milvus.proto.common.SegmentState state = 5; inline void PersistentSegmentInfo::clear_state() { state_ = 0; } diff --git a/internal/dataservice/meta.go b/internal/dataservice/meta.go index 6ba7e58f96..a0a860c4ad 100644 --- a/internal/dataservice/meta.go +++ b/internal/dataservice/meta.go @@ -147,18 +147,6 @@ func (meta *meta) GetNumRowsOfCollection(collectionID UniqueID) (int64, error) { return ret, nil } -func (meta *meta) GetMemSizeOfCollection(collectionID UniqueID) (int64, error) { - meta.RLock() - defer meta.RUnlock() - var ret int64 = 0 - for _, info := range meta.segments { - if info.CollectionID == collectionID { - ret += info.MemSize - } - } - return ret, nil -} - func (meta *meta) AddSegment(segment *datapb.SegmentInfo) error { meta.Lock() defer meta.Unlock() @@ -172,17 +160,14 @@ func (meta *meta) AddSegment(segment *datapb.SegmentInfo) error { return nil } -func (meta *meta) UpdateSegment(segment *datapb.SegmentInfo) error { +func (meta *meta) UpdateSegmentStatistic(segment *datapb.SegmentInfo) error { meta.Lock() defer meta.Unlock() seg, ok := meta.segments[segment.ID] if !ok { return newErrSegmentNotFound(segment.ID) } - seg.OpenTime = segment.OpenTime - seg.SealedTime = segment.SealedTime seg.NumRows = segment.NumRows - seg.MemSize = segment.MemSize seg.StartPosition = proto.Clone(segment.StartPosition).(*internalpb.MsgPosition) seg.EndPosition = proto.Clone(segment.EndPosition).(*internalpb.MsgPosition) @@ -227,7 +212,6 @@ func (meta *meta) SealSegment(segID UniqueID, timetick Timestamp) error { return newErrSegmentNotFound(segID) } - segInfo.SealedTime = timetick segInfo.State = commonpb.SegmentState_Sealed if err := meta.saveSegmentInfo(segInfo); err != nil { return err @@ -243,7 +227,6 @@ func (meta *meta) FlushSegment(segID UniqueID, timetick Timestamp) error { if !ok { return newErrSegmentNotFound(segID) } - segInfo.FlushedTime = timetick segInfo.State = commonpb.SegmentState_Flushed if err := meta.saveSegmentInfo(segInfo); err != nil { return err @@ -372,10 +355,7 @@ func BuildSegment(collectionID UniqueID, partitionID UniqueID, segmentID UniqueI CollectionID: collectionID, PartitionID: partitionID, InsertChannel: channelName, - OpenTime: 0, - SealedTime: 0, NumRows: 0, - MemSize: 0, State: commonpb.SegmentState_Growing, StartPosition: &internalpb.MsgPosition{ ChannelName: channelName, diff --git a/internal/dataservice/meta_test.go b/internal/dataservice/meta_test.go index 44276109d9..74ec49299b 100644 --- a/internal/dataservice/meta_test.go +++ b/internal/dataservice/meta_test.go @@ -14,6 +14,7 @@ import ( "testing" "github.com/golang/protobuf/proto" + "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/stretchr/testify/assert" ) @@ -180,8 +181,7 @@ func TestMeta_Basic(t *testing.T) { info0_0, err = meta.GetSegment(segID0_0) assert.Nil(t, err) - assert.NotZero(t, info0_0.SealedTime) - assert.NotZero(t, info0_0.FlushedTime) + assert.EqualValues(t, commonpb.SegmentState_Flushed, info0_0.State) err = meta.DropPartition(collID, partID0) assert.Nil(t, err) @@ -198,9 +198,6 @@ func TestMeta_Basic(t *testing.T) { nums, err := meta.GetNumRowsOfCollection(collID) assert.Nil(t, err) assert.EqualValues(t, 0, nums) - memSize, err := meta.GetMemSizeOfCollection(collID) - assert.Nil(t, err) - assert.EqualValues(t, 0, memSize) // add seg1 with 100 rows segID0, err := mockAllocator.allocID() @@ -208,28 +205,23 @@ func TestMeta_Basic(t *testing.T) { segInfo0, err := BuildSegment(collID, partID0, segID0, channelName) assert.Nil(t, err) segInfo0.NumRows = rowCount0 - segInfo0.MemSize = rowCount0 * dim * 4 err = meta.AddSegment(segInfo0) assert.Nil(t, err) // update seg1 to 300 rows segInfo0.NumRows = rowCount1 - segInfo0.MemSize = rowCount1 * dim * 4 - err = meta.UpdateSegment(segInfo0) + err = meta.UpdateSegmentStatistic(segInfo0) assert.Nil(t, err) nums, err = meta.GetNumRowsOfCollection(collID) assert.Nil(t, err) assert.EqualValues(t, rowCount1, nums) - memSize, err = meta.GetMemSizeOfCollection(collID) - assert.Nil(t, err) - assert.EqualValues(t, rowCount1*dim*4, memSize) // check update non-exist segment segInfoNonExist := segInfo0 segInfoNonExist.ID, err = mockAllocator.allocID() assert.Nil(t, err) - err = meta.UpdateSegment(segInfo0) + err = meta.UpdateSegmentStatistic(segInfo0) assert.NotNil(t, err) // add seg2 with 300 rows @@ -238,7 +230,6 @@ func TestMeta_Basic(t *testing.T) { segInfo1, err := BuildSegment(collID, partID0, segID1, channelName) assert.Nil(t, err) segInfo1.NumRows = rowCount1 - segInfo1.MemSize = rowCount1 * dim * 4 err = meta.AddSegment(segInfo1) assert.Nil(t, err) @@ -249,9 +240,6 @@ func TestMeta_Basic(t *testing.T) { nums, err = meta.GetNumRowsOfCollection(collID) assert.Nil(t, err) assert.EqualValues(t, (rowCount1 + rowCount1), nums) - memSize, err = meta.GetMemSizeOfCollection(collID) - assert.Nil(t, err) - assert.EqualValues(t, (rowCount1+rowCount1)*dim*4, memSize) }) t.Run("Test Invalid", func(t *testing.T) { diff --git a/internal/dataservice/server.go b/internal/dataservice/server.go index 4fcc89bac0..af6ece4321 100644 --- a/internal/dataservice/server.go +++ b/internal/dataservice/server.go @@ -764,9 +764,6 @@ func (s *Server) GetSegmentStates(ctx context.Context, req *datapb.GetSegmentSta } else { state.Status.ErrorCode = commonpb.ErrorCode_Success state.State = segmentInfo.State - state.CreateTime = segmentInfo.OpenTime - state.SealedTime = segmentInfo.SealedTime - state.FlushedTime = segmentInfo.FlushedTime state.StartPosition = segmentInfo.StartPosition state.EndPosition = segmentInfo.EndPosition } diff --git a/internal/dataservice/server_test.go b/internal/dataservice/server_test.go index 6519befb9e..82d2b76377 100644 --- a/internal/dataservice/server_test.go +++ b/internal/dataservice/server_test.go @@ -282,11 +282,7 @@ func TestGetSegmentStates(t *testing.T) { CollectionID: 100, PartitionID: 0, InsertChannel: "", - OpenTime: 0, - SealedTime: 0, - FlushedTime: 0, NumRows: 0, - MemSize: 0, State: commonpb.SegmentState_Growing, StartPosition: &internalpb.MsgPosition{ ChannelName: "", diff --git a/internal/dataservice/stats_handler.go b/internal/dataservice/stats_handler.go index c4f4263729..54d04b06db 100644 --- a/internal/dataservice/stats_handler.go +++ b/internal/dataservice/stats_handler.go @@ -33,7 +33,6 @@ func (handler *statsHandler) HandleSegmentStat(segStats *internalpb.SegmentStati } if segStats.StartPosition != nil { - segMeta.OpenTime = segStats.CreateTime segMeta.StartPosition = segStats.StartPosition } @@ -41,9 +40,7 @@ func (handler *statsHandler) HandleSegmentStat(segStats *internalpb.SegmentStati segMeta.EndPosition = segStats.EndPosition } - segMeta.SealedTime = segStats.EndTime segMeta.NumRows = segStats.NumRows - segMeta.MemSize = segStats.MemorySize log.Debug("stats_handler update segment", zap.Any("segmentID", segMeta.ID), zap.Any("State", segMeta.State)) - return handler.meta.UpdateSegment(segMeta) + return handler.meta.UpdateSegmentStatistic(segMeta) } diff --git a/internal/masterservice/master_service_test.go b/internal/masterservice/master_service_test.go index 6c73ddcba5..dbd60b4757 100644 --- a/internal/masterservice/master_service_test.go +++ b/internal/masterservice/master_service_test.go @@ -106,9 +106,8 @@ func (d *dataMock) GetSegmentInfo(ctx context.Context, req *datapb.GetSegmentInf }, Infos: []*datapb.SegmentInfo{ { - FlushedTime: 100, - NumRows: Params.MinSegmentSizeToEnableIndex, - State: commonpb.SegmentState_Flushed, + NumRows: Params.MinSegmentSizeToEnableIndex, + State: commonpb.SegmentState_Flushed, }, }, }, nil diff --git a/internal/proto/data_service.proto b/internal/proto/data_service.proto index a3cb249e1b..3ddee7ed82 100644 --- a/internal/proto/data_service.proto +++ b/internal/proto/data_service.proto @@ -105,12 +105,9 @@ message GetSegmentStatesRequest { message SegmentStateInfo { int64 segmentID = 1; common.SegmentState state = 2; - uint64 create_time = 3; - uint64 sealed_time = 4; - uint64 flushed_time = 5; - internal.MsgPosition start_position = 6; - internal.MsgPosition end_position = 7; - common.Status status = 8; + internal.MsgPosition start_position = 3; + internal.MsgPosition end_position = 4; + common.Status status = 5; } message GetSegmentStatesResponse { @@ -226,14 +223,10 @@ message SegmentInfo { int64 collectionID = 2; int64 partitionID = 3; string insert_channel = 4; - uint64 open_time = 5; - uint64 sealed_time = 6; - uint64 flushed_time = 7; - int64 num_rows = 8; - int64 mem_size = 9; - common.SegmentState state = 10; - internal.MsgPosition start_position = 11; - internal.MsgPosition end_position = 12; + int64 num_rows = 5; + common.SegmentState state = 6; + internal.MsgPosition start_position = 7; + internal.MsgPosition end_position = 8; } message ID2PathList { diff --git a/internal/proto/datapb/data_service.pb.go b/internal/proto/datapb/data_service.pb.go index a51d02ba59..467d8b03e3 100644 --- a/internal/proto/datapb/data_service.pb.go +++ b/internal/proto/datapb/data_service.pb.go @@ -589,12 +589,9 @@ func (m *GetSegmentStatesRequest) GetSegmentIDs() []int64 { type SegmentStateInfo struct { SegmentID int64 `protobuf:"varint,1,opt,name=segmentID,proto3" json:"segmentID,omitempty"` State commonpb.SegmentState `protobuf:"varint,2,opt,name=state,proto3,enum=milvus.proto.common.SegmentState" json:"state,omitempty"` - CreateTime uint64 `protobuf:"varint,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"` - SealedTime uint64 `protobuf:"varint,4,opt,name=sealed_time,json=sealedTime,proto3" json:"sealed_time,omitempty"` - FlushedTime uint64 `protobuf:"varint,5,opt,name=flushed_time,json=flushedTime,proto3" json:"flushed_time,omitempty"` - StartPosition *internalpb.MsgPosition `protobuf:"bytes,6,opt,name=start_position,json=startPosition,proto3" json:"start_position,omitempty"` - EndPosition *internalpb.MsgPosition `protobuf:"bytes,7,opt,name=end_position,json=endPosition,proto3" json:"end_position,omitempty"` - Status *commonpb.Status `protobuf:"bytes,8,opt,name=status,proto3" json:"status,omitempty"` + StartPosition *internalpb.MsgPosition `protobuf:"bytes,3,opt,name=start_position,json=startPosition,proto3" json:"start_position,omitempty"` + EndPosition *internalpb.MsgPosition `protobuf:"bytes,4,opt,name=end_position,json=endPosition,proto3" json:"end_position,omitempty"` + Status *commonpb.Status `protobuf:"bytes,5,opt,name=status,proto3" json:"status,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -639,27 +636,6 @@ func (m *SegmentStateInfo) GetState() commonpb.SegmentState { return commonpb.SegmentState_SegmentStateNone } -func (m *SegmentStateInfo) GetCreateTime() uint64 { - if m != nil { - return m.CreateTime - } - return 0 -} - -func (m *SegmentStateInfo) GetSealedTime() uint64 { - if m != nil { - return m.SealedTime - } - return 0 -} - -func (m *SegmentStateInfo) GetFlushedTime() uint64 { - if m != nil { - return m.FlushedTime - } - return 0 -} - func (m *SegmentStateInfo) GetStartPosition() *internalpb.MsgPosition { if m != nil { return m.StartPosition @@ -1684,14 +1660,10 @@ type SegmentInfo struct { CollectionID int64 `protobuf:"varint,2,opt,name=collectionID,proto3" json:"collectionID,omitempty"` PartitionID int64 `protobuf:"varint,3,opt,name=partitionID,proto3" json:"partitionID,omitempty"` InsertChannel string `protobuf:"bytes,4,opt,name=insert_channel,json=insertChannel,proto3" json:"insert_channel,omitempty"` - OpenTime uint64 `protobuf:"varint,5,opt,name=open_time,json=openTime,proto3" json:"open_time,omitempty"` - SealedTime uint64 `protobuf:"varint,6,opt,name=sealed_time,json=sealedTime,proto3" json:"sealed_time,omitempty"` - FlushedTime uint64 `protobuf:"varint,7,opt,name=flushed_time,json=flushedTime,proto3" json:"flushed_time,omitempty"` - NumRows int64 `protobuf:"varint,8,opt,name=num_rows,json=numRows,proto3" json:"num_rows,omitempty"` - MemSize int64 `protobuf:"varint,9,opt,name=mem_size,json=memSize,proto3" json:"mem_size,omitempty"` - State commonpb.SegmentState `protobuf:"varint,10,opt,name=state,proto3,enum=milvus.proto.common.SegmentState" json:"state,omitempty"` - StartPosition *internalpb.MsgPosition `protobuf:"bytes,11,opt,name=start_position,json=startPosition,proto3" json:"start_position,omitempty"` - EndPosition *internalpb.MsgPosition `protobuf:"bytes,12,opt,name=end_position,json=endPosition,proto3" json:"end_position,omitempty"` + NumRows int64 `protobuf:"varint,5,opt,name=num_rows,json=numRows,proto3" json:"num_rows,omitempty"` + State commonpb.SegmentState `protobuf:"varint,6,opt,name=state,proto3,enum=milvus.proto.common.SegmentState" json:"state,omitempty"` + StartPosition *internalpb.MsgPosition `protobuf:"bytes,7,opt,name=start_position,json=startPosition,proto3" json:"start_position,omitempty"` + EndPosition *internalpb.MsgPosition `protobuf:"bytes,8,opt,name=end_position,json=endPosition,proto3" json:"end_position,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1750,27 +1722,6 @@ func (m *SegmentInfo) GetInsertChannel() string { return "" } -func (m *SegmentInfo) GetOpenTime() uint64 { - if m != nil { - return m.OpenTime - } - return 0 -} - -func (m *SegmentInfo) GetSealedTime() uint64 { - if m != nil { - return m.SealedTime - } - return 0 -} - -func (m *SegmentInfo) GetFlushedTime() uint64 { - if m != nil { - return m.FlushedTime - } - return 0 -} - func (m *SegmentInfo) GetNumRows() int64 { if m != nil { return m.NumRows @@ -1778,13 +1729,6 @@ func (m *SegmentInfo) GetNumRows() int64 { return 0 } -func (m *SegmentInfo) GetMemSize() int64 { - if m != nil { - return m.MemSize - } - return 0 -} - func (m *SegmentInfo) GetState() commonpb.SegmentState { if m != nil { return m.State @@ -1988,120 +1932,114 @@ func init() { func init() { proto.RegisterFile("data_service.proto", fileDescriptor_3385cd32ad6cfe64) } var fileDescriptor_3385cd32ad6cfe64 = []byte{ - // 1794 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xeb, 0x6f, 0xdb, 0xc8, - 0x11, 0x37, 0x2d, 0xc9, 0xb2, 0x47, 0x94, 0x1c, 0xaf, 0x5d, 0x47, 0x55, 0x12, 0x3f, 0x98, 0x26, - 0x71, 0x12, 0xd4, 0x4e, 0xe4, 0xa2, 0x0f, 0x14, 0xfd, 0x10, 0x47, 0x8d, 0x21, 0xc4, 0x0e, 0x5c, - 0x2a, 0x6d, 0x80, 0x06, 0x85, 0x40, 0x4b, 0x6b, 0x79, 0x1b, 0x91, 0x54, 0xb8, 0x54, 0x5e, 0x5f, - 0x52, 0xb4, 0xfd, 0x54, 0x14, 0x17, 0xdc, 0x01, 0xf7, 0xfd, 0xee, 0x80, 0x03, 0x0e, 0xb8, 0xff, - 0xec, 0x70, 0x7f, 0xc4, 0x61, 0x1f, 0x7c, 0x53, 0x12, 0x2d, 0x27, 0xe7, 0x6f, 0xdc, 0xe5, 0xbc, - 0x76, 0x76, 0xe6, 0xb7, 0x33, 0x03, 0xa8, 0x6b, 0xb8, 0x46, 0x9b, 0x62, 0xe7, 0x15, 0xe9, 0xe0, - 0xed, 0x81, 0x63, 0xbb, 0x36, 0x5a, 0x32, 0x49, 0xff, 0xd5, 0x90, 0x8a, 0xd5, 0x36, 0x23, 0xa8, - 0xa9, 0x1d, 0xdb, 0x34, 0x6d, 0x4b, 0x6c, 0xd5, 0x2a, 0xc4, 0x72, 0xb1, 0x63, 0x19, 0x7d, 0xb9, - 0x56, 0xc3, 0x0c, 0x35, 0x95, 0x76, 0x4e, 0xb1, 0x69, 0x88, 0x95, 0xf6, 0x1e, 0x96, 0x75, 0xdc, - 0x23, 0xd4, 0xc5, 0xce, 0x13, 0xbb, 0x8b, 0x75, 0xfc, 0x72, 0x88, 0xa9, 0x8b, 0xee, 0x41, 0xfe, - 0xd8, 0xa0, 0xb8, 0xaa, 0x6c, 0x28, 0x5b, 0xa5, 0xfa, 0xd5, 0xed, 0x88, 0x4a, 0xa9, 0xec, 0x90, - 0xf6, 0xf6, 0x0c, 0x8a, 0x75, 0x4e, 0x89, 0x7e, 0x0b, 0x45, 0xa3, 0xdb, 0x75, 0x30, 0xa5, 0xd5, - 0xd9, 0x31, 0x4c, 0x0f, 0x04, 0x8d, 0xee, 0x11, 0x6b, 0x1f, 0x14, 0x58, 0x89, 0x5a, 0x40, 0x07, - 0xb6, 0x45, 0x31, 0xda, 0x83, 0x12, 0xb1, 0x88, 0xdb, 0x1e, 0x18, 0x8e, 0x61, 0x52, 0x69, 0xc9, - 0x66, 0x54, 0xa8, 0x7f, 0xd0, 0xa6, 0x45, 0xdc, 0x23, 0x4e, 0xa8, 0x03, 0xf1, 0xbf, 0xd1, 0x2e, - 0xcc, 0x51, 0xd7, 0x70, 0x87, 0x9e, 0x4d, 0x57, 0x52, 0x6d, 0x6a, 0x71, 0x12, 0x5d, 0x92, 0x6a, - 0x6f, 0x40, 0x7d, 0xd4, 0x1f, 0xd2, 0xd3, 0xe9, 0x7d, 0x81, 0x20, 0xdf, 0x3d, 0x6e, 0x36, 0xb8, - 0xd2, 0x9c, 0xce, 0xbf, 0x91, 0x06, 0x6a, 0xc7, 0xee, 0xf7, 0x71, 0xc7, 0x25, 0xb6, 0xd5, 0x6c, - 0x54, 0xf3, 0xfc, 0x5f, 0x64, 0x4f, 0xfb, 0x5c, 0x81, 0x4b, 0x2d, 0xdc, 0x33, 0xb1, 0xe5, 0x36, - 0x1b, 0x9e, 0xfa, 0x15, 0x28, 0x74, 0xec, 0xa1, 0xe5, 0x72, 0xfd, 0x65, 0x5d, 0x2c, 0xd0, 0x26, - 0xa8, 0x9d, 0x53, 0xc3, 0xb2, 0x70, 0xbf, 0x6d, 0x19, 0x26, 0xe6, 0xaa, 0x16, 0xf4, 0x92, 0xdc, - 0x7b, 0x62, 0x98, 0x38, 0xa1, 0x31, 0x97, 0xd4, 0x88, 0x36, 0xa0, 0x34, 0x30, 0x1c, 0x97, 0x44, - 0x8c, 0x0a, 0x6f, 0x69, 0x5f, 0x29, 0xb0, 0xfa, 0x80, 0x52, 0xd2, 0xb3, 0x12, 0x96, 0xad, 0xc2, - 0x9c, 0x65, 0x77, 0x71, 0xb3, 0xc1, 0x4d, 0xcb, 0xe9, 0x72, 0x85, 0xae, 0xc0, 0xc2, 0x00, 0x63, - 0xa7, 0xed, 0xd8, 0x7d, 0xcf, 0xb0, 0x79, 0xb6, 0xa1, 0xdb, 0x7d, 0x8c, 0xfe, 0x02, 0x4b, 0x34, - 0x26, 0x88, 0x56, 0x73, 0x1b, 0xb9, 0xad, 0x52, 0xfd, 0xfa, 0x76, 0x22, 0xb2, 0xb7, 0xe3, 0x4a, - 0xf5, 0x24, 0xb7, 0xf6, 0xaf, 0x59, 0x58, 0xf6, 0xe9, 0x84, 0xad, 0xec, 0x9b, 0x79, 0x8e, 0xe2, - 0x9e, 0x6f, 0x9e, 0x58, 0x64, 0xf1, 0x9c, 0xef, 0xf2, 0x5c, 0xd8, 0xe5, 0x19, 0x6e, 0x30, 0xee, - 0xcf, 0x42, 0xc2, 0x9f, 0x68, 0x1d, 0x4a, 0xf8, 0xcd, 0x80, 0x38, 0xb8, 0xed, 0x12, 0x13, 0x57, - 0xe7, 0x36, 0x94, 0xad, 0xbc, 0x0e, 0x62, 0xeb, 0x29, 0x31, 0x71, 0x28, 0x66, 0x8b, 0xd9, 0x63, - 0xf6, 0x1b, 0x05, 0x2e, 0x27, 0x6e, 0x49, 0x26, 0x92, 0x0e, 0x97, 0xf8, 0xc9, 0x03, 0xcf, 0xb0, - 0x6c, 0x62, 0x0e, 0xbf, 0x39, 0xce, 0xe1, 0x01, 0xb9, 0x9e, 0xe0, 0x9f, 0x2e, 0xb1, 0xbe, 0x56, - 0x60, 0xb9, 0x75, 0x6a, 0xbf, 0x96, 0x2a, 0xe8, 0xf4, 0x09, 0x16, 0xbf, 0x8a, 0xd9, 0xc9, 0x57, - 0x91, 0x4b, 0x5e, 0x85, 0x97, 0xa6, 0xf9, 0x20, 0x4d, 0xb5, 0x17, 0xb0, 0x12, 0x35, 0x51, 0x3a, - 0x71, 0x0d, 0xc0, 0x0f, 0x3c, 0xe1, 0xbe, 0x9c, 0x1e, 0xda, 0x99, 0xce, 0x21, 0x2f, 0xe0, 0xf2, - 0x3e, 0x76, 0xa5, 0x2e, 0xf6, 0x0f, 0x9f, 0xc3, 0x27, 0x51, 0x0b, 0x67, 0xe3, 0x16, 0x6a, 0x5f, - 0xe6, 0x7c, 0x70, 0xe1, 0xaa, 0x9a, 0xd6, 0x89, 0x8d, 0xae, 0xc2, 0x82, 0x4f, 0x22, 0xd3, 0x24, - 0xd8, 0x40, 0xbf, 0x83, 0x02, 0xb3, 0x54, 0xe4, 0x48, 0x25, 0x0e, 0xbe, 0xde, 0x99, 0x42, 0x32, - 0x75, 0x41, 0xcf, 0x82, 0xbc, 0xe3, 0x60, 0xc3, 0x95, 0x41, 0x9e, 0x13, 0x41, 0x2e, 0xb6, 0x78, - 0x90, 0xaf, 0x43, 0x89, 0x62, 0xa3, 0x8f, 0xbb, 0x82, 0x20, 0x2f, 0x08, 0xc4, 0x16, 0x27, 0xd8, - 0x04, 0xf5, 0x84, 0x81, 0xb0, 0x47, 0x51, 0xe0, 0x14, 0x25, 0xb9, 0xc7, 0x49, 0x9a, 0x50, 0xa1, - 0xae, 0xe1, 0xb8, 0xed, 0x81, 0x4d, 0xf9, 0x95, 0xf2, 0x64, 0x2a, 0xd5, 0xb5, 0x11, 0x6f, 0xc4, - 0x21, 0xed, 0x1d, 0x49, 0x4a, 0xbd, 0xcc, 0x39, 0xbd, 0x25, 0xfa, 0x33, 0xa8, 0xd8, 0xea, 0x06, - 0x82, 0x8a, 0x99, 0x05, 0x95, 0xb0, 0xd5, 0xf5, 0xc5, 0x04, 0x41, 0x30, 0x9f, 0x3d, 0x08, 0xfe, - 0xaf, 0x40, 0x35, 0x19, 0x05, 0x32, 0xec, 0x02, 0x89, 0x4a, 0x66, 0x89, 0xe8, 0x8f, 0x82, 0x09, - 0x8b, 0x28, 0x18, 0x8b, 0xab, 0x7e, 0x24, 0xe8, 0x92, 0x45, 0x23, 0xf0, 0x8b, 0xc0, 0x1a, 0xfe, - 0xe7, 0x93, 0x45, 0xe4, 0x7f, 0x14, 0x58, 0x8d, 0xeb, 0x3a, 0xcf, 0xb9, 0x7f, 0x03, 0x05, 0x62, - 0x9d, 0xd8, 0xde, 0xb1, 0xd7, 0xc6, 0xa0, 0x1b, 0xd3, 0x25, 0x88, 0x35, 0x13, 0xae, 0xec, 0x63, - 0xb7, 0x69, 0x51, 0xec, 0xb8, 0x7b, 0xc4, 0xea, 0xdb, 0xbd, 0x23, 0xc3, 0x3d, 0x3d, 0x47, 0x22, - 0x46, 0x72, 0x6a, 0x36, 0x96, 0x53, 0xda, 0x77, 0x0a, 0x5c, 0x4d, 0xd7, 0x27, 0x8f, 0x5e, 0x83, - 0xf9, 0x13, 0x82, 0xfb, 0xdd, 0x00, 0x67, 0xfc, 0x35, 0x4b, 0xc8, 0x01, 0x23, 0x96, 0x27, 0x1c, - 0x55, 0x0d, 0xb5, 0x5c, 0x87, 0x58, 0xbd, 0x03, 0x42, 0x5d, 0x5d, 0xd0, 0x87, 0xfc, 0x99, 0xcb, - 0x1e, 0x99, 0xff, 0x15, 0x91, 0x29, 0x4c, 0x7d, 0x28, 0xde, 0x47, 0xfa, 0x69, 0xab, 0xa2, 0x94, - 0x1a, 0x45, 0xfb, 0x9f, 0x02, 0x6b, 0xfb, 0xd8, 0x7d, 0xe8, 0xef, 0x31, 0x33, 0x09, 0x75, 0x49, - 0xe7, 0x02, 0x8c, 0xf9, 0xa0, 0xc0, 0xfa, 0x48, 0x63, 0xe4, 0x0d, 0x4a, 0xd8, 0xf4, 0x5e, 0xd9, - 0x74, 0xd8, 0x7c, 0x8c, 0xdf, 0xfe, 0xcd, 0xe8, 0x0f, 0xf1, 0x91, 0x41, 0x1c, 0x01, 0x9b, 0x53, - 0x3e, 0x22, 0xdf, 0x2b, 0x70, 0x6d, 0x1f, 0xb3, 0x8a, 0x57, 0x3c, 0x6c, 0x17, 0xe8, 0x9d, 0x0c, - 0xe5, 0xe4, 0x67, 0xe2, 0x32, 0x53, 0xad, 0xbd, 0x10, 0xf7, 0xad, 0xf1, 0x74, 0x0c, 0xe1, 0x82, - 0x0c, 0x74, 0xe9, 0x3c, 0xcd, 0x86, 0xd5, 0x67, 0x86, 0xdb, 0x39, 0x6d, 0x98, 0xe7, 0xcf, 0x80, - 0xeb, 0x50, 0x0e, 0x97, 0x9e, 0x22, 0x8d, 0x17, 0x74, 0x35, 0x54, 0x7b, 0x52, 0x56, 0x70, 0xaf, - 0xf0, 0xfe, 0xe3, 0xfc, 0x65, 0xd2, 0xb4, 0xd7, 0x18, 0x05, 0xee, 0x7c, 0x02, 0xb8, 0xdf, 0x00, - 0x48, 0xe3, 0x0e, 0x69, 0x6f, 0x0a, 0xbb, 0x7e, 0x0f, 0x45, 0x29, 0x4d, 0xde, 0xd4, 0x24, 0xa8, - 0xf6, 0xc8, 0xb5, 0x16, 0xac, 0xca, 0xfd, 0x47, 0x0c, 0x13, 0x05, 0x7e, 0x1e, 0x62, 0xd7, 0x40, - 0x55, 0x28, 0x4a, 0x98, 0x94, 0x75, 0x8c, 0xb7, 0x64, 0xb5, 0xc6, 0x31, 0xa7, 0x6b, 0x33, 0x2c, - 0x94, 0xf5, 0x3e, 0x1c, 0xfb, 0xd0, 0xab, 0xfd, 0x03, 0xca, 0x8d, 0xc6, 0x41, 0x48, 0xd6, 0x4d, - 0x58, 0xec, 0x76, 0xfb, 0xed, 0x30, 0x97, 0xc2, 0xb9, 0xca, 0xdd, 0x6e, 0x3f, 0xc0, 0x6c, 0xf4, - 0x2b, 0xa8, 0xb8, 0xb4, 0x9d, 0x14, 0xae, 0xba, 0x34, 0xa0, 0xd2, 0x0e, 0xa1, 0xc2, 0x8d, 0xe5, - 0x97, 0x3a, 0xc1, 0xd6, 0x4d, 0x50, 0x43, 0xe2, 0xbc, 0x00, 0x29, 0x05, 0xc6, 0x52, 0x06, 0x87, - 0x5e, 0x1d, 0x17, 0x48, 0x1c, 0x5f, 0xc7, 0x5d, 0x03, 0x20, 0xb4, 0x2d, 0x6b, 0x27, 0x6e, 0xe3, - 0xbc, 0xbe, 0x40, 0xe8, 0x23, 0xb1, 0x81, 0xfe, 0x00, 0x73, 0x5c, 0x3f, 0xad, 0x16, 0xd2, 0x32, - 0x8e, 0xdf, 0x46, 0xf4, 0x04, 0xba, 0x64, 0xd0, 0xfe, 0x0a, 0x6a, 0xa3, 0x71, 0x10, 0xd8, 0x11, - 0x8f, 0x2e, 0x25, 0x25, 0xba, 0x32, 0x9c, 0xf1, 0x3d, 0x54, 0x02, 0x84, 0xe5, 0x85, 0x6a, 0x05, - 0x66, 0x7d, 0x71, 0xb3, 0xcd, 0x06, 0xfa, 0x13, 0xcc, 0x89, 0x39, 0x86, 0x8c, 0xa0, 0x1b, 0x51, - 0x9b, 0xe5, 0x8c, 0x23, 0x04, 0xd3, 0x7c, 0x43, 0x97, 0x4c, 0x2c, 0xc2, 0x7d, 0x54, 0x12, 0xed, - 0x67, 0x4e, 0x0f, 0xed, 0x68, 0x3f, 0xe6, 0xa0, 0x14, 0x0a, 0xc0, 0x84, 0xfa, 0x8f, 0xd3, 0x80, - 0xdc, 0x80, 0x0a, 0xe1, 0x8f, 0x6b, 0x5b, 0x22, 0x00, 0x47, 0xcc, 0x05, 0xbd, 0x4c, 0xc2, 0x4f, - 0x2e, 0xeb, 0xa7, 0xed, 0x01, 0xb6, 0xc2, 0x85, 0xf0, 0x3c, 0xdb, 0x48, 0xab, 0xa4, 0xe7, 0x26, - 0x56, 0xd2, 0xc5, 0x64, 0x25, 0xfd, 0x4b, 0x98, 0xb7, 0x86, 0x66, 0xdb, 0xb1, 0x5f, 0x8b, 0xca, - 0x35, 0xa7, 0x17, 0xad, 0xa1, 0xa9, 0xdb, 0xaf, 0x29, 0xfb, 0x65, 0x62, 0xb3, 0x4d, 0xc9, 0x3b, - 0x5c, 0x5d, 0x10, 0xbf, 0x4c, 0x6c, 0xb6, 0xc8, 0x3b, 0x1c, 0x74, 0x07, 0x70, 0xc6, 0xee, 0x20, - 0x59, 0xb8, 0x97, 0x3e, 0x56, 0xe1, 0xae, 0x4e, 0x55, 0xb8, 0x6b, 0xbb, 0x50, 0x6a, 0x36, 0xea, - 0x2c, 0xf6, 0x58, 0xd1, 0x94, 0xb8, 0xed, 0x15, 0x28, 0x1c, 0x85, 0x42, 0x55, 0x2c, 0xb4, 0x2f, - 0xf2, 0xb0, 0xda, 0x32, 0x5e, 0xe1, 0x4f, 0x5f, 0x34, 0x66, 0x02, 0xed, 0x03, 0x58, 0xe2, 0x49, - 0x59, 0x0f, 0xd9, 0xc3, 0xe3, 0x29, 0x1d, 0x5e, 0x43, 0xe7, 0xd5, 0x93, 0x8c, 0xe8, 0x09, 0x20, - 0x26, 0xbd, 0xfe, 0x94, 0x86, 0xc5, 0x15, 0x32, 0x89, 0x4b, 0xe1, 0x44, 0x47, 0xb0, 0xcc, 0x77, - 0x1b, 0x61, 0x00, 0xa5, 0xb2, 0x63, 0x9b, 0x24, 0x30, 0x8d, 0x15, 0x3d, 0x86, 0xc5, 0x68, 0x14, - 0xd1, 0x6a, 0x91, 0xc3, 0x57, 0x96, 0xdb, 0xaf, 0x44, 0xc2, 0x88, 0xa2, 0x7d, 0x28, 0x87, 0xe3, - 0x88, 0xa5, 0x41, 0x56, 0x51, 0x6a, 0x28, 0x90, 0x68, 0xfd, 0x07, 0x15, 0x4a, 0x0d, 0xc3, 0x35, - 0x5a, 0x62, 0x64, 0x8b, 0x06, 0x80, 0x78, 0xb9, 0x68, 0x0e, 0x6c, 0xcb, 0x6f, 0xef, 0xd0, 0xbd, - 0x11, 0x72, 0x93, 0xa4, 0x32, 0xa2, 0x6a, 0x37, 0x47, 0x70, 0xc4, 0xc8, 0xb5, 0x19, 0x64, 0x72, - 0x8d, 0x2c, 0xaf, 0x9f, 0x92, 0xce, 0x0b, 0x0f, 0x43, 0xc6, 0x68, 0x8c, 0x91, 0x7a, 0x1a, 0x63, - 0x5d, 0xa3, 0x5c, 0x88, 0xd6, 0xc2, 0xab, 0xd5, 0xb4, 0x19, 0xf4, 0x12, 0x56, 0x58, 0xfd, 0xe4, - 0x97, 0x71, 0x9e, 0xc2, 0xfa, 0x68, 0x85, 0x09, 0xe2, 0x33, 0xaa, 0x34, 0x40, 0x0d, 0x4f, 0x8c, - 0x51, 0xda, 0x18, 0x2b, 0x65, 0xa8, 0x5d, 0xbb, 0x35, 0x91, 0xce, 0x57, 0xb1, 0x0f, 0x05, 0xfe, - 0xa8, 0xa1, 0xf5, 0xb4, 0xb7, 0x30, 0x34, 0x1d, 0xae, 0x8d, 0x2b, 0x32, 0xb5, 0x19, 0xf4, 0x4f, - 0x58, 0x8c, 0xcd, 0xe5, 0xd0, 0xed, 0x14, 0x91, 0xe9, 0x13, 0xd6, 0xda, 0x9d, 0x2c, 0xa4, 0x61, - 0xbf, 0x84, 0x67, 0x57, 0xa9, 0x7e, 0x49, 0x99, 0xbf, 0xa5, 0xfa, 0x25, 0x6d, 0x08, 0xa6, 0xcd, - 0xa0, 0x1e, 0x54, 0xa2, 0xd5, 0x32, 0xda, 0x4a, 0x61, 0x4e, 0x1d, 0x20, 0xd4, 0x6e, 0x67, 0xa0, - 0xf4, 0x15, 0x99, 0x70, 0x29, 0x3e, 0x14, 0x41, 0x77, 0xc6, 0x0a, 0x88, 0xe6, 0xcb, 0xdd, 0x4c, - 0xb4, 0xbe, 0xba, 0xb7, 0x3c, 0x8a, 0x13, 0x4d, 0x39, 0xda, 0x4e, 0x17, 0x33, 0x6a, 0x5a, 0x50, - 0xdb, 0xc9, 0x4c, 0xef, 0xab, 0xc6, 0xb0, 0x94, 0x68, 0xb2, 0xd1, 0xdd, 0x71, 0x72, 0x62, 0x8d, - 0x48, 0x6d, 0xf2, 0x18, 0x40, 0x9b, 0x41, 0xff, 0x56, 0xf8, 0xb0, 0x31, 0xad, 0x71, 0x45, 0xf7, - 0xd3, 0xb5, 0x8d, 0xe9, 0xb8, 0x6b, 0xf5, 0xb3, 0xb0, 0xf8, 0x67, 0x7d, 0xcf, 0x07, 0x3e, 0x29, - 0xcd, 0x5f, 0x1c, 0x9f, 0x3c, 0x79, 0xa3, 0xbb, 0xda, 0xda, 0xfd, 0x33, 0x70, 0xf8, 0x06, 0xd8, - 0xf1, 0xe9, 0x96, 0x07, 0x57, 0x3b, 0x13, 0x83, 0x73, 0x3a, 0xac, 0x7a, 0x0e, 0x8b, 0xb1, 0x1a, - 0x21, 0x35, 0xff, 0xd3, 0xeb, 0x88, 0x09, 0xe0, 0x52, 0xff, 0x36, 0x07, 0xf3, 0xec, 0xb1, 0xe1, - 0x28, 0xf8, 0xf3, 0xbf, 0x34, 0x17, 0x00, 0xfd, 0xcf, 0x61, 0x31, 0xd6, 0x8d, 0xa7, 0xba, 0x33, - 0xbd, 0x63, 0x9f, 0x84, 0xd5, 0xcf, 0xa0, 0x1c, 0x69, 0xbc, 0xd1, 0xad, 0x51, 0xe0, 0x1f, 0x47, - 0xd0, 0xf1, 0x82, 0xf7, 0x76, 0xff, 0x7e, 0xbf, 0x47, 0xdc, 0xd3, 0xe1, 0x31, 0xfb, 0xb3, 0x23, - 0x48, 0x7f, 0x4d, 0x6c, 0xf9, 0xb5, 0xe3, 0x39, 0x68, 0x87, 0x73, 0xef, 0x30, 0x35, 0x83, 0xe3, - 0xe3, 0x39, 0xbe, 0xda, 0xfd, 0x29, 0x00, 0x00, 0xff, 0xff, 0x24, 0xe1, 0x51, 0x20, 0x03, 0x1e, - 0x00, 0x00, + // 1712 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xdb, 0x6f, 0x1b, 0x45, + 0x17, 0xcf, 0xfa, 0x92, 0xcb, 0xf1, 0x25, 0xcd, 0x24, 0x5f, 0xea, 0xcf, 0x6d, 0xd3, 0x74, 0xfb, + 0xb5, 0x4d, 0x5b, 0x7d, 0x49, 0xeb, 0x20, 0x2e, 0x42, 0x3c, 0x34, 0x35, 0x8d, 0xac, 0x26, 0x55, + 0xd8, 0x04, 0x2a, 0x51, 0x21, 0x6b, 0x63, 0x4f, 0x9c, 0xa1, 0xde, 0x5d, 0xd7, 0x33, 0xee, 0xe5, + 0xa9, 0x08, 0x78, 0x42, 0x88, 0x0a, 0xfe, 0x02, 0x40, 0x42, 0x42, 0xe2, 0x85, 0xbf, 0x8b, 0x27, + 0xfe, 0x04, 0xb4, 0x33, 0xb3, 0xf7, 0xb1, 0xbd, 0x75, 0x5a, 0xf2, 0xb6, 0x33, 0x7b, 0x6e, 0x73, + 0x2e, 0xbf, 0x39, 0x67, 0x00, 0xb5, 0x4d, 0x66, 0x36, 0x29, 0xee, 0x3f, 0x25, 0x2d, 0xbc, 0xde, + 0xeb, 0x3b, 0xcc, 0x41, 0x0b, 0x16, 0xe9, 0x3e, 0x1d, 0x50, 0xb1, 0x5a, 0x77, 0x09, 0xaa, 0xc5, + 0x96, 0x63, 0x59, 0x8e, 0x2d, 0xb6, 0xaa, 0x65, 0x62, 0x33, 0xdc, 0xb7, 0xcd, 0xae, 0x5c, 0x17, + 0xc3, 0x0c, 0xd5, 0x22, 0x6d, 0x1d, 0x63, 0xcb, 0x14, 0x2b, 0xfd, 0x25, 0x2c, 0x1a, 0xb8, 0x43, + 0x28, 0xc3, 0xfd, 0x07, 0x4e, 0x1b, 0x1b, 0xf8, 0xc9, 0x00, 0x53, 0x86, 0x6e, 0x41, 0xee, 0xd0, + 0xa4, 0xb8, 0xa2, 0xad, 0x6a, 0x6b, 0x85, 0xda, 0xf9, 0xf5, 0x88, 0x4a, 0xa9, 0x6c, 0x97, 0x76, + 0xb6, 0x4c, 0x8a, 0x0d, 0x4e, 0x89, 0xde, 0x85, 0x19, 0xb3, 0xdd, 0xee, 0x63, 0x4a, 0x2b, 0x99, + 0x11, 0x4c, 0x77, 0x04, 0x8d, 0xe1, 0x11, 0xeb, 0xaf, 0x34, 0x58, 0x8a, 0x5a, 0x40, 0x7b, 0x8e, + 0x4d, 0x31, 0xda, 0x82, 0x02, 0xb1, 0x09, 0x6b, 0xf6, 0xcc, 0xbe, 0x69, 0x51, 0x69, 0xc9, 0xa5, + 0xa8, 0x50, 0xff, 0xa0, 0x0d, 0x9b, 0xb0, 0x3d, 0x4e, 0x68, 0x00, 0xf1, 0xbf, 0xd1, 0x26, 0x4c, + 0x53, 0x66, 0xb2, 0x81, 0x67, 0xd3, 0x39, 0xa5, 0x4d, 0xfb, 0x9c, 0xc4, 0x90, 0xa4, 0xfa, 0x73, + 0x28, 0xde, 0xeb, 0x0e, 0xe8, 0xf1, 0xe4, 0xbe, 0x40, 0x90, 0x6b, 0x1f, 0x36, 0xea, 0x5c, 0x69, + 0xd6, 0xe0, 0xdf, 0x48, 0x87, 0x62, 0xcb, 0xe9, 0x76, 0x71, 0x8b, 0x11, 0xc7, 0x6e, 0xd4, 0x2b, + 0x39, 0xfe, 0x2f, 0xb2, 0xa7, 0xff, 0xa8, 0xc1, 0x99, 0x7d, 0xdc, 0xb1, 0xb0, 0xcd, 0x1a, 0x75, + 0x4f, 0xfd, 0x12, 0xe4, 0x5b, 0xce, 0xc0, 0x66, 0x5c, 0x7f, 0xc9, 0x10, 0x0b, 0x74, 0x09, 0x8a, + 0xad, 0x63, 0xd3, 0xb6, 0x71, 0xb7, 0x69, 0x9b, 0x16, 0xe6, 0xaa, 0xe6, 0x8c, 0x82, 0xdc, 0x7b, + 0x60, 0x5a, 0x38, 0xa1, 0x31, 0x9b, 0xd4, 0x88, 0x56, 0xa1, 0xd0, 0x33, 0xfb, 0x8c, 0x44, 0x8c, + 0x0a, 0x6f, 0xe9, 0x3f, 0x6b, 0xb0, 0x7c, 0x87, 0x52, 0xd2, 0xb1, 0x13, 0x96, 0x2d, 0xc3, 0xb4, + 0xed, 0xb4, 0x71, 0xa3, 0xce, 0x4d, 0xcb, 0x1a, 0x72, 0x85, 0xce, 0xc1, 0x5c, 0x0f, 0xe3, 0x7e, + 0xb3, 0xef, 0x74, 0x3d, 0xc3, 0x66, 0xdd, 0x0d, 0xc3, 0xe9, 0x62, 0xf4, 0x09, 0x2c, 0xd0, 0x98, + 0x20, 0x5a, 0xc9, 0xae, 0x66, 0xd7, 0x0a, 0xb5, 0xcb, 0xeb, 0x89, 0xcc, 0x5e, 0x8f, 0x2b, 0x35, + 0x92, 0xdc, 0xfa, 0x57, 0x19, 0x58, 0xf4, 0xe9, 0x84, 0xad, 0xee, 0xb7, 0xeb, 0x39, 0x8a, 0x3b, + 0xbe, 0x79, 0x62, 0x91, 0xc6, 0x73, 0xbe, 0xcb, 0xb3, 0x61, 0x97, 0xa7, 0x88, 0x60, 0xdc, 0x9f, + 0xf9, 0x84, 0x3f, 0xd1, 0x45, 0x28, 0xe0, 0xe7, 0x3d, 0xd2, 0xc7, 0x4d, 0x46, 0x2c, 0x5c, 0x99, + 0x5e, 0xd5, 0xd6, 0x72, 0x06, 0x88, 0xad, 0x03, 0x62, 0xe1, 0x50, 0xce, 0xce, 0xa4, 0xcf, 0xd9, + 0x5f, 0x35, 0x38, 0x9b, 0x88, 0x92, 0x2c, 0x24, 0x03, 0xce, 0xf0, 0x93, 0x07, 0x9e, 0x71, 0xab, + 0xc9, 0x75, 0xf8, 0xd5, 0x51, 0x0e, 0x0f, 0xc8, 0x8d, 0x04, 0xff, 0x64, 0x85, 0xf5, 0x8b, 0x06, + 0x8b, 0xfb, 0xc7, 0xce, 0x33, 0xa9, 0x82, 0x4e, 0x5e, 0x60, 0xf1, 0x50, 0x64, 0xc6, 0x87, 0x22, + 0x9b, 0x0c, 0x85, 0x57, 0xa6, 0xb9, 0xa0, 0x4c, 0xf5, 0xc7, 0xb0, 0x14, 0x35, 0x51, 0x3a, 0x71, + 0x05, 0xc0, 0x4f, 0x3c, 0xe1, 0xbe, 0xac, 0x11, 0xda, 0x99, 0xcc, 0x21, 0x8f, 0xe1, 0xec, 0x36, + 0x66, 0x52, 0x97, 0xfb, 0x0f, 0x9f, 0xc0, 0x27, 0x51, 0x0b, 0x33, 0x71, 0x0b, 0xf5, 0x3f, 0x33, + 0x3e, 0xb8, 0x70, 0x55, 0x0d, 0xfb, 0xc8, 0x41, 0xe7, 0x61, 0xce, 0x27, 0x91, 0x65, 0x12, 0x6c, + 0xa0, 0xf7, 0x20, 0xef, 0x5a, 0x2a, 0x6a, 0xa4, 0x1c, 0x07, 0x5f, 0xef, 0x4c, 0x21, 0x99, 0x86, + 0xa0, 0x47, 0x0d, 0x28, 0x53, 0x66, 0xf6, 0x59, 0xb3, 0xe7, 0x50, 0xee, 0x6d, 0xee, 0xfe, 0x42, + 0x4d, 0x1f, 0x02, 0xdf, 0xbb, 0xb4, 0xb3, 0x27, 0x29, 0x8d, 0x12, 0xe7, 0xf4, 0x96, 0xe8, 0x63, + 0x28, 0x62, 0xbb, 0x1d, 0x08, 0xca, 0xa5, 0x16, 0x54, 0xc0, 0x76, 0xdb, 0x17, 0x13, 0xc4, 0x27, + 0x9f, 0x3e, 0x3e, 0xdf, 0x6b, 0x50, 0x49, 0x06, 0x48, 0x66, 0x44, 0x20, 0x51, 0x4b, 0x2d, 0x11, + 0x7d, 0x28, 0x98, 0xb0, 0x08, 0xd0, 0x48, 0xc8, 0xf3, 0x83, 0x64, 0x48, 0x16, 0x9d, 0xc0, 0x7f, + 0x02, 0x6b, 0xf8, 0x9f, 0xb7, 0x96, 0x2c, 0xdf, 0x68, 0xb0, 0x1c, 0xd7, 0x75, 0x92, 0x73, 0xbf, + 0x03, 0x79, 0x62, 0x1f, 0x39, 0xde, 0xb1, 0x57, 0x46, 0x00, 0x8f, 0xab, 0x4b, 0x10, 0xeb, 0x16, + 0x9c, 0xdb, 0xc6, 0xac, 0x61, 0x53, 0xdc, 0x67, 0x5b, 0xc4, 0xee, 0x3a, 0x9d, 0x3d, 0x93, 0x1d, + 0x9f, 0xa0, 0x46, 0x22, 0xe9, 0x9e, 0x89, 0xa5, 0xbb, 0xfe, 0xbb, 0x06, 0xe7, 0xd5, 0xfa, 0xe4, + 0xd1, 0xab, 0x30, 0x7b, 0x44, 0x70, 0xb7, 0x1d, 0x40, 0x80, 0xbf, 0x76, 0x6b, 0xa5, 0xe7, 0x12, + 0xcb, 0x13, 0x0e, 0x6b, 0x54, 0xf6, 0x59, 0x9f, 0xd8, 0x9d, 0x1d, 0x42, 0x99, 0x21, 0xe8, 0x43, + 0xfe, 0xcc, 0xa6, 0xcf, 0xcc, 0x6f, 0x45, 0x66, 0x0a, 0x53, 0xef, 0x8a, 0xab, 0x8b, 0xbe, 0xdd, + 0x86, 0x45, 0xd1, 0x3e, 0xe8, 0xdf, 0x69, 0xb0, 0xb2, 0x8d, 0xd9, 0x5d, 0x7f, 0xcf, 0x35, 0x93, + 0x50, 0x46, 0x5a, 0xa7, 0x60, 0xcc, 0x2b, 0x0d, 0x2e, 0x0e, 0x35, 0x46, 0x46, 0x50, 0x22, 0x9a, + 0x77, 0x01, 0xaa, 0x11, 0xed, 0x3e, 0x7e, 0xf1, 0x99, 0xd9, 0x1d, 0xe0, 0x3d, 0x93, 0xf4, 0x05, + 0xa2, 0x4d, 0x88, 0xef, 0x7f, 0x68, 0x70, 0x61, 0x1b, 0xbb, 0xcd, 0xa8, 0xb8, 0x73, 0x4e, 0xd1, + 0x3b, 0x29, 0x3a, 0xbd, 0x1f, 0x44, 0x30, 0x95, 0xd6, 0x9e, 0x8a, 0xfb, 0x56, 0x78, 0x39, 0x86, + 0x70, 0x41, 0x26, 0xba, 0x74, 0x9e, 0xee, 0xc0, 0xf2, 0x43, 0x93, 0xb5, 0x8e, 0xeb, 0xd6, 0xc9, + 0x2b, 0xe0, 0x32, 0x94, 0xc2, 0x5d, 0xa1, 0x28, 0xe3, 0x39, 0xa3, 0x18, 0x6a, 0x0b, 0xa9, 0xdb, + 0x0b, 0x2f, 0xf1, 0xd1, 0xe0, 0xe4, 0x1d, 0xcc, 0xa4, 0x61, 0x8c, 0x02, 0x77, 0x2e, 0x01, 0xdc, + 0xcf, 0x01, 0xa4, 0x71, 0xbb, 0xb4, 0x33, 0x81, 0x5d, 0xef, 0xc3, 0x8c, 0x94, 0x26, 0x23, 0x35, + 0x0e, 0xaa, 0x3d, 0x72, 0x7d, 0x1f, 0x96, 0xe5, 0xfe, 0x3d, 0x17, 0x13, 0x05, 0x7e, 0xee, 0x62, + 0x66, 0xa2, 0x0a, 0xcc, 0x48, 0x98, 0x94, 0x2d, 0x86, 0xb7, 0x74, 0x9b, 0xe1, 0x43, 0x4e, 0xd7, + 0x74, 0xb1, 0x50, 0xb6, 0xe2, 0x70, 0xe8, 0x43, 0xaf, 0xfe, 0x05, 0x94, 0xea, 0xf5, 0x9d, 0x90, + 0xac, 0xab, 0x30, 0xdf, 0x6e, 0x77, 0x9b, 0x61, 0x2e, 0x8d, 0x73, 0x95, 0xda, 0xed, 0x6e, 0x80, + 0xd9, 0xe8, 0x7f, 0x50, 0x66, 0xb4, 0x99, 0x14, 0x5e, 0x64, 0x34, 0xa0, 0xd2, 0x77, 0xa1, 0xcc, + 0x8d, 0xe5, 0x41, 0x1d, 0x63, 0xeb, 0x25, 0x28, 0x86, 0xc4, 0x79, 0x09, 0x52, 0x08, 0x8c, 0xa5, + 0x2e, 0x1c, 0x7a, 0x2d, 0x56, 0x20, 0x71, 0x74, 0x8b, 0x75, 0x01, 0x80, 0xd0, 0xe6, 0x91, 0x4b, + 0x8d, 0xdb, 0xdc, 0xc6, 0x59, 0x63, 0x8e, 0xd0, 0x7b, 0x62, 0x03, 0x7d, 0x00, 0xd3, 0x5c, 0xbf, + 0xdb, 0xb6, 0x28, 0x2a, 0x8e, 0x47, 0x23, 0x7a, 0x02, 0x43, 0x32, 0xe8, 0x9f, 0x42, 0xb1, 0x5e, + 0xdf, 0x09, 0xec, 0x88, 0x67, 0x97, 0xa6, 0xc8, 0xae, 0x14, 0x67, 0x7c, 0x09, 0xe5, 0x00, 0x61, + 0x79, 0x0f, 0x59, 0x86, 0x8c, 0x2f, 0x2e, 0xd3, 0xa8, 0xa3, 0x8f, 0x60, 0x5a, 0x3c, 0x31, 0xc8, + 0x0c, 0xba, 0x12, 0xb5, 0x59, 0x3e, 0x3f, 0x84, 0x60, 0x9a, 0x6f, 0x18, 0x92, 0xc9, 0xcd, 0x70, + 0x1f, 0x95, 0xc4, 0x64, 0x98, 0x35, 0x42, 0x3b, 0xfa, 0xdf, 0x19, 0x28, 0x84, 0x12, 0x30, 0xa1, + 0xfe, 0xcd, 0xcc, 0x06, 0x57, 0xa0, 0x4c, 0xf8, 0xe5, 0xda, 0x94, 0x08, 0xc0, 0x11, 0x73, 0xce, + 0x28, 0x91, 0xf0, 0x95, 0x8b, 0xfe, 0x0b, 0xb3, 0xf6, 0xc0, 0x6a, 0xf6, 0x9d, 0x67, 0x54, 0x0e, + 0x7b, 0x33, 0xf6, 0xc0, 0x32, 0x9c, 0x67, 0x34, 0x68, 0x9e, 0xa7, 0x4f, 0xdc, 0x3c, 0xcf, 0xbc, + 0xa9, 0xe6, 0x79, 0x76, 0xa2, 0xe6, 0x59, 0xdf, 0x84, 0x42, 0xa3, 0x5e, 0x73, 0xe3, 0xef, 0x36, + 0x2e, 0x09, 0x8f, 0x2f, 0x41, 0x7e, 0x2f, 0x94, 0x2e, 0x62, 0xa1, 0xff, 0x94, 0x83, 0xe5, 0x7d, + 0xf3, 0x29, 0x7e, 0xfb, 0x8d, 0x5b, 0x2a, 0xe0, 0xdc, 0x81, 0x05, 0x5e, 0x18, 0xb5, 0x90, 0x3d, + 0x72, 0x98, 0x50, 0x41, 0x5c, 0xe8, 0xbc, 0x46, 0x92, 0x11, 0x3d, 0x00, 0xe4, 0x4a, 0xaf, 0x1d, + 0xd0, 0xb0, 0xb8, 0x7c, 0x2a, 0x71, 0x0a, 0x4e, 0xb4, 0x07, 0x8b, 0x7c, 0xb7, 0x1e, 0x06, 0x31, + 0xca, 0x53, 0x67, 0xbc, 0x40, 0x15, 0x2b, 0xba, 0x0f, 0xf3, 0xd1, 0x2c, 0xa2, 0x95, 0x19, 0x0e, + 0x21, 0x69, 0xa2, 0x5f, 0x8e, 0xa4, 0x11, 0x45, 0xdb, 0x50, 0x0a, 0xe7, 0x11, 0xad, 0xcc, 0xa6, + 0x16, 0x55, 0x0c, 0x25, 0x12, 0xad, 0xfd, 0x55, 0x84, 0x42, 0xdd, 0x64, 0xe6, 0xbe, 0x78, 0xd1, + 0x44, 0x3d, 0x40, 0xbc, 0x65, 0xb3, 0x7a, 0x8e, 0xed, 0x8f, 0x58, 0xe8, 0xd6, 0x10, 0xb9, 0x49, + 0x52, 0x99, 0x51, 0xd5, 0xab, 0x43, 0x38, 0x62, 0xe4, 0xfa, 0x14, 0xb2, 0xb8, 0xc6, 0x03, 0x62, + 0xe1, 0x03, 0xd2, 0x7a, 0xec, 0xd5, 0xf1, 0x08, 0x8d, 0x31, 0x52, 0x4f, 0x63, 0x6c, 0x72, 0x93, + 0x0b, 0xd1, 0xde, 0x7b, 0xfd, 0x92, 0x3e, 0x85, 0x9e, 0xc0, 0x92, 0xdb, 0xc3, 0xf8, 0xad, 0x94, + 0xa7, 0xb0, 0x36, 0x5c, 0x61, 0x82, 0xf8, 0x35, 0x55, 0x9a, 0x50, 0x0c, 0x3f, 0xa8, 0x22, 0xd5, + 0x2b, 0x8f, 0xe2, 0xcd, 0xb7, 0x7a, 0x6d, 0x2c, 0x9d, 0xaf, 0x62, 0x1b, 0xf2, 0xfc, 0x62, 0x41, + 0x17, 0x55, 0xf7, 0x51, 0xe8, 0xf1, 0xb4, 0x3a, 0xaa, 0xd1, 0xd3, 0xa7, 0xd0, 0x97, 0x30, 0x1f, + 0x7b, 0xb6, 0x42, 0xd7, 0x15, 0x22, 0xd5, 0x0f, 0x90, 0xd5, 0x1b, 0x69, 0x48, 0xc3, 0x7e, 0x09, + 0x3f, 0xed, 0x28, 0xfd, 0xa2, 0x78, 0x9e, 0x52, 0xfa, 0x45, 0xf5, 0x46, 0xa4, 0x4f, 0xa1, 0x0e, + 0x94, 0xa3, 0x1d, 0x2b, 0x5a, 0x53, 0x30, 0x2b, 0x87, 0xf8, 0xea, 0xf5, 0x14, 0x94, 0xbe, 0x22, + 0x0b, 0xce, 0xc4, 0x1f, 0x26, 0xd0, 0x8d, 0x91, 0x02, 0xa2, 0xf5, 0x72, 0x33, 0x15, 0xad, 0xaf, + 0xee, 0x05, 0xcf, 0xe2, 0xc4, 0x60, 0x8c, 0xd6, 0xd5, 0x62, 0x86, 0x4d, 0xec, 0xd5, 0x8d, 0xd4, + 0xf4, 0xbe, 0x6a, 0x0c, 0x0b, 0x89, 0x41, 0x17, 0xdd, 0x1c, 0x25, 0x27, 0x36, 0x0c, 0x54, 0xc7, + 0x8f, 0xe2, 0xfa, 0x14, 0xfa, 0x5a, 0xe3, 0x6f, 0x71, 0xaa, 0xe1, 0x11, 0xdd, 0x56, 0x6b, 0x1b, + 0x31, 0xf5, 0x56, 0x6b, 0xaf, 0xc3, 0xe2, 0x9f, 0xf5, 0x25, 0x7f, 0x74, 0x51, 0x0c, 0x60, 0x71, + 0x7c, 0xf2, 0xe4, 0x0d, 0x9f, 0x2c, 0xab, 0xb7, 0x5f, 0x83, 0xc3, 0x37, 0xc0, 0x89, 0xbf, 0x30, + 0x79, 0x70, 0xb5, 0x31, 0x36, 0x39, 0x27, 0xc3, 0xaa, 0x47, 0x30, 0x1f, 0xeb, 0x11, 0x94, 0xf5, + 0xaf, 0xee, 0x23, 0xc6, 0x80, 0x4b, 0xed, 0xb7, 0x2c, 0xcc, 0xba, 0x97, 0x0d, 0x47, 0xc1, 0x7f, + 0xff, 0xa6, 0x39, 0x05, 0xe8, 0x7f, 0x04, 0xf3, 0xb1, 0x89, 0x58, 0xe9, 0x4e, 0xf5, 0xd4, 0x3c, + 0x0e, 0xab, 0x1f, 0x42, 0x29, 0x32, 0xfc, 0xa2, 0x6b, 0xc3, 0xc0, 0x3f, 0x8e, 0xa0, 0xa3, 0x05, + 0x6f, 0x6d, 0x7e, 0x7e, 0xbb, 0x43, 0xd8, 0xf1, 0xe0, 0xd0, 0xfd, 0xb3, 0x21, 0x48, 0xff, 0x4f, + 0x1c, 0xf9, 0xb5, 0xe1, 0x39, 0x68, 0x83, 0x73, 0x6f, 0xb8, 0x6a, 0x7a, 0x87, 0x87, 0xd3, 0x7c, + 0xb5, 0xf9, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xda, 0x66, 0x96, 0x6f, 0x22, 0x1d, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/internal/proto/milvus.proto b/internal/proto/milvus.proto index 4af802a650..e97afda06c 100644 --- a/internal/proto/milvus.proto +++ b/internal/proto/milvus.proto @@ -351,12 +351,8 @@ message PersistentSegmentInfo { int64 segmentID = 1; int64 collectionID = 2; int64 partitionID = 3; - uint64 open_time = 4; - uint64 sealed_time = 5; - uint64 flushed_time = 6; - int64 num_rows = 7; - int64 mem_size = 8; - common.SegmentState state = 9; + int64 num_rows = 4; + common.SegmentState state = 5; } message GetPersistentSegmentInfoRequest { diff --git a/internal/proto/milvuspb/milvus.pb.go b/internal/proto/milvuspb/milvus.pb.go index 6de349e9a6..17897a495f 100644 --- a/internal/proto/milvuspb/milvus.pb.go +++ b/internal/proto/milvuspb/milvus.pb.go @@ -2744,12 +2744,8 @@ type PersistentSegmentInfo struct { SegmentID int64 `protobuf:"varint,1,opt,name=segmentID,proto3" json:"segmentID,omitempty"` CollectionID int64 `protobuf:"varint,2,opt,name=collectionID,proto3" json:"collectionID,omitempty"` PartitionID int64 `protobuf:"varint,3,opt,name=partitionID,proto3" json:"partitionID,omitempty"` - OpenTime uint64 `protobuf:"varint,4,opt,name=open_time,json=openTime,proto3" json:"open_time,omitempty"` - SealedTime uint64 `protobuf:"varint,5,opt,name=sealed_time,json=sealedTime,proto3" json:"sealed_time,omitempty"` - FlushedTime uint64 `protobuf:"varint,6,opt,name=flushed_time,json=flushedTime,proto3" json:"flushed_time,omitempty"` - NumRows int64 `protobuf:"varint,7,opt,name=num_rows,json=numRows,proto3" json:"num_rows,omitempty"` - MemSize int64 `protobuf:"varint,8,opt,name=mem_size,json=memSize,proto3" json:"mem_size,omitempty"` - State commonpb.SegmentState `protobuf:"varint,9,opt,name=state,proto3,enum=milvus.proto.common.SegmentState" json:"state,omitempty"` + NumRows int64 `protobuf:"varint,4,opt,name=num_rows,json=numRows,proto3" json:"num_rows,omitempty"` + State commonpb.SegmentState `protobuf:"varint,5,opt,name=state,proto3,enum=milvus.proto.common.SegmentState" json:"state,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -2801,27 +2797,6 @@ func (m *PersistentSegmentInfo) GetPartitionID() int64 { return 0 } -func (m *PersistentSegmentInfo) GetOpenTime() uint64 { - if m != nil { - return m.OpenTime - } - return 0 -} - -func (m *PersistentSegmentInfo) GetSealedTime() uint64 { - if m != nil { - return m.SealedTime - } - return 0 -} - -func (m *PersistentSegmentInfo) GetFlushedTime() uint64 { - if m != nil { - return m.FlushedTime - } - return 0 -} - func (m *PersistentSegmentInfo) GetNumRows() int64 { if m != nil { return m.NumRows @@ -2829,13 +2804,6 @@ func (m *PersistentSegmentInfo) GetNumRows() int64 { return 0 } -func (m *PersistentSegmentInfo) GetMemSize() int64 { - if m != nil { - return m.MemSize - } - return 0 -} - func (m *PersistentSegmentInfo) GetState() commonpb.SegmentState { if m != nil { return m.State @@ -3272,151 +3240,147 @@ func init() { func init() { proto.RegisterFile("milvus.proto", fileDescriptor_02345ba45cc0e303) } var fileDescriptor_02345ba45cc0e303 = []byte{ - // 2292 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0xcd, 0x6f, 0x1c, 0x49, - 0x15, 0x4f, 0xcd, 0x97, 0x67, 0xde, 0xf4, 0xd8, 0xb3, 0xe5, 0x8f, 0x4c, 0x26, 0x5f, 0xe3, 0xde, - 0x0d, 0xeb, 0x24, 0xbb, 0xf1, 0x62, 0x27, 0x2c, 0x08, 0xf1, 0xe5, 0x98, 0x38, 0x56, 0x76, 0x23, - 0x6f, 0x4f, 0x58, 0xed, 0xb2, 0x8a, 0x46, 0x3d, 0xd3, 0x15, 0x4f, 0x2b, 0x3d, 0xdd, 0x43, 0x57, - 0x8f, 0x9d, 0xc9, 0x09, 0xb1, 0x08, 0x09, 0x01, 0xd9, 0x03, 0x08, 0x09, 0x0e, 0x1c, 0x90, 0xf6, - 0xc0, 0x09, 0xd0, 0x22, 0x21, 0x71, 0xde, 0x03, 0x12, 0x17, 0xc4, 0xff, 0xc0, 0x05, 0xc1, 0x9f, - 0x80, 0x40, 0x55, 0xd5, 0xdd, 0xd3, 0xdd, 0xae, 0x1e, 0x8f, 0x33, 0x9b, 0xb5, 0x7d, 0xeb, 0x7e, - 0xfd, 0xaa, 0xea, 0x57, 0xef, 0xab, 0xde, 0xab, 0xd7, 0xa0, 0xf4, 0x4c, 0x6b, 0x6f, 0x40, 0x6f, - 0xf4, 0x5d, 0xc7, 0x73, 0xf0, 0x7c, 0xf4, 0xed, 0x86, 0x78, 0xa9, 0x2b, 0x1d, 0xa7, 0xd7, 0x73, - 0x6c, 0x41, 0xac, 0x2b, 0xb4, 0xd3, 0x25, 0x3d, 0x5d, 0xbc, 0xa9, 0x9f, 0x22, 0x38, 0x7b, 0xdb, - 0x25, 0xba, 0x47, 0x6e, 0x3b, 0x96, 0x45, 0x3a, 0x9e, 0xe9, 0xd8, 0x1a, 0xf9, 0xde, 0x80, 0x50, - 0x0f, 0xbf, 0x01, 0xb9, 0xb6, 0x4e, 0x49, 0x0d, 0x35, 0xd0, 0x4a, 0x79, 0xed, 0xc2, 0x8d, 0xd8, - 0xdc, 0xfe, 0x9c, 0x6f, 0xd3, 0xdd, 0x0d, 0x9d, 0x12, 0x8d, 0x73, 0xe2, 0xb3, 0x30, 0x63, 0xb4, - 0x5b, 0xb6, 0xde, 0x23, 0xb5, 0x4c, 0x03, 0xad, 0x94, 0xb4, 0x82, 0xd1, 0xbe, 0xaf, 0xf7, 0x08, - 0x7e, 0x15, 0xe6, 0x3a, 0xe1, 0xfc, 0x82, 0x21, 0xcb, 0x19, 0x66, 0x47, 0x64, 0xce, 0xb8, 0x04, - 0x05, 0x81, 0xaf, 0x96, 0x6b, 0xa0, 0x15, 0x45, 0xf3, 0xdf, 0xf0, 0x45, 0x00, 0xda, 0xd5, 0x5d, - 0x83, 0xb6, 0xec, 0x41, 0xaf, 0x96, 0x6f, 0xa0, 0x95, 0xbc, 0x56, 0x12, 0x94, 0xfb, 0x83, 0x9e, - 0xfa, 0x13, 0x04, 0x8b, 0x9b, 0xae, 0xd3, 0x3f, 0x11, 0x9b, 0x50, 0x7f, 0x87, 0x60, 0xe1, 0xae, - 0x4e, 0x4f, 0x86, 0x44, 0x2f, 0x02, 0x78, 0x66, 0x8f, 0xb4, 0xa8, 0xa7, 0xf7, 0xfa, 0x5c, 0xaa, - 0x39, 0xad, 0xc4, 0x28, 0x4d, 0x46, 0x50, 0xdf, 0x07, 0x65, 0xc3, 0x71, 0x2c, 0x8d, 0xd0, 0xbe, - 0x63, 0x53, 0x82, 0xd7, 0xa1, 0x40, 0x3d, 0xdd, 0x1b, 0x50, 0x1f, 0xe4, 0x79, 0x29, 0xc8, 0x26, - 0x67, 0xd1, 0x7c, 0x56, 0xbc, 0x00, 0xf9, 0x3d, 0xdd, 0x1a, 0x08, 0x8c, 0x45, 0x4d, 0xbc, 0xa8, - 0x1f, 0xc0, 0x6c, 0xd3, 0x73, 0x4d, 0x7b, 0xf7, 0x33, 0x9c, 0xbc, 0x14, 0x4c, 0xfe, 0x0f, 0x04, - 0xe7, 0x36, 0x09, 0xed, 0xb8, 0x66, 0xfb, 0x84, 0x98, 0xae, 0x0a, 0xca, 0x88, 0xb2, 0xbd, 0xc9, - 0x45, 0x9d, 0xd5, 0x62, 0xb4, 0x84, 0x32, 0xf2, 0x49, 0x65, 0xfc, 0x26, 0x03, 0x75, 0xd9, 0xa6, - 0xa6, 0x11, 0xdf, 0xd7, 0x42, 0x8f, 0xca, 0xf0, 0x41, 0x57, 0xe2, 0x83, 0xfc, 0x68, 0x30, 0x5a, - 0xad, 0xc9, 0x09, 0xa1, 0xe3, 0x25, 0x77, 0x95, 0x95, 0xec, 0x6a, 0x0d, 0x16, 0xf7, 0x4c, 0xd7, - 0x1b, 0xe8, 0x56, 0xab, 0xd3, 0xd5, 0x6d, 0x9b, 0x58, 0x5c, 0x4e, 0xb4, 0x96, 0x6b, 0x64, 0x57, - 0x4a, 0xda, 0xbc, 0xff, 0xf1, 0xb6, 0xf8, 0xc6, 0x84, 0x45, 0xf1, 0x4d, 0x58, 0xea, 0x77, 0x87, - 0xd4, 0xec, 0x1c, 0x18, 0x94, 0xe7, 0x83, 0x16, 0x82, 0xaf, 0xd1, 0x51, 0xdc, 0xcf, 0xdf, 0x72, - 0x74, 0xe3, 0x64, 0xf8, 0xf9, 0x33, 0x04, 0x35, 0x8d, 0x58, 0x44, 0xa7, 0x27, 0xc3, 0x04, 0xd5, - 0x5f, 0x20, 0xb8, 0xb4, 0x45, 0xbc, 0x88, 0x32, 0x3d, 0xdd, 0x33, 0xa9, 0x67, 0x76, 0xe8, 0x71, - 0xc2, 0xfa, 0x08, 0xc1, 0xe5, 0x54, 0x58, 0xd3, 0xd8, 0xf6, 0x9b, 0x90, 0x67, 0x4f, 0xb4, 0x96, - 0x69, 0x64, 0x57, 0xca, 0x6b, 0xcb, 0xd2, 0x31, 0xf7, 0xc8, 0xf0, 0x5d, 0x16, 0x32, 0x76, 0x74, - 0xd3, 0xd5, 0x04, 0xbf, 0xfa, 0x03, 0x04, 0x4b, 0xcd, 0xae, 0xb3, 0x3f, 0x82, 0xf4, 0x22, 0x04, - 0x14, 0xf7, 0xf6, 0x6c, 0xd2, 0xdb, 0x87, 0x70, 0xf6, 0x00, 0x86, 0x69, 0xa4, 0x71, 0x15, 0xaa, - 0x09, 0x7d, 0x08, 0xc1, 0x94, 0xb4, 0xb9, 0xb8, 0x42, 0xa8, 0xfa, 0x09, 0x82, 0x25, 0x71, 0xec, - 0xef, 0xe8, 0xae, 0x67, 0x1e, 0x77, 0xe8, 0xbc, 0x02, 0xb3, 0xfd, 0x00, 0x87, 0xe0, 0xcb, 0x71, - 0xbe, 0x4a, 0x48, 0xe5, 0x76, 0xf4, 0x47, 0x04, 0x0b, 0xec, 0x94, 0x3f, 0x4d, 0x98, 0xff, 0x80, - 0x60, 0xfe, 0xae, 0x4e, 0x4f, 0x13, 0xe4, 0x3f, 0xf9, 0x41, 0x36, 0xc4, 0x7c, 0x9c, 0xc1, 0x83, - 0x31, 0xc6, 0x41, 0x07, 0xc7, 0xca, 0x6c, 0x0c, 0x35, 0x55, 0xff, 0x3c, 0x8a, 0xc6, 0xa7, 0x0c, - 0xf9, 0x5f, 0x10, 0x5c, 0xdc, 0x22, 0x5e, 0x88, 0xfa, 0x44, 0x44, 0xed, 0x49, 0xad, 0xe5, 0x99, - 0x38, 0x73, 0xa4, 0xe0, 0x8f, 0x25, 0xb6, 0xff, 0x1e, 0xc1, 0x22, 0x8b, 0xab, 0x27, 0xc3, 0x08, - 0x26, 0xc8, 0x0a, 0xd5, 0x5f, 0xfb, 0xa7, 0x51, 0x14, 0xf1, 0x34, 0xa2, 0x93, 0x18, 0x5e, 0x46, - 0x66, 0x78, 0x0c, 0x5c, 0x48, 0xd9, 0xde, 0xa4, 0xb5, 0x6c, 0x23, 0xcb, 0xc0, 0x45, 0x69, 0xea, - 0x4f, 0x11, 0x2c, 0x05, 0x39, 0x69, 0x93, 0xec, 0xf6, 0x88, 0xed, 0x3d, 0xbf, 0x3c, 0x93, 0xd2, - 0xc8, 0x48, 0xb2, 0xc9, 0x0b, 0x50, 0xa2, 0x62, 0x9d, 0x30, 0xdd, 0x1c, 0x11, 0xd4, 0x8f, 0x11, - 0x9c, 0x3d, 0x00, 0x67, 0x1a, 0x61, 0xd5, 0x60, 0xc6, 0xb4, 0x0d, 0xf2, 0x24, 0x44, 0x13, 0xbc, - 0xb2, 0x2f, 0xed, 0x81, 0x69, 0x19, 0x21, 0x8c, 0xe0, 0x15, 0x2f, 0x83, 0x42, 0x6c, 0xbd, 0x6d, - 0x91, 0x16, 0xe7, 0xe5, 0x4a, 0x2d, 0x6a, 0x65, 0x41, 0xdb, 0x66, 0x24, 0xf5, 0x67, 0x08, 0xe6, - 0x99, 0x4e, 0x7d, 0x8c, 0xf4, 0xc5, 0xca, 0xac, 0x01, 0xe5, 0x88, 0xd2, 0x7c, 0xb8, 0x51, 0x92, - 0xfa, 0x18, 0x16, 0xe2, 0x70, 0xa6, 0x91, 0xd9, 0x25, 0x80, 0x50, 0x23, 0xc2, 0xb6, 0xb2, 0x5a, - 0x84, 0xa2, 0xfe, 0x07, 0x01, 0x16, 0xe9, 0x05, 0x17, 0xc6, 0x31, 0x97, 0xbf, 0x8f, 0x4c, 0x62, - 0x19, 0xd1, 0x08, 0x56, 0xe2, 0x14, 0xfe, 0x79, 0x13, 0x14, 0xf2, 0xc4, 0x73, 0xf5, 0x56, 0x5f, - 0x77, 0xf5, 0x9e, 0x28, 0x3e, 0x26, 0x0a, 0x36, 0x65, 0x3e, 0x6c, 0x87, 0x8f, 0x52, 0xff, 0xca, - 0x12, 0x13, 0xdf, 0x28, 0x4f, 0xfa, 0x8e, 0x2f, 0x02, 0x70, 0xa3, 0x15, 0x9f, 0xf3, 0xe2, 0x33, - 0xa7, 0xf0, 0x70, 0xfe, 0x31, 0x82, 0x2a, 0xdf, 0x82, 0xd8, 0x4f, 0x9f, 0x4d, 0x9b, 0x18, 0x83, - 0x12, 0x63, 0xc6, 0xb8, 0xd0, 0x57, 0xa0, 0xe0, 0x0b, 0x36, 0x3b, 0xa9, 0x60, 0xfd, 0x01, 0x87, - 0x6c, 0x43, 0xfd, 0x2d, 0x82, 0xc5, 0x84, 0xc8, 0xa7, 0xb1, 0xe8, 0x07, 0x80, 0xc5, 0x0e, 0x8d, - 0xd1, 0xb6, 0x83, 0xa3, 0x27, 0x51, 0x31, 0xfb, 0x2f, 0x49, 0x21, 0x69, 0x2f, 0x99, 0x09, 0x0a, - 0x55, 0xff, 0x8e, 0xe0, 0xc2, 0x16, 0xf1, 0x38, 0xeb, 0x06, 0x8b, 0x1d, 0x3b, 0xae, 0xb3, 0xeb, - 0x12, 0x4a, 0x4f, 0xaf, 0x7d, 0xfc, 0x52, 0xe4, 0x2a, 0xb2, 0x2d, 0x4d, 0x23, 0xff, 0x65, 0x50, - 0xf8, 0x1a, 0xc4, 0x68, 0xb9, 0xce, 0x3e, 0xf5, 0xed, 0xa8, 0xec, 0xd3, 0x34, 0x67, 0x9f, 0x1b, - 0x84, 0xe7, 0x78, 0xba, 0x25, 0x18, 0xfc, 0x83, 0x81, 0x53, 0xd8, 0x67, 0xee, 0x83, 0x01, 0x30, - 0x36, 0x39, 0x39, 0xbd, 0x32, 0xfe, 0x10, 0xc1, 0x62, 0x62, 0x2b, 0xd3, 0xc8, 0xf6, 0x96, 0xc8, - 0xa4, 0xc4, 0x66, 0x66, 0xd7, 0x2e, 0x4b, 0xc7, 0x44, 0x16, 0x13, 0xdc, 0xea, 0xa7, 0x08, 0xaa, - 0xac, 0xda, 0x3a, 0xe5, 0x01, 0xed, 0xbf, 0x08, 0x2a, 0xdb, 0x36, 0x25, 0xae, 0x77, 0xf2, 0x93, - 0x69, 0x7c, 0x13, 0x8a, 0xae, 0xb3, 0xdf, 0x32, 0x74, 0x4f, 0xf7, 0x8f, 0xa2, 0x73, 0x52, 0x78, - 0x1b, 0x96, 0xd3, 0xd6, 0x66, 0x5c, 0x67, 0x7f, 0x53, 0xf7, 0x74, 0x7c, 0x1e, 0x4a, 0x5d, 0x9d, - 0x76, 0x5b, 0x8f, 0xc9, 0x90, 0xd6, 0x0a, 0x8d, 0xec, 0x4a, 0x45, 0x2b, 0x32, 0xc2, 0x3d, 0x32, - 0xa4, 0xcc, 0x98, 0x66, 0x83, 0xfd, 0x4f, 0x63, 0x45, 0x97, 0xa1, 0xec, 0x3a, 0xfb, 0xdb, 0x9b, - 0xad, 0x36, 0xd9, 0x35, 0x6d, 0xdf, 0x41, 0x81, 0x93, 0x36, 0x18, 0x85, 0xa1, 0x10, 0x0c, 0xc4, - 0x36, 0x7c, 0xf7, 0x2c, 0x72, 0xc2, 0xb7, 0x6d, 0x43, 0xdd, 0x83, 0xea, 0x8e, 0xa5, 0x77, 0x48, - 0xd7, 0xb1, 0x0c, 0xe2, 0xf2, 0x68, 0x8f, 0xab, 0x90, 0xf5, 0xf4, 0x5d, 0xff, 0x38, 0x61, 0x8f, - 0xf8, 0xcb, 0x90, 0xf3, 0x86, 0xfd, 0xc0, 0x50, 0x5f, 0x91, 0xc6, 0xdd, 0xc8, 0x34, 0x0f, 0x86, - 0x7d, 0xa2, 0xf1, 0x11, 0x78, 0x09, 0x0a, 0xfc, 0x5e, 0x58, 0x1c, 0x34, 0x8a, 0xe6, 0xbf, 0xa9, - 0x0f, 0x63, 0xeb, 0x6e, 0xb9, 0xce, 0xa0, 0x8f, 0xb7, 0x41, 0xe9, 0x8f, 0x68, 0x4c, 0x08, 0xe9, - 0x51, 0x3e, 0x09, 0x5a, 0x8b, 0x0d, 0x55, 0xff, 0x9d, 0x81, 0x4a, 0x93, 0xe8, 0x6e, 0xa7, 0x7b, - 0x1a, 0x0a, 0x4d, 0x26, 0x71, 0x83, 0x5a, 0xbe, 0x8f, 0xb0, 0x47, 0x7c, 0x1d, 0x5e, 0x8a, 0x6c, - 0xa8, 0xb5, 0xcb, 0x04, 0x54, 0x2b, 0xf0, 0xd6, 0x4b, 0xb5, 0x9f, 0x14, 0xdc, 0x9b, 0x50, 0x34, - 0xa8, 0xd5, 0xe2, 0x2a, 0x9a, 0xe1, 0x2a, 0x92, 0xef, 0x6f, 0x93, 0x5a, 0x5c, 0x35, 0x33, 0x86, - 0x78, 0xc0, 0x77, 0xa0, 0x42, 0xb9, 0x94, 0x82, 0x34, 0xab, 0x38, 0x69, 0x36, 0xa0, 0x88, 0x71, - 0x7e, 0x9e, 0xf5, 0x3f, 0x04, 0x73, 0x1a, 0xf1, 0x5c, 0x93, 0xec, 0x91, 0x53, 0x21, 0xf0, 0x6b, - 0x90, 0x35, 0x0d, 0xca, 0x05, 0x5e, 0x5e, 0xab, 0x49, 0x6f, 0xde, 0xb7, 0x37, 0xa9, 0xc6, 0x98, - 0xf0, 0xcb, 0x50, 0x71, 0x06, 0x5e, 0x7f, 0xe0, 0xb5, 0x78, 0x6c, 0x13, 0x9e, 0x5c, 0xd2, 0x14, - 0x41, 0xbc, 0xc3, 0x69, 0xea, 0x27, 0x31, 0x09, 0xd0, 0x81, 0xe5, 0xd1, 0xe7, 0x73, 0x67, 0x1f, - 0x59, 0x66, 0x12, 0x64, 0xdf, 0x80, 0xb2, 0x80, 0x24, 0x02, 0x93, 0x48, 0xe5, 0x2e, 0x49, 0xc7, - 0x70, 0x98, 0x2c, 0x28, 0x69, 0x22, 0x66, 0x53, 0xf6, 0xac, 0xde, 0x83, 0xdc, 0x5d, 0xd3, 0xe3, - 0xf6, 0xc7, 0x0a, 0x06, 0xc4, 0x0b, 0x06, 0xf6, 0x88, 0xcf, 0x45, 0x02, 0x5e, 0x86, 0x7b, 0x6e, - 0x18, 0xd5, 0x78, 0x2b, 0xd0, 0x71, 0x7d, 0x97, 0xce, 0x68, 0xfe, 0x9b, 0xfa, 0xde, 0xc8, 0xe5, - 0xa6, 0xd8, 0x3f, 0x86, 0x5c, 0xd7, 0xf4, 0x6f, 0x17, 0x14, 0x8d, 0x3f, 0xab, 0x3f, 0x44, 0xa0, - 0xdc, 0xb1, 0x06, 0xf4, 0x45, 0x38, 0xb3, 0xec, 0x72, 0x36, 0x2b, 0xbf, 0x9c, 0xfd, 0x5b, 0x06, - 0x16, 0x77, 0x88, 0x4b, 0x4d, 0xea, 0x11, 0xdb, 0xf3, 0x2b, 0xb6, 0x6d, 0xfb, 0x91, 0x13, 0x2f, - 0x8d, 0x51, 0xa2, 0x34, 0xfe, 0x6c, 0x0a, 0x45, 0x16, 0xc6, 0x9d, 0x3e, 0xb1, 0x5b, 0x9e, 0xe9, - 0x1f, 0x52, 0x39, 0xad, 0xc8, 0x08, 0x0f, 0xcc, 0x1e, 0x61, 0x87, 0x00, 0x25, 0xba, 0x45, 0x0c, - 0xf1, 0x59, 0x34, 0xb0, 0x40, 0x90, 0x38, 0xc3, 0x32, 0x28, 0x8f, 0x98, 0x04, 0x03, 0x8e, 0x02, - 0xe7, 0x28, 0xfb, 0x34, 0xce, 0x72, 0x0e, 0x8a, 0xf6, 0xa0, 0x27, 0xb2, 0xb8, 0x19, 0x51, 0x2e, - 0xd8, 0x83, 0x1e, 0x4f, 0xf1, 0xce, 0x41, 0xb1, 0x47, 0x7a, 0x2d, 0x6a, 0x3e, 0x25, 0xb5, 0xa2, - 0xf8, 0xd4, 0x23, 0xbd, 0xa6, 0xf9, 0x94, 0x04, 0xd7, 0x41, 0xa4, 0x56, 0xe2, 0x81, 0x47, 0x1e, - 0x3a, 0x7c, 0x59, 0xc5, 0xd2, 0x98, 0x9f, 0x8b, 0xe6, 0x83, 0x54, 0xa0, 0xcf, 0xaf, 0xe7, 0x25, - 0xf0, 0x15, 0x9b, 0x50, 0xf3, 0x17, 0x20, 0x11, 0x2b, 0x52, 0x5a, 0x22, 0xbf, 0x42, 0xd0, 0x48, - 0x47, 0x35, 0xcd, 0x39, 0xfd, 0x4d, 0xc8, 0x9b, 0xf6, 0x23, 0x27, 0x28, 0x5e, 0xae, 0xc9, 0x8f, - 0x35, 0xe9, 0xba, 0x62, 0xa0, 0xfa, 0x4f, 0x04, 0xd5, 0x77, 0x06, 0xc4, 0x1d, 0x7e, 0xde, 0xa6, - 0x17, 0x55, 0x7f, 0x2e, 0xae, 0xfe, 0xa8, 0xd1, 0xe4, 0xe3, 0x46, 0x13, 0xcf, 0xff, 0x0a, 0x63, - 0x8a, 0xd3, 0x99, 0x58, 0x71, 0xaa, 0x3e, 0x43, 0x50, 0xdf, 0x22, 0x5e, 0x72, 0xab, 0xc7, 0x67, - 0x14, 0x1f, 0x21, 0x38, 0x2f, 0x05, 0x34, 0x8d, 0x3d, 0x7c, 0x35, 0x6e, 0x0f, 0xf2, 0x34, 0xe7, - 0xc0, 0x92, 0xbe, 0x29, 0x2c, 0xc2, 0xbc, 0x46, 0x76, 0x99, 0xa5, 0xb8, 0x6f, 0x99, 0xf6, 0x63, - 0x5f, 0x34, 0x2c, 0xa7, 0x5c, 0x88, 0xd3, 0x7d, 0x84, 0x5f, 0x82, 0x19, 0xdd, 0x30, 0x58, 0x39, - 0x38, 0x56, 0x6c, 0xdf, 0x12, 0x3c, 0x5a, 0xc0, 0x1c, 0xd9, 0x59, 0x66, 0xe2, 0x9d, 0x5d, 0xfb, - 0x3a, 0xcc, 0x25, 0x92, 0x41, 0x5c, 0x84, 0xdc, 0x7d, 0xc7, 0x26, 0xd5, 0x33, 0xb8, 0x0a, 0xca, - 0x86, 0x69, 0xeb, 0xee, 0xf0, 0x5d, 0xd2, 0xf1, 0x1c, 0xb7, 0x6a, 0xe0, 0x39, 0x28, 0xdf, 0xb1, - 0x1c, 0xdd, 0xf3, 0x09, 0x64, 0xed, 0x5f, 0x8b, 0x50, 0x79, 0x9b, 0x2f, 0xd3, 0x24, 0xee, 0x9e, - 0xd9, 0x21, 0xb8, 0x05, 0xd5, 0xe4, 0xcf, 0x30, 0xf8, 0x35, 0xa9, 0xc0, 0x52, 0xfe, 0x99, 0xa9, - 0x8f, 0x03, 0xae, 0x9e, 0xc1, 0x1f, 0xc0, 0x6c, 0xfc, 0x37, 0x15, 0x2c, 0xf7, 0x4f, 0xe9, 0xbf, - 0x2c, 0x87, 0x4d, 0xde, 0x82, 0x4a, 0xec, 0xaf, 0x13, 0x7c, 0x55, 0x3a, 0xb7, 0xec, 0xcf, 0x94, - 0xfa, 0xb2, 0x94, 0x35, 0xfa, 0x67, 0x88, 0x40, 0x1f, 0x6f, 0xbe, 0xa7, 0xa0, 0x97, 0x76, 0xe8, - 0x0f, 0x43, 0xaf, 0xc3, 0x4b, 0x07, 0x7a, 0xe9, 0xf8, 0x75, 0xe9, 0xfc, 0x69, 0x3d, 0xf7, 0xc3, - 0x96, 0xd8, 0x07, 0x7c, 0xf0, 0xef, 0x0a, 0x7c, 0x43, 0xae, 0x81, 0xb4, 0x7f, 0x4b, 0xea, 0xab, - 0x13, 0xf3, 0x87, 0x82, 0xfb, 0x11, 0x82, 0xb3, 0x29, 0x0d, 0x70, 0xbc, 0x2e, 0x9d, 0x6e, 0x7c, - 0x17, 0xbf, 0x7e, 0xf3, 0x68, 0x83, 0x42, 0x20, 0x36, 0xcc, 0x25, 0x5a, 0xce, 0xf8, 0xba, 0x74, - 0x2a, 0x79, 0x73, 0xbc, 0xfe, 0xda, 0x64, 0xcc, 0xe1, 0x7a, 0x0f, 0x61, 0x2e, 0xd1, 0x66, 0x4e, - 0x59, 0x4f, 0xde, 0x8c, 0x3e, 0x4c, 0xa1, 0xef, 0x43, 0x25, 0xd6, 0x0f, 0x4e, 0xb1, 0x78, 0x59, - 0xcf, 0xf8, 0xb0, 0xa9, 0x1f, 0x82, 0x12, 0x6d, 0xdb, 0xe2, 0x95, 0x34, 0x5f, 0x3a, 0x30, 0xf1, - 0x51, 0x5c, 0x69, 0xd4, 0xf1, 0x19, 0xe3, 0x4a, 0x07, 0x1a, 0x59, 0x93, 0xbb, 0x52, 0x64, 0xfe, - 0xb1, 0xae, 0x74, 0xe4, 0x25, 0x3e, 0x44, 0xb0, 0x24, 0xef, 0xfa, 0xe1, 0xb5, 0x34, 0xdb, 0x4c, - 0xef, 0x6f, 0xd6, 0xd7, 0x8f, 0x34, 0x26, 0x94, 0xe2, 0x63, 0x98, 0x8d, 0xf7, 0xcd, 0x52, 0xa4, - 0x28, 0x6d, 0x07, 0xd6, 0xaf, 0x4f, 0xc4, 0x1b, 0x2e, 0xf6, 0x1d, 0x28, 0x47, 0x7a, 0x1a, 0xf8, - 0xd5, 0x31, 0x76, 0x1c, 0xbd, 0x32, 0x3b, 0x4c, 0x92, 0x5d, 0xa8, 0xc4, 0xee, 0xb1, 0xd3, 0x6c, - 0x58, 0xd2, 0x5e, 0xa8, 0x5f, 0x9b, 0x84, 0x35, 0xdc, 0x40, 0x17, 0x2a, 0xb1, 0x5b, 0xc5, 0x94, - 0x95, 0x64, 0x97, 0xa8, 0x29, 0x2b, 0x49, 0x2f, 0x29, 0xd5, 0x33, 0xf8, 0xfb, 0x91, 0x0b, 0xcc, - 0xd8, 0x25, 0x31, 0xfe, 0xe2, 0xd8, 0x79, 0x64, 0x77, 0xe4, 0xf5, 0xb5, 0xa3, 0x0c, 0x09, 0x21, - 0xbc, 0x03, 0xa5, 0xf0, 0xf2, 0x12, 0x5f, 0x49, 0x0d, 0x0b, 0x47, 0xd1, 0x54, 0x13, 0x0a, 0xe2, - 0x22, 0x0d, 0xab, 0x29, 0x1d, 0x81, 0xc8, 0x2d, 0x63, 0xfd, 0xe5, 0xb1, 0x3c, 0x21, 0x4e, 0x0d, - 0x0a, 0xa2, 0x9a, 0x4d, 0x99, 0x34, 0x76, 0xbb, 0x54, 0x1f, 0xcf, 0xc3, 0xcb, 0x61, 0xf5, 0x0c, - 0x7e, 0x0f, 0x8a, 0xc1, 0x1d, 0x01, 0x7e, 0x25, 0xc5, 0xed, 0x63, 0x97, 0x28, 0xf5, 0xc3, 0xb8, - 0x82, 0x99, 0xb7, 0x21, 0xcf, 0x0b, 0x64, 0x2c, 0x0f, 0x72, 0xd1, 0xe2, 0xf9, 0x30, 0x69, 0xfe, - 0x18, 0x41, 0x2d, 0xad, 0x02, 0xc2, 0xa9, 0xe7, 0xdb, 0xb8, 0x32, 0xae, 0x7e, 0xeb, 0x88, 0xa3, - 0x42, 0x25, 0x3c, 0x85, 0x79, 0x49, 0xde, 0x8d, 0x57, 0xd3, 0xe6, 0x4b, 0x29, 0x19, 0xea, 0x6f, - 0x4c, 0x3e, 0x20, 0x5c, 0x9b, 0x80, 0x12, 0x4d, 0xa5, 0x53, 0x0e, 0x1a, 0x49, 0x16, 0x5e, 0xbf, - 0x3a, 0x01, 0x67, 0xb0, 0xcc, 0xda, 0x00, 0x94, 0x1d, 0xd7, 0x79, 0x32, 0x0c, 0x52, 0xdd, 0xcf, - 0x67, 0xd9, 0x8d, 0x5b, 0xdf, 0x5d, 0xdf, 0x35, 0xbd, 0xee, 0xa0, 0xcd, 0xf4, 0xbf, 0x2a, 0x78, - 0x5f, 0x37, 0x1d, 0xff, 0x69, 0xd5, 0xb4, 0x3d, 0xe2, 0xda, 0xba, 0xb5, 0xca, 0xe7, 0xf2, 0xa9, - 0xfd, 0x76, 0xbb, 0xc0, 0xdf, 0xd7, 0xff, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x78, 0xd5, 0xe7, 0xcd, - 0xde, 0x2e, 0x00, 0x00, + // 2237 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0xcf, 0x6f, 0x1b, 0xc7, + 0xf5, 0xf7, 0x90, 0x22, 0x25, 0x3e, 0x92, 0x12, 0x3d, 0xfa, 0x45, 0xd3, 0xbf, 0xe8, 0x4d, 0xfc, + 0x8d, 0x6c, 0x27, 0x56, 0xbe, 0x92, 0x5d, 0xb7, 0x28, 0xfa, 0x4b, 0x56, 0x2d, 0x0b, 0x4e, 0x0c, + 0x65, 0x99, 0x06, 0x49, 0x03, 0x83, 0x58, 0x72, 0xc7, 0xe2, 0xc2, 0xcb, 0x5d, 0x76, 0x67, 0x28, + 0x99, 0x3e, 0x15, 0x4d, 0x51, 0xa0, 0x68, 0xeb, 0x1c, 0x5a, 0x14, 0x68, 0x0f, 0x3d, 0x14, 0xc8, + 0xa1, 0xa7, 0xb6, 0x48, 0x81, 0x02, 0x3d, 0xe7, 0xd0, 0x5b, 0x8b, 0xfe, 0x0f, 0xbd, 0x14, 0xed, + 0x9f, 0x50, 0xb4, 0x98, 0x99, 0xdd, 0xe5, 0xee, 0x6a, 0x96, 0xa2, 0xcc, 0xb8, 0x92, 0x6e, 0xbb, + 0x6f, 0xdf, 0xcc, 0x7c, 0xde, 0x9b, 0xf7, 0xde, 0xbc, 0x37, 0x6f, 0xa1, 0xd4, 0xb5, 0xec, 0xbd, + 0x3e, 0xbd, 0xd9, 0xf3, 0x5c, 0xe6, 0xe2, 0xf9, 0xe8, 0xdb, 0x4d, 0xf9, 0x52, 0x2b, 0xb5, 0xdd, + 0x6e, 0xd7, 0x75, 0x24, 0xb1, 0x56, 0xa2, 0xed, 0x0e, 0xe9, 0x1a, 0xf2, 0x4d, 0xfb, 0x0c, 0xc1, + 0xf2, 0x5d, 0x8f, 0x18, 0x8c, 0xdc, 0x75, 0x6d, 0x9b, 0xb4, 0x99, 0xe5, 0x3a, 0x3a, 0xf9, 0x4e, + 0x9f, 0x50, 0x86, 0xdf, 0x84, 0xa9, 0x96, 0x41, 0x49, 0x15, 0xd5, 0xd1, 0x4a, 0x71, 0xed, 0xc2, + 0xcd, 0xd8, 0xdc, 0xfe, 0x9c, 0x6f, 0xd3, 0xdd, 0x0d, 0x83, 0x12, 0x5d, 0x70, 0xe2, 0x65, 0x98, + 0x36, 0x5b, 0x4d, 0xc7, 0xe8, 0x92, 0x6a, 0xa6, 0x8e, 0x56, 0x0a, 0x7a, 0xde, 0x6c, 0x3d, 0x34, + 0xba, 0x04, 0xbf, 0x06, 0x73, 0xed, 0x70, 0x7e, 0xc9, 0x90, 0x15, 0x0c, 0xb3, 0x43, 0xb2, 0x60, + 0x5c, 0x82, 0xbc, 0xc4, 0x57, 0x9d, 0xaa, 0xa3, 0x95, 0x92, 0xee, 0xbf, 0xe1, 0x8b, 0x00, 0xb4, + 0x63, 0x78, 0x26, 0x6d, 0x3a, 0xfd, 0x6e, 0x35, 0x57, 0x47, 0x2b, 0x39, 0xbd, 0x20, 0x29, 0x0f, + 0xfb, 0x5d, 0xed, 0x47, 0x08, 0x16, 0x37, 0x3d, 0xb7, 0x77, 0x22, 0x84, 0xd0, 0x7e, 0x83, 0x60, + 0xe1, 0xbe, 0x41, 0x4f, 0x86, 0x46, 0x2f, 0x02, 0x30, 0xab, 0x4b, 0x9a, 0x94, 0x19, 0xdd, 0x9e, + 0xd0, 0xea, 0x94, 0x5e, 0xe0, 0x94, 0x06, 0x27, 0x68, 0x1f, 0x40, 0x69, 0xc3, 0x75, 0x6d, 0x9d, + 0xd0, 0x9e, 0xeb, 0x50, 0x82, 0xd7, 0x21, 0x4f, 0x99, 0xc1, 0xfa, 0xd4, 0x07, 0x79, 0x5e, 0x09, + 0xb2, 0x21, 0x58, 0x74, 0x9f, 0x15, 0x2f, 0x40, 0x6e, 0xcf, 0xb0, 0xfb, 0x12, 0xe3, 0x8c, 0x2e, + 0x5f, 0xb4, 0x0f, 0x61, 0xb6, 0xc1, 0x3c, 0xcb, 0xd9, 0xfd, 0x1c, 0x27, 0x2f, 0x04, 0x93, 0xff, + 0x0d, 0xc1, 0xb9, 0x4d, 0x42, 0xdb, 0x9e, 0xd5, 0x3a, 0x21, 0xa6, 0xab, 0x41, 0x69, 0x48, 0xd9, + 0xde, 0x14, 0xaa, 0xce, 0xea, 0x31, 0x5a, 0x62, 0x33, 0x72, 0xc9, 0xcd, 0xf8, 0x55, 0x06, 0x6a, + 0x2a, 0xa1, 0x26, 0x51, 0xdf, 0x57, 0x42, 0x8f, 0xca, 0x88, 0x41, 0x57, 0xe3, 0x83, 0xfc, 0x68, + 0x30, 0x5c, 0xad, 0x21, 0x08, 0xa1, 0xe3, 0x25, 0xa5, 0xca, 0x2a, 0xa4, 0x5a, 0x83, 0xc5, 0x3d, + 0xcb, 0x63, 0x7d, 0xc3, 0x6e, 0xb6, 0x3b, 0x86, 0xe3, 0x10, 0x5b, 0xe8, 0x89, 0x56, 0xa7, 0xea, + 0xd9, 0x95, 0x82, 0x3e, 0xef, 0x7f, 0xbc, 0x2b, 0xbf, 0x71, 0x65, 0x51, 0x7c, 0x0b, 0x96, 0x7a, + 0x9d, 0x01, 0xb5, 0xda, 0x07, 0x06, 0xe5, 0xc4, 0xa0, 0x85, 0xe0, 0x6b, 0x74, 0x94, 0xf0, 0xf3, + 0xb7, 0x5c, 0xc3, 0x3c, 0x19, 0x7e, 0xfe, 0x1c, 0x41, 0x55, 0x27, 0x36, 0x31, 0xe8, 0xc9, 0x30, + 0x41, 0xed, 0x67, 0x08, 0x2e, 0x6d, 0x11, 0x16, 0xd9, 0x4c, 0x66, 0x30, 0x8b, 0x32, 0xab, 0x4d, + 0x8f, 0x13, 0xd6, 0xc7, 0x08, 0x2e, 0xa7, 0xc2, 0x9a, 0xc4, 0xb6, 0xef, 0x40, 0x8e, 0x3f, 0xd1, + 0x6a, 0xa6, 0x9e, 0x5d, 0x29, 0xae, 0x5d, 0x51, 0x8e, 0x79, 0x40, 0x06, 0xef, 0xf1, 0x90, 0xb1, + 0x63, 0x58, 0x9e, 0x2e, 0xf9, 0xb5, 0xef, 0x21, 0x58, 0x6a, 0x74, 0xdc, 0xfd, 0x21, 0xa4, 0x97, + 0xa1, 0xa0, 0xb8, 0xb7, 0x67, 0x93, 0xde, 0x3e, 0x80, 0xe5, 0x03, 0x18, 0x26, 0xd1, 0xc6, 0x35, + 0xa8, 0x24, 0xf6, 0x43, 0x2a, 0xa6, 0xa0, 0xcf, 0xc5, 0x37, 0x84, 0x6a, 0x9f, 0x22, 0x58, 0x92, + 0xc7, 0xfe, 0x8e, 0xe1, 0x31, 0xeb, 0xb8, 0x43, 0xe7, 0x55, 0x98, 0xed, 0x05, 0x38, 0x24, 0xdf, + 0x94, 0xe0, 0x2b, 0x87, 0x54, 0x61, 0x47, 0xbf, 0x47, 0xb0, 0xc0, 0x4f, 0xf9, 0xd3, 0x84, 0xf9, + 0x77, 0x08, 0xe6, 0xef, 0x1b, 0xf4, 0x34, 0x41, 0xfe, 0x83, 0x1f, 0x64, 0x43, 0xcc, 0xc7, 0x19, + 0x3c, 0x38, 0x63, 0x1c, 0x74, 0x70, 0xac, 0xcc, 0xc6, 0x50, 0x53, 0xed, 0x8f, 0xc3, 0x68, 0x7c, + 0xca, 0x90, 0xff, 0x09, 0xc1, 0xc5, 0x2d, 0xc2, 0x42, 0xd4, 0x27, 0x22, 0x6a, 0x8f, 0x6b, 0x2d, + 0xcf, 0xe5, 0x99, 0xa3, 0x04, 0x7f, 0x2c, 0xb1, 0xfd, 0xb7, 0x08, 0x16, 0x79, 0x5c, 0x3d, 0x19, + 0x46, 0x30, 0x46, 0x56, 0xa8, 0xfd, 0xd2, 0x3f, 0x8d, 0xa2, 0x88, 0x27, 0x51, 0x9d, 0xc2, 0xf0, + 0x32, 0x2a, 0xc3, 0xe3, 0xe0, 0x42, 0xca, 0xf6, 0x26, 0xad, 0x66, 0xeb, 0x59, 0x0e, 0x2e, 0x4a, + 0xd3, 0x7e, 0x8c, 0x60, 0x29, 0xc8, 0x49, 0x1b, 0x64, 0xb7, 0x4b, 0x1c, 0xf6, 0xe2, 0xfa, 0x4c, + 0x6a, 0x23, 0xa3, 0xc8, 0x26, 0x2f, 0x40, 0x81, 0xca, 0x75, 0xc2, 0x74, 0x73, 0x48, 0xd0, 0x3e, + 0x41, 0xb0, 0x7c, 0x00, 0xce, 0x24, 0xca, 0xaa, 0xc2, 0xb4, 0xe5, 0x98, 0xe4, 0x69, 0x88, 0x26, + 0x78, 0xe5, 0x5f, 0x5a, 0x7d, 0xcb, 0x36, 0x43, 0x18, 0xc1, 0x2b, 0xbe, 0x02, 0x25, 0xe2, 0x18, + 0x2d, 0x9b, 0x34, 0x05, 0xaf, 0xd8, 0xd4, 0x19, 0xbd, 0x28, 0x69, 0xdb, 0x9c, 0xa4, 0xfd, 0x04, + 0xc1, 0x3c, 0xdf, 0x53, 0x1f, 0x23, 0x7d, 0xb9, 0x3a, 0xab, 0x43, 0x31, 0xb2, 0x69, 0x3e, 0xdc, + 0x28, 0x49, 0x7b, 0x02, 0x0b, 0x71, 0x38, 0x93, 0xe8, 0xec, 0x12, 0x40, 0xb8, 0x23, 0xd2, 0xb6, + 0xb2, 0x7a, 0x84, 0xa2, 0xfd, 0x0b, 0x01, 0x96, 0xe9, 0x85, 0x50, 0xc6, 0x31, 0x97, 0xbf, 0x8f, + 0x2d, 0x62, 0x9b, 0xd1, 0x08, 0x56, 0x10, 0x14, 0xf1, 0x79, 0x13, 0x4a, 0xe4, 0x29, 0xf3, 0x8c, + 0x66, 0xcf, 0xf0, 0x8c, 0xae, 0x2c, 0x3e, 0xc6, 0x0a, 0x36, 0x45, 0x31, 0x6c, 0x47, 0x8c, 0xd2, + 0xfe, 0xcc, 0x13, 0x13, 0xdf, 0x28, 0x4f, 0xba, 0xc4, 0x17, 0x01, 0x84, 0xd1, 0xca, 0xcf, 0x39, + 0xf9, 0x59, 0x50, 0x44, 0x38, 0xff, 0x04, 0x41, 0x45, 0x88, 0x20, 0xe5, 0xe9, 0xf1, 0x69, 0x13, + 0x63, 0x50, 0x62, 0xcc, 0x08, 0x17, 0xfa, 0x12, 0xe4, 0x7d, 0xc5, 0x66, 0xc7, 0x55, 0xac, 0x3f, + 0xe0, 0x10, 0x31, 0xb4, 0x5f, 0x23, 0x58, 0x4c, 0xa8, 0x7c, 0x12, 0x8b, 0x7e, 0x17, 0xb0, 0x94, + 0xd0, 0x1c, 0x8a, 0x1d, 0x1c, 0x3d, 0x89, 0x8a, 0xd9, 0x7f, 0x49, 0x2a, 0x49, 0x3f, 0x6b, 0x25, + 0x28, 0x54, 0xfb, 0x2b, 0x82, 0x0b, 0x5b, 0x84, 0x09, 0xd6, 0x0d, 0x1e, 0x3b, 0x76, 0x3c, 0x77, + 0xd7, 0x23, 0x94, 0x9e, 0x5e, 0xfb, 0xf8, 0xb9, 0xcc, 0x55, 0x54, 0x22, 0x4d, 0xa2, 0xff, 0x2b, + 0x50, 0x12, 0x6b, 0x10, 0xb3, 0xe9, 0xb9, 0xfb, 0xd4, 0xb7, 0xa3, 0xa2, 0x4f, 0xd3, 0xdd, 0x7d, + 0x61, 0x10, 0xcc, 0x65, 0x86, 0x2d, 0x19, 0xfc, 0x83, 0x41, 0x50, 0xf8, 0x67, 0xe1, 0x83, 0x01, + 0x30, 0x3e, 0x39, 0x39, 0xbd, 0x3a, 0xfe, 0x08, 0xc1, 0x62, 0x42, 0x94, 0x49, 0x74, 0x7b, 0x5b, + 0x66, 0x52, 0x52, 0x98, 0xd9, 0xb5, 0xcb, 0xca, 0x31, 0x91, 0xc5, 0x24, 0xb7, 0xf6, 0x19, 0x82, + 0x0a, 0xaf, 0xb6, 0x4e, 0x79, 0x40, 0xfb, 0x37, 0x82, 0xf2, 0xb6, 0x43, 0x89, 0xc7, 0x4e, 0x7e, + 0x32, 0x8d, 0x6f, 0xc1, 0x8c, 0xe7, 0xee, 0x37, 0x4d, 0x83, 0x19, 0xfe, 0x51, 0x74, 0x4e, 0x09, + 0x6f, 0xc3, 0x76, 0x5b, 0xfa, 0xb4, 0xe7, 0xee, 0x6f, 0x1a, 0xcc, 0xc0, 0xe7, 0xa1, 0xd0, 0x31, + 0x68, 0xa7, 0xf9, 0x84, 0x0c, 0x68, 0x35, 0x5f, 0xcf, 0xae, 0x94, 0xf5, 0x19, 0x4e, 0x78, 0x40, + 0x06, 0x94, 0x1b, 0xd3, 0x6c, 0x20, 0xff, 0x24, 0x56, 0x74, 0x19, 0x8a, 0x9e, 0xbb, 0xbf, 0xbd, + 0xd9, 0x6c, 0x91, 0x5d, 0xcb, 0xf1, 0x1d, 0x14, 0x04, 0x69, 0x83, 0x53, 0x38, 0x0a, 0xc9, 0x40, + 0x1c, 0xd3, 0x77, 0xcf, 0x19, 0x41, 0xf8, 0xa6, 0x63, 0x6a, 0x7b, 0x50, 0xd9, 0xb1, 0x8d, 0x36, + 0xe9, 0xb8, 0xb6, 0x49, 0x3c, 0x11, 0xed, 0x71, 0x05, 0xb2, 0xcc, 0xd8, 0xf5, 0x8f, 0x13, 0xfe, + 0x88, 0xbf, 0x08, 0x53, 0x6c, 0xd0, 0x0b, 0x0c, 0xf5, 0x55, 0x65, 0xdc, 0x8d, 0x4c, 0xf3, 0xee, + 0xa0, 0x47, 0x74, 0x31, 0x02, 0x2f, 0x41, 0x5e, 0xdc, 0x0b, 0xcb, 0x83, 0xa6, 0xa4, 0xfb, 0x6f, + 0xda, 0xa3, 0xd8, 0xba, 0x5b, 0x9e, 0xdb, 0xef, 0xe1, 0x6d, 0x28, 0xf5, 0x86, 0x34, 0xae, 0x84, + 0xf4, 0x28, 0x9f, 0x04, 0xad, 0xc7, 0x86, 0x6a, 0xff, 0xcc, 0x40, 0xb9, 0x41, 0x0c, 0xaf, 0xdd, + 0x39, 0x0d, 0x85, 0x26, 0xd7, 0xb8, 0x49, 0x6d, 0xdf, 0x47, 0xf8, 0x23, 0xbe, 0x01, 0x67, 0x23, + 0x02, 0x35, 0x77, 0xb9, 0x82, 0xaa, 0x79, 0xd1, 0x7a, 0xa9, 0xf4, 0x92, 0x8a, 0xbb, 0x03, 0x33, + 0x26, 0xb5, 0x9b, 0x62, 0x8b, 0xa6, 0xc5, 0x16, 0xa9, 0xe5, 0xdb, 0xa4, 0xb6, 0xd8, 0x9a, 0x69, + 0x53, 0x3e, 0xe0, 0x7b, 0x50, 0xa6, 0x42, 0x4b, 0x41, 0x9a, 0x35, 0x33, 0x6e, 0x36, 0x50, 0x92, + 0xe3, 0xfc, 0x3c, 0xeb, 0x3f, 0x08, 0xe6, 0x74, 0xc2, 0x3c, 0x8b, 0xec, 0x91, 0x53, 0xa1, 0xf0, + 0xeb, 0x90, 0xb5, 0x4c, 0x2a, 0x14, 0x5e, 0x5c, 0xab, 0x2a, 0x6f, 0xde, 0xb7, 0x37, 0xa9, 0xce, + 0x99, 0xf0, 0x2b, 0x50, 0x76, 0xfb, 0xac, 0xd7, 0x67, 0x4d, 0x11, 0xdb, 0xa4, 0x27, 0x17, 0xf4, + 0x92, 0x24, 0xde, 0x13, 0x34, 0xed, 0xd3, 0x98, 0x06, 0x68, 0xdf, 0x66, 0xf4, 0xc5, 0xdc, 0xd9, + 0x47, 0x96, 0x19, 0x07, 0xd9, 0xd7, 0xa0, 0x28, 0x21, 0xc9, 0xc0, 0x24, 0x53, 0xb9, 0x4b, 0xca, + 0x31, 0x02, 0x26, 0x0f, 0x4a, 0xba, 0x8c, 0xd9, 0x94, 0x3f, 0x6b, 0x0f, 0x60, 0xea, 0xbe, 0xc5, + 0x84, 0xfd, 0xf1, 0x82, 0x01, 0x89, 0x82, 0x81, 0x3f, 0xe2, 0x73, 0x91, 0x80, 0x97, 0x11, 0x9e, + 0x1b, 0x46, 0x35, 0xd1, 0x0a, 0x74, 0x3d, 0xdf, 0xa5, 0x33, 0xba, 0xff, 0xa6, 0xbd, 0x3f, 0x74, + 0xb9, 0x09, 0xe4, 0xc7, 0x30, 0xd5, 0xb1, 0xfc, 0xdb, 0x85, 0x92, 0x2e, 0x9e, 0xb5, 0xef, 0x23, + 0x28, 0xdd, 0xb3, 0xfb, 0xf4, 0x65, 0x38, 0xb3, 0xea, 0x72, 0x36, 0xab, 0xbe, 0x9c, 0xfd, 0x0b, + 0x82, 0xc5, 0x1d, 0xe2, 0x51, 0x8b, 0x32, 0xe2, 0x30, 0xbf, 0x62, 0xdb, 0x76, 0x1e, 0xbb, 0xf1, + 0xd2, 0x18, 0x25, 0x4a, 0xe3, 0xcf, 0xa7, 0x50, 0xe4, 0x3b, 0xe2, 0xf4, 0xbb, 0x32, 0xc9, 0x92, + 0x97, 0x15, 0xd3, 0x4e, 0xbf, 0x2b, 0x32, 0xb0, 0x3b, 0x41, 0x22, 0x91, 0x13, 0xce, 0xaf, 0x76, + 0x5f, 0x1f, 0x6f, 0x2c, 0x95, 0xf8, 0xa9, 0x6c, 0x00, 0x28, 0x85, 0x7a, 0x71, 0x5d, 0x2f, 0x81, + 0xaf, 0xdc, 0x84, 0xaa, 0xff, 0x0f, 0x12, 0xfe, 0x9a, 0xd2, 0x96, 0xf8, 0x05, 0x82, 0x7a, 0x3a, + 0xaa, 0x49, 0xce, 0xca, 0xaf, 0x43, 0xce, 0x72, 0x1e, 0xbb, 0x41, 0x01, 0x71, 0x5d, 0x7d, 0xb4, + 0x28, 0xd7, 0x95, 0x03, 0xb5, 0xbf, 0x23, 0xa8, 0xbc, 0xd3, 0x27, 0xde, 0xe0, 0x18, 0xb6, 0xbf, + 0x4b, 0xba, 0x4d, 0x6a, 0x3d, 0x23, 0xc1, 0xf6, 0x77, 0x49, 0xb7, 0x61, 0x3d, 0x23, 0x31, 0xcb, + 0xc8, 0xc5, 0x2d, 0x23, 0x9e, 0x83, 0xe5, 0x47, 0x14, 0x88, 0xd3, 0xb1, 0x02, 0x51, 0x7b, 0x8e, + 0xa0, 0xb6, 0x45, 0x58, 0x52, 0xd4, 0xe3, 0x33, 0x8a, 0x8f, 0x11, 0x9c, 0x57, 0x02, 0x9a, 0xc4, + 0x1e, 0xbe, 0x1c, 0xb7, 0x07, 0x75, 0xaa, 0x71, 0x60, 0x49, 0xdf, 0x14, 0x16, 0x61, 0x5e, 0x27, + 0xbb, 0xdc, 0x52, 0xbc, 0xb7, 0x2c, 0xe7, 0x89, 0xaf, 0x1a, 0x9e, 0xd7, 0x2d, 0xc4, 0xe9, 0x3e, + 0xc2, 0x2f, 0xc0, 0xb4, 0x61, 0x9a, 0xbc, 0x24, 0x1b, 0xa9, 0xb6, 0x6f, 0x48, 0x1e, 0x3d, 0x60, + 0x8e, 0x48, 0x96, 0x19, 0x5b, 0xb2, 0xeb, 0x5f, 0x85, 0xb9, 0x44, 0x42, 0x86, 0x67, 0x60, 0xea, + 0xa1, 0xeb, 0x90, 0xca, 0x19, 0x5c, 0x81, 0xd2, 0x86, 0xe5, 0x18, 0xde, 0xe0, 0x3d, 0xd2, 0x66, + 0xae, 0x57, 0x31, 0xf1, 0x1c, 0x14, 0xef, 0xd9, 0xae, 0xc1, 0x7c, 0x02, 0x59, 0xfb, 0xc7, 0x22, + 0x94, 0xdf, 0x16, 0xcb, 0x34, 0x88, 0xb7, 0x67, 0xb5, 0x09, 0x6e, 0x42, 0x25, 0xf9, 0x43, 0x0a, + 0x7e, 0x5d, 0xa9, 0xb0, 0x94, 0xff, 0x56, 0x6a, 0xa3, 0x80, 0x6b, 0x67, 0xf0, 0x87, 0x30, 0x1b, + 0xff, 0x55, 0x04, 0xab, 0xfd, 0x53, 0xf9, 0x3f, 0xc9, 0x61, 0x93, 0x37, 0xa1, 0x1c, 0xfb, 0xf3, + 0x03, 0x5f, 0x53, 0xce, 0xad, 0xfa, 0x3b, 0xa4, 0x76, 0x45, 0xc9, 0x1a, 0xfd, 0x3b, 0x43, 0xa2, + 0x8f, 0x37, 0xc0, 0x53, 0xd0, 0x2b, 0xbb, 0xe4, 0x87, 0xa1, 0x37, 0xe0, 0xec, 0x81, 0x7e, 0x36, + 0x7e, 0x43, 0x39, 0x7f, 0x5a, 0xdf, 0xfb, 0xb0, 0x25, 0xf6, 0x01, 0x1f, 0xfc, 0xc3, 0x01, 0xdf, + 0x54, 0xef, 0x40, 0xda, 0xff, 0x1d, 0xb5, 0xd5, 0xb1, 0xf9, 0x43, 0xc5, 0xfd, 0x00, 0xc1, 0x72, + 0x4a, 0x13, 0x1a, 0xaf, 0x2b, 0xa7, 0x1b, 0xdd, 0x49, 0xaf, 0xdd, 0x3a, 0xda, 0xa0, 0x10, 0x88, + 0x03, 0x73, 0x89, 0xb6, 0x2f, 0xbe, 0xa1, 0x9c, 0x4a, 0xdd, 0xa0, 0xae, 0xbd, 0x3e, 0x1e, 0x73, + 0xb8, 0xde, 0x23, 0x98, 0x4b, 0xb4, 0x7a, 0x53, 0xd6, 0x53, 0x37, 0x84, 0x0f, 0xdb, 0xd0, 0x0f, + 0xa0, 0x1c, 0xeb, 0xc9, 0xa6, 0x58, 0xbc, 0xaa, 0x6f, 0x7b, 0xd8, 0xd4, 0x8f, 0xa0, 0x14, 0x6d, + 0x9d, 0xe2, 0x95, 0x34, 0x5f, 0x3a, 0x30, 0xf1, 0x51, 0x5c, 0x69, 0xd8, 0x75, 0x19, 0xe1, 0x4a, + 0x07, 0x9a, 0x49, 0xe3, 0xbb, 0x52, 0x64, 0xfe, 0x91, 0xae, 0x74, 0xe4, 0x25, 0x3e, 0x42, 0xb0, + 0xa4, 0xee, 0xbc, 0xe1, 0xb5, 0x34, 0xdb, 0x4c, 0xef, 0x31, 0xd6, 0xd6, 0x8f, 0x34, 0x26, 0xd4, + 0xe2, 0x13, 0x98, 0x8d, 0xf7, 0xae, 0x52, 0xb4, 0xa8, 0x6c, 0xc9, 0xd5, 0x6e, 0x8c, 0xc5, 0x1b, + 0x2e, 0xf6, 0x2d, 0x28, 0x46, 0xfa, 0x0a, 0xf8, 0xb5, 0x11, 0x76, 0x1c, 0xbd, 0xb6, 0x3a, 0x4c, + 0x93, 0x1d, 0x28, 0xc7, 0xee, 0x92, 0xd3, 0x6c, 0x58, 0x71, 0xc5, 0x5f, 0xbb, 0x3e, 0x0e, 0x6b, + 0x28, 0x40, 0x07, 0xca, 0xb1, 0x9b, 0xbd, 0x94, 0x95, 0x54, 0x17, 0x99, 0x29, 0x2b, 0x29, 0x2f, + 0x0a, 0xb5, 0x33, 0xf8, 0xbb, 0x91, 0x4b, 0xc4, 0xd8, 0x45, 0x2d, 0xfe, 0xff, 0x91, 0xf3, 0xa8, + 0xee, 0xa9, 0x6b, 0x6b, 0x47, 0x19, 0x12, 0x42, 0x78, 0x07, 0x0a, 0xe1, 0x05, 0x22, 0xbe, 0x9a, + 0x1a, 0x16, 0x8e, 0xb2, 0x53, 0x0d, 0xc8, 0xcb, 0xcb, 0x2c, 0xac, 0xa5, 0xdc, 0xca, 0x47, 0x6e, + 0xfa, 0x6a, 0xaf, 0x8c, 0xe4, 0x09, 0x71, 0xea, 0x90, 0x97, 0x15, 0x65, 0xca, 0xa4, 0xb1, 0x1b, + 0x9e, 0xda, 0x68, 0x1e, 0x51, 0x92, 0x6a, 0x67, 0xf0, 0xfb, 0x30, 0x13, 0xd4, 0xe9, 0xf8, 0xd5, + 0x14, 0xb7, 0x8f, 0x5d, 0x64, 0xd4, 0x0e, 0xe3, 0x0a, 0x66, 0xde, 0x86, 0x9c, 0x28, 0x52, 0xb1, + 0x3a, 0xc8, 0x45, 0x0b, 0xd8, 0xc3, 0xb4, 0xf9, 0x43, 0x04, 0xd5, 0xb4, 0x0a, 0x08, 0xa7, 0x9e, + 0x6f, 0xa3, 0xca, 0xb8, 0xda, 0xed, 0x23, 0x8e, 0x0a, 0x37, 0xe1, 0x19, 0xcc, 0x2b, 0xf2, 0x6e, + 0xbc, 0x9a, 0x36, 0x5f, 0x4a, 0xc9, 0x50, 0x7b, 0x73, 0xfc, 0x01, 0xe1, 0xda, 0x04, 0x4a, 0xd1, + 0x54, 0x3a, 0xe5, 0xa0, 0x51, 0x64, 0xe1, 0xb5, 0x6b, 0x63, 0x70, 0x06, 0xcb, 0xac, 0xf5, 0xa1, + 0xb4, 0xe3, 0xb9, 0x4f, 0x07, 0x41, 0xaa, 0xfb, 0xbf, 0x59, 0x76, 0xe3, 0xf6, 0xb7, 0xd7, 0x77, + 0x2d, 0xd6, 0xe9, 0xb7, 0xf8, 0xfe, 0xaf, 0x4a, 0xde, 0x37, 0x2c, 0xd7, 0x7f, 0x5a, 0xb5, 0x1c, + 0x46, 0x3c, 0xc7, 0xb0, 0x57, 0xc5, 0x5c, 0x3e, 0xb5, 0xd7, 0x6a, 0xe5, 0xc5, 0xfb, 0xfa, 0x7f, + 0x03, 0x00, 0x00, 0xff, 0xff, 0x65, 0x94, 0xee, 0x58, 0x62, 0x2e, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/internal/proxynode/impl.go b/internal/proxynode/impl.go index 144bdba3bc..4891fed1ff 100644 --- a/internal/proxynode/impl.go +++ b/internal/proxynode/impl.go @@ -1260,11 +1260,7 @@ func (node *ProxyNode) GetPersistentSegmentInfo(ctx context.Context, req *milvus SegmentID: info.ID, CollectionID: info.CollectionID, PartitionID: info.PartitionID, - OpenTime: info.OpenTime, - SealedTime: info.SealedTime, - FlushedTime: info.FlushedTime, NumRows: info.NumRows, - MemSize: info.MemSize, State: info.State, } } diff --git a/internal/querynode/meta_service_test.go b/internal/querynode/meta_service_test.go index 942bd790ad..efda2da7ef 100644 --- a/internal/querynode/meta_service_test.go +++ b/internal/querynode/meta_service_test.go @@ -86,7 +86,6 @@ func TestMetaService_printSegmentStruct(t *testing.T) { ID: UniqueID(0), CollectionID: UniqueID(0), PartitionID: defaultPartitionID, - OpenTime: Timestamp(0), NumRows: UniqueID(0), } diff --git a/internal/queryservice/mock.go b/internal/queryservice/mock.go index 498b5a4d6b..ecc03e7540 100644 --- a/internal/queryservice/mock.go +++ b/internal/queryservice/mock.go @@ -120,7 +120,6 @@ func NewDataMock() *DataMock { }, SegmentID: segmentID, State: commonpb.SegmentState_Flushed, - CreateTime: time, StartPosition: position, } } diff --git a/tests/python_test/requirements.txt b/tests/python_test/requirements.txt index 90b43f9c2a..b830cbd1ec 100644 --- a/tests/python_test/requirements.txt +++ b/tests/python_test/requirements.txt @@ -10,7 +10,7 @@ allure-pytest==2.7.0 pytest-print==0.2.1 pytest-level==0.1.1 pytest-xdist==2.2.1 -pymilvus-distributed==0.0.65 +pymilvus-distributed==0.0.66 pytest-rerunfailures==9.1.1 git+https://github.com/Projectplace/pytest-tags ndg-httpsclient