From b71bffe26f3316f05d39fc9f99b2f09f01680730 Mon Sep 17 00:00:00 2001 From: "zhenshan.cao" Date: Mon, 27 Sep 2021 10:01:59 +0800 Subject: [PATCH] Replace ChannelID with ShardName in DML Request (#8539) Signed-off-by: zhenshan.cao --- internal/core/src/pb/common.pb.cc | 473 ++++++++++++++++-- internal/core/src/pb/common.pb.h | 261 +++++++++- .../datanode/flow_graph_insert_buffer_node.go | 4 +- internal/datanode/mock_test.go | 2 +- internal/msgstream/mq_msgstream_test.go | 6 +- internal/msgstream/msg_test.go | 4 +- internal/msgstream/repack_func.go | 2 +- internal/msgstream/unmarshal_test.go | 2 +- internal/proto/common.proto | 6 + internal/proto/commonpb/common.pb.go | 217 +++++--- internal/proto/internal.proto | 30 +- internal/proto/internalpb/internal.pb.go | 312 ++++++------ internal/proxy/task.go | 5 +- internal/querynode/data_sync_service_test.go | 2 +- internal/querynode/flow_graph_insert_node.go | 2 +- internal/querynode/load_service_test.go | 2 +- internal/querynode/mock_test.go | 2 +- internal/util/typeutil/conversion_test.go | 1 + 18 files changed, 1007 insertions(+), 326 deletions(-) diff --git a/internal/core/src/pb/common.pb.cc b/internal/core/src/pb/common.pb.cc index 3066a34433..ee3e4e5006 100644 --- a/internal/core/src/pb/common.pb.cc +++ b/internal/core/src/pb/common.pb.cc @@ -43,6 +43,10 @@ class MsgHeaderDefaultTypeInternal { public: ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; } _MsgHeader_default_instance_; +class DMLMsgHeaderDefaultTypeInternal { + public: + ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; +} _DMLMsgHeader_default_instance_; } // namespace common } // namespace proto } // namespace milvus @@ -74,6 +78,21 @@ static void InitDefaultsscc_info_Blob_common_2eproto() { ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_Blob_common_2eproto = {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsscc_info_Blob_common_2eproto}, {}}; +static void InitDefaultsscc_info_DMLMsgHeader_common_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + + { + void* ptr = &::milvus::proto::common::_DMLMsgHeader_default_instance_; + new (ptr) ::milvus::proto::common::DMLMsgHeader(); + ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr); + } + ::milvus::proto::common::DMLMsgHeader::InitAsDefaultInstance(); +} + +::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<1> scc_info_DMLMsgHeader_common_2eproto = + {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsscc_info_DMLMsgHeader_common_2eproto}, { + &scc_info_MsgBase_common_2eproto.base,}}; + static void InitDefaultsscc_info_KeyValuePair_common_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; @@ -131,7 +150,7 @@ static void InitDefaultsscc_info_Status_common_2eproto() { ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_Status_common_2eproto = {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsscc_info_Status_common_2eproto}, {}}; -static ::PROTOBUF_NAMESPACE_ID::Metadata file_level_metadata_common_2eproto[6]; +static ::PROTOBUF_NAMESPACE_ID::Metadata file_level_metadata_common_2eproto[7]; static const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* file_level_enum_descriptors_common_2eproto[5]; static constexpr ::PROTOBUF_NAMESPACE_ID::ServiceDescriptor const** file_level_service_descriptors_common_2eproto = nullptr; @@ -178,6 +197,13 @@ const ::PROTOBUF_NAMESPACE_ID::uint32 TableStruct_common_2eproto::offsets[] PROT ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ PROTOBUF_FIELD_OFFSET(::milvus::proto::common::MsgHeader, base_), + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::milvus::proto::common::DMLMsgHeader, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + PROTOBUF_FIELD_OFFSET(::milvus::proto::common::DMLMsgHeader, base_), + PROTOBUF_FIELD_OFFSET(::milvus::proto::common::DMLMsgHeader, shardname_), }; static const ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { { 0, -1, sizeof(::milvus::proto::common::Status)}, @@ -186,6 +212,7 @@ static const ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema schemas[] PROTOB { 20, -1, sizeof(::milvus::proto::common::Address)}, { 27, -1, sizeof(::milvus::proto::common::MsgBase)}, { 36, -1, sizeof(::milvus::proto::common::MsgHeader)}, + { 42, -1, sizeof(::milvus::proto::common::DMLMsgHeader)}, }; static ::PROTOBUF_NAMESPACE_ID::Message const * const file_default_instances[] = { @@ -195,6 +222,7 @@ static ::PROTOBUF_NAMESPACE_ID::Message const * const file_default_instances[] = reinterpret_cast(&::milvus::proto::common::_Address_default_instance_), reinterpret_cast(&::milvus::proto::common::_MsgBase_default_instance_), reinterpret_cast(&::milvus::proto::common::_MsgHeader_default_instance_), + reinterpret_cast(&::milvus::proto::common::_DMLMsgHeader_default_instance_), }; const char descriptor_table_protodef_common_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = @@ -207,62 +235,65 @@ const char descriptor_table_protodef_common_2eproto[] PROTOBUF_SECTION_VARIABLE( "\030\001 \001(\0162\034.milvus.proto.common.MsgType\022\r\n\005" "msgID\030\002 \001(\003\022\021\n\ttimestamp\030\003 \001(\004\022\020\n\010source" "ID\030\004 \001(\003\"7\n\tMsgHeader\022*\n\004base\030\001 \001(\0132\034.mi" - "lvus.proto.common.MsgBase*\272\004\n\tErrorCode\022" - "\013\n\007Success\020\000\022\023\n\017UnexpectedError\020\001\022\021\n\rCon" - "nectFailed\020\002\022\024\n\020PermissionDenied\020\003\022\027\n\023Co" - "llectionNotExists\020\004\022\023\n\017IllegalArgument\020\005" - "\022\024\n\020IllegalDimension\020\007\022\024\n\020IllegalIndexTy" - "pe\020\010\022\031\n\025IllegalCollectionName\020\t\022\017\n\013Illeg" - "alTOPK\020\n\022\024\n\020IllegalRowRecord\020\013\022\023\n\017Illega" - "lVectorID\020\014\022\027\n\023IllegalSearchResult\020\r\022\020\n\014" - "FileNotFound\020\016\022\016\n\nMetaFailed\020\017\022\017\n\013CacheF" - "ailed\020\020\022\026\n\022CannotCreateFolder\020\021\022\024\n\020Canno" - "tCreateFile\020\022\022\026\n\022CannotDeleteFolder\020\023\022\024\n" - "\020CannotDeleteFile\020\024\022\023\n\017BuildIndexError\020\025" - "\022\020\n\014IllegalNLIST\020\026\022\025\n\021IllegalMetricType\020" - "\027\022\017\n\013OutOfMemory\020\030\022\021\n\rIndexNotExist\020\031\022\023\n" - "\017EmptyCollection\020\032\022\022\n\rDDRequestRace\020\350\007*X" - "\n\nIndexState\022\022\n\016IndexStateNone\020\000\022\014\n\010Unis" - "sued\020\001\022\016\n\nInProgress\020\002\022\014\n\010Finished\020\003\022\n\n\006" - "Failed\020\004*f\n\014SegmentState\022\024\n\020SegmentState" - "None\020\000\022\014\n\010NotExist\020\001\022\013\n\007Growing\020\002\022\n\n\006Sea" - "led\020\003\022\013\n\007Flushed\020\004\022\014\n\010Flushing\020\005*\264\010\n\007Msg" - "Type\022\r\n\tUndefined\020\000\022\024\n\020CreateCollection\020" - "d\022\022\n\016DropCollection\020e\022\021\n\rHasCollection\020f" - "\022\026\n\022DescribeCollection\020g\022\023\n\017ShowCollecti" - "ons\020h\022\024\n\020GetSystemConfigs\020i\022\022\n\016LoadColle" - "ction\020j\022\025\n\021ReleaseCollection\020k\022\017\n\013Create" - "Alias\020l\022\r\n\tDropAlias\020m\022\016\n\nAlterAlias\020n\022\024" - "\n\017CreatePartition\020\310\001\022\022\n\rDropPartition\020\311\001" - "\022\021\n\014HasPartition\020\312\001\022\026\n\021DescribePartition" - "\020\313\001\022\023\n\016ShowPartitions\020\314\001\022\023\n\016LoadPartitio" - "ns\020\315\001\022\026\n\021ReleasePartitions\020\316\001\022\021\n\014ShowSeg" - "ments\020\372\001\022\024\n\017DescribeSegment\020\373\001\022\021\n\014LoadSe" - "gments\020\374\001\022\024\n\017ReleaseSegments\020\375\001\022\024\n\017Hando" - "ffSegments\020\376\001\022\030\n\023LoadBalanceSegments\020\377\001\022" - "\020\n\013CreateIndex\020\254\002\022\022\n\rDescribeIndex\020\255\002\022\016\n" - "\tDropIndex\020\256\002\022\013\n\006Insert\020\220\003\022\013\n\006Delete\020\221\003\022" - "\n\n\005Flush\020\222\003\022\013\n\006Search\020\364\003\022\021\n\014SearchResult" - "\020\365\003\022\022\n\rGetIndexState\020\366\003\022\032\n\025GetIndexBuild" - "Progress\020\367\003\022\034\n\027GetCollectionStatistics\020\370" - "\003\022\033\n\026GetPartitionStatistics\020\371\003\022\r\n\010Retrie" - "ve\020\372\003\022\023\n\016RetrieveResult\020\373\003\022\024\n\017WatchDmCha" - "nnels\020\374\003\022\025\n\020RemoveDmChannels\020\375\003\022\027\n\022Watch" - "QueryChannels\020\376\003\022\030\n\023RemoveQueryChannels\020" - "\377\003\022\020\n\013SegmentInfo\020\330\004\022\r\n\010TimeTick\020\260\t\022\023\n\016Q" - "ueryNodeStats\020\261\t\022\016\n\tLoadIndex\020\262\t\022\016\n\tRequ" - "estID\020\263\t\022\017\n\nRequestTSO\020\264\t\022\024\n\017AllocateSeg" - "ment\020\265\t\022\026\n\021SegmentStatistics\020\266\t\022\025\n\020Segme" - "ntFlushDone\020\267\t\022\017\n\nDataNodeTt\020\270\t*\"\n\007DslTy" - "pe\022\007\n\003Dsl\020\000\022\016\n\nBoolExprV1\020\001B5Z3github.co" - "m/milvus-io/milvus/internal/proto/common" - "pbb\006proto3" + "lvus.proto.common.MsgBase\"M\n\014DMLMsgHeade" + "r\022*\n\004base\030\001 \001(\0132\034.milvus.proto.common.Ms" + "gBase\022\021\n\tshardName\030\002 \001(\t*\272\004\n\tErrorCode\022\013" + "\n\007Success\020\000\022\023\n\017UnexpectedError\020\001\022\021\n\rConn" + "ectFailed\020\002\022\024\n\020PermissionDenied\020\003\022\027\n\023Col" + "lectionNotExists\020\004\022\023\n\017IllegalArgument\020\005\022" + "\024\n\020IllegalDimension\020\007\022\024\n\020IllegalIndexTyp" + "e\020\010\022\031\n\025IllegalCollectionName\020\t\022\017\n\013Illega" + "lTOPK\020\n\022\024\n\020IllegalRowRecord\020\013\022\023\n\017Illegal" + "VectorID\020\014\022\027\n\023IllegalSearchResult\020\r\022\020\n\014F" + "ileNotFound\020\016\022\016\n\nMetaFailed\020\017\022\017\n\013CacheFa" + "iled\020\020\022\026\n\022CannotCreateFolder\020\021\022\024\n\020Cannot" + "CreateFile\020\022\022\026\n\022CannotDeleteFolder\020\023\022\024\n\020" + "CannotDeleteFile\020\024\022\023\n\017BuildIndexError\020\025\022" + "\020\n\014IllegalNLIST\020\026\022\025\n\021IllegalMetricType\020\027" + "\022\017\n\013OutOfMemory\020\030\022\021\n\rIndexNotExist\020\031\022\023\n\017" + "EmptyCollection\020\032\022\022\n\rDDRequestRace\020\350\007*X\n" + "\nIndexState\022\022\n\016IndexStateNone\020\000\022\014\n\010Uniss" + "ued\020\001\022\016\n\nInProgress\020\002\022\014\n\010Finished\020\003\022\n\n\006F" + "ailed\020\004*f\n\014SegmentState\022\024\n\020SegmentStateN" + "one\020\000\022\014\n\010NotExist\020\001\022\013\n\007Growing\020\002\022\n\n\006Seal" + "ed\020\003\022\013\n\007Flushed\020\004\022\014\n\010Flushing\020\005*\264\010\n\007MsgT" + "ype\022\r\n\tUndefined\020\000\022\024\n\020CreateCollection\020d" + "\022\022\n\016DropCollection\020e\022\021\n\rHasCollection\020f\022" + "\026\n\022DescribeCollection\020g\022\023\n\017ShowCollectio" + "ns\020h\022\024\n\020GetSystemConfigs\020i\022\022\n\016LoadCollec" + "tion\020j\022\025\n\021ReleaseCollection\020k\022\017\n\013CreateA" + "lias\020l\022\r\n\tDropAlias\020m\022\016\n\nAlterAlias\020n\022\024\n" + "\017CreatePartition\020\310\001\022\022\n\rDropPartition\020\311\001\022" + "\021\n\014HasPartition\020\312\001\022\026\n\021DescribePartition\020" + "\313\001\022\023\n\016ShowPartitions\020\314\001\022\023\n\016LoadPartition" + "s\020\315\001\022\026\n\021ReleasePartitions\020\316\001\022\021\n\014ShowSegm" + "ents\020\372\001\022\024\n\017DescribeSegment\020\373\001\022\021\n\014LoadSeg" + "ments\020\374\001\022\024\n\017ReleaseSegments\020\375\001\022\024\n\017Handof" + "fSegments\020\376\001\022\030\n\023LoadBalanceSegments\020\377\001\022\020" + "\n\013CreateIndex\020\254\002\022\022\n\rDescribeIndex\020\255\002\022\016\n\t" + "DropIndex\020\256\002\022\013\n\006Insert\020\220\003\022\013\n\006Delete\020\221\003\022\n" + "\n\005Flush\020\222\003\022\013\n\006Search\020\364\003\022\021\n\014SearchResult\020" + "\365\003\022\022\n\rGetIndexState\020\366\003\022\032\n\025GetIndexBuildP" + "rogress\020\367\003\022\034\n\027GetCollectionStatistics\020\370\003" + "\022\033\n\026GetPartitionStatistics\020\371\003\022\r\n\010Retriev" + "e\020\372\003\022\023\n\016RetrieveResult\020\373\003\022\024\n\017WatchDmChan" + "nels\020\374\003\022\025\n\020RemoveDmChannels\020\375\003\022\027\n\022WatchQ" + "ueryChannels\020\376\003\022\030\n\023RemoveQueryChannels\020\377" + "\003\022\020\n\013SegmentInfo\020\330\004\022\r\n\010TimeTick\020\260\t\022\023\n\016Qu" + "eryNodeStats\020\261\t\022\016\n\tLoadIndex\020\262\t\022\016\n\tReque" + "stID\020\263\t\022\017\n\nRequestTSO\020\264\t\022\024\n\017AllocateSegm" + "ent\020\265\t\022\026\n\021SegmentStatistics\020\266\t\022\025\n\020Segmen" + "tFlushDone\020\267\t\022\017\n\nDataNodeTt\020\270\t*\"\n\007DslTyp" + "e\022\007\n\003Dsl\020\000\022\016\n\nBoolExprV1\020\001B5Z3github.com" + "/milvus-io/milvus/internal/proto/commonp" + "bb\006proto3" ; static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_common_2eproto_deps[1] = { }; -static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_common_2eproto_sccs[6] = { +static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_common_2eproto_sccs[7] = { &scc_info_Address_common_2eproto.base, &scc_info_Blob_common_2eproto.base, + &scc_info_DMLMsgHeader_common_2eproto.base, &scc_info_KeyValuePair_common_2eproto.base, &scc_info_MsgBase_common_2eproto.base, &scc_info_MsgHeader_common_2eproto.base, @@ -271,10 +302,10 @@ static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_com static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_common_2eproto_once; static bool descriptor_table_common_2eproto_initialized = false; const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_common_2eproto = { - &descriptor_table_common_2eproto_initialized, descriptor_table_protodef_common_2eproto, "common.proto", 2330, - &descriptor_table_common_2eproto_once, descriptor_table_common_2eproto_sccs, descriptor_table_common_2eproto_deps, 6, 0, + &descriptor_table_common_2eproto_initialized, descriptor_table_protodef_common_2eproto, "common.proto", 2409, + &descriptor_table_common_2eproto_once, descriptor_table_common_2eproto_sccs, descriptor_table_common_2eproto_deps, 7, 0, schemas, file_default_instances, TableStruct_common_2eproto::offsets, - file_level_metadata_common_2eproto, 6, file_level_enum_descriptors_common_2eproto, file_level_service_descriptors_common_2eproto, + file_level_metadata_common_2eproto, 7, file_level_enum_descriptors_common_2eproto, file_level_service_descriptors_common_2eproto, }; // Force running AddDescriptors() at dynamic initialization time. @@ -2301,6 +2332,335 @@ void MsgHeader::InternalSwap(MsgHeader* other) { } +// =================================================================== + +void DMLMsgHeader::InitAsDefaultInstance() { + ::milvus::proto::common::_DMLMsgHeader_default_instance_._instance.get_mutable()->base_ = const_cast< ::milvus::proto::common::MsgBase*>( + ::milvus::proto::common::MsgBase::internal_default_instance()); +} +class DMLMsgHeader::_Internal { + public: + static const ::milvus::proto::common::MsgBase& base(const DMLMsgHeader* msg); +}; + +const ::milvus::proto::common::MsgBase& +DMLMsgHeader::_Internal::base(const DMLMsgHeader* msg) { + return *msg->base_; +} +DMLMsgHeader::DMLMsgHeader() + : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { + SharedCtor(); + // @@protoc_insertion_point(constructor:milvus.proto.common.DMLMsgHeader) +} +DMLMsgHeader::DMLMsgHeader(const DMLMsgHeader& from) + : ::PROTOBUF_NAMESPACE_ID::Message(), + _internal_metadata_(nullptr) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + shardname_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + if (!from.shardname().empty()) { + shardname_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.shardname_); + } + if (from.has_base()) { + base_ = new ::milvus::proto::common::MsgBase(*from.base_); + } else { + base_ = nullptr; + } + // @@protoc_insertion_point(copy_constructor:milvus.proto.common.DMLMsgHeader) +} + +void DMLMsgHeader::SharedCtor() { + ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_DMLMsgHeader_common_2eproto.base); + shardname_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + base_ = nullptr; +} + +DMLMsgHeader::~DMLMsgHeader() { + // @@protoc_insertion_point(destructor:milvus.proto.common.DMLMsgHeader) + SharedDtor(); +} + +void DMLMsgHeader::SharedDtor() { + shardname_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + if (this != internal_default_instance()) delete base_; +} + +void DMLMsgHeader::SetCachedSize(int size) const { + _cached_size_.Set(size); +} +const DMLMsgHeader& DMLMsgHeader::default_instance() { + ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_DMLMsgHeader_common_2eproto.base); + return *internal_default_instance(); +} + + +void DMLMsgHeader::Clear() { +// @@protoc_insertion_point(message_clear_start:milvus.proto.common.DMLMsgHeader) + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + shardname_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + if (GetArenaNoVirtual() == nullptr && base_ != nullptr) { + delete base_; + } + base_ = nullptr; + _internal_metadata_.Clear(); +} + +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* DMLMsgHeader::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + while (!ctx->Done(&ptr)) { + ::PROTOBUF_NAMESPACE_ID::uint32 tag; + ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + CHK_(ptr); + switch (tag >> 3) { + // .milvus.proto.common.MsgBase base = 1; + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 10)) { + ptr = ctx->ParseMessage(mutable_base(), ptr); + CHK_(ptr); + } else goto handle_unusual; + continue; + // string shardName = 2; + case 2: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 18)) { + ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(mutable_shardname(), ptr, ctx, "milvus.proto.common.DMLMsgHeader.shardName"); + CHK_(ptr); + } else goto handle_unusual; + continue; + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->SetLastTag(tag); + goto success; + } + ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx); + CHK_(ptr != nullptr); + continue; + } + } // switch + } // while +success: + return ptr; +failure: + ptr = nullptr; + goto success; +#undef CHK_ +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool DMLMsgHeader::MergePartialFromCodedStream( + ::PROTOBUF_NAMESPACE_ID::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::PROTOBUF_NAMESPACE_ID::uint32 tag; + // @@protoc_insertion_point(parse_start:milvus.proto.common.DMLMsgHeader) + for (;;) { + ::std::pair<::PROTOBUF_NAMESPACE_ID::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // .milvus.proto.common.MsgBase base = 1; + case 1: { + if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (10 & 0xFF)) { + DO_(::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::ReadMessage( + input, mutable_base())); + } else { + goto handle_unusual; + } + break; + } + + // string shardName = 2; + case 2: { + if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (18 & 0xFF)) { + DO_(::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::ReadString( + input, this->mutable_shardname())); + DO_(::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->shardname().data(), static_cast(this->shardname().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::PARSE, + "milvus.proto.common.DMLMsgHeader.shardName")); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:milvus.proto.common.DMLMsgHeader) + return true; +failure: + // @@protoc_insertion_point(parse_failure:milvus.proto.common.DMLMsgHeader) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void DMLMsgHeader::SerializeWithCachedSizes( + ::PROTOBUF_NAMESPACE_ID::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:milvus.proto.common.DMLMsgHeader) + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // .milvus.proto.common.MsgBase base = 1; + if (this->has_base()) { + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, _Internal::base(this), output); + } + + // string shardName = 2; + if (this->shardname().size() > 0) { + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->shardname().data(), static_cast(this->shardname().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, + "milvus.proto.common.DMLMsgHeader.shardName"); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteStringMaybeAliased( + 2, this->shardname(), output); + } + + if (_internal_metadata_.have_unknown_fields()) { + ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:milvus.proto.common.DMLMsgHeader) +} + +::PROTOBUF_NAMESPACE_ID::uint8* DMLMsgHeader::InternalSerializeWithCachedSizesToArray( + ::PROTOBUF_NAMESPACE_ID::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:milvus.proto.common.DMLMsgHeader) + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // .milvus.proto.common.MsgBase base = 1; + if (this->has_base()) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + InternalWriteMessageToArray( + 1, _Internal::base(this), target); + } + + // string shardName = 2; + if (this->shardname().size() > 0) { + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->shardname().data(), static_cast(this->shardname().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, + "milvus.proto.common.DMLMsgHeader.shardName"); + target = + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteStringToArray( + 2, this->shardname(), target); + } + + if (_internal_metadata_.have_unknown_fields()) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:milvus.proto.common.DMLMsgHeader) + return target; +} + +size_t DMLMsgHeader::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:milvus.proto.common.DMLMsgHeader) + size_t total_size = 0; + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + // string shardName = 2; + if (this->shardname().size() > 0) { + total_size += 1 + + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + this->shardname()); + } + + // .milvus.proto.common.MsgBase base = 1; + if (this->has_base()) { + total_size += 1 + + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + *base_); + } + + int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size); + SetCachedSize(cached_size); + return total_size; +} + +void DMLMsgHeader::MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:milvus.proto.common.DMLMsgHeader) + GOOGLE_DCHECK_NE(&from, this); + const DMLMsgHeader* source = + ::PROTOBUF_NAMESPACE_ID::DynamicCastToGenerated( + &from); + if (source == nullptr) { + // @@protoc_insertion_point(generalized_merge_from_cast_fail:milvus.proto.common.DMLMsgHeader) + ::PROTOBUF_NAMESPACE_ID::internal::ReflectionOps::Merge(from, this); + } else { + // @@protoc_insertion_point(generalized_merge_from_cast_success:milvus.proto.common.DMLMsgHeader) + MergeFrom(*source); + } +} + +void DMLMsgHeader::MergeFrom(const DMLMsgHeader& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:milvus.proto.common.DMLMsgHeader) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + if (from.shardname().size() > 0) { + + shardname_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.shardname_); + } + if (from.has_base()) { + mutable_base()->::milvus::proto::common::MsgBase::MergeFrom(from.base()); + } +} + +void DMLMsgHeader::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:milvus.proto.common.DMLMsgHeader) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void DMLMsgHeader::CopyFrom(const DMLMsgHeader& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:milvus.proto.common.DMLMsgHeader) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool DMLMsgHeader::IsInitialized() const { + return true; +} + +void DMLMsgHeader::InternalSwap(DMLMsgHeader* other) { + using std::swap; + _internal_metadata_.Swap(&other->_internal_metadata_); + shardname_.Swap(&other->shardname_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + GetArenaNoVirtual()); + swap(base_, other->base_); +} + +::PROTOBUF_NAMESPACE_ID::Metadata DMLMsgHeader::GetMetadata() const { + return GetMetadataStatic(); +} + + // @@protoc_insertion_point(namespace_scope) } // namespace common } // namespace proto @@ -2324,6 +2684,9 @@ template<> PROTOBUF_NOINLINE ::milvus::proto::common::MsgBase* Arena::CreateMayb template<> PROTOBUF_NOINLINE ::milvus::proto::common::MsgHeader* Arena::CreateMaybeMessage< ::milvus::proto::common::MsgHeader >(Arena* arena) { return Arena::CreateInternal< ::milvus::proto::common::MsgHeader >(arena); } +template<> PROTOBUF_NOINLINE ::milvus::proto::common::DMLMsgHeader* Arena::CreateMaybeMessage< ::milvus::proto::common::DMLMsgHeader >(Arena* arena) { + return Arena::CreateInternal< ::milvus::proto::common::DMLMsgHeader >(arena); +} PROTOBUF_NAMESPACE_CLOSE // @@protoc_insertion_point(global_scope) diff --git a/internal/core/src/pb/common.pb.h b/internal/core/src/pb/common.pb.h index 2ed078d67f..25f1ee61ba 100644 --- a/internal/core/src/pb/common.pb.h +++ b/internal/core/src/pb/common.pb.h @@ -48,7 +48,7 @@ struct TableStruct_common_2eproto { PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::PROTOBUF_NAMESPACE_ID::internal::AuxillaryParseTableField aux[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTable schema[6] + static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTable schema[7] PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::PROTOBUF_NAMESPACE_ID::internal::FieldMetadata field_metadata[]; static const ::PROTOBUF_NAMESPACE_ID::internal::SerializationTable serialization_table[]; @@ -64,6 +64,9 @@ extern AddressDefaultTypeInternal _Address_default_instance_; class Blob; class BlobDefaultTypeInternal; extern BlobDefaultTypeInternal _Blob_default_instance_; +class DMLMsgHeader; +class DMLMsgHeaderDefaultTypeInternal; +extern DMLMsgHeaderDefaultTypeInternal _DMLMsgHeader_default_instance_; class KeyValuePair; class KeyValuePairDefaultTypeInternal; extern KeyValuePairDefaultTypeInternal _KeyValuePair_default_instance_; @@ -82,6 +85,7 @@ extern StatusDefaultTypeInternal _Status_default_instance_; PROTOBUF_NAMESPACE_OPEN template<> ::milvus::proto::common::Address* Arena::CreateMaybeMessage<::milvus::proto::common::Address>(Arena*); template<> ::milvus::proto::common::Blob* Arena::CreateMaybeMessage<::milvus::proto::common::Blob>(Arena*); +template<> ::milvus::proto::common::DMLMsgHeader* Arena::CreateMaybeMessage<::milvus::proto::common::DMLMsgHeader>(Arena*); template<> ::milvus::proto::common::KeyValuePair* Arena::CreateMaybeMessage<::milvus::proto::common::KeyValuePair>(Arena*); template<> ::milvus::proto::common::MsgBase* Arena::CreateMaybeMessage<::milvus::proto::common::MsgBase>(Arena*); template<> ::milvus::proto::common::MsgHeader* Arena::CreateMaybeMessage<::milvus::proto::common::MsgHeader>(Arena*); @@ -1160,6 +1164,153 @@ class MsgHeader : mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; friend struct ::TableStruct_common_2eproto; }; +// ------------------------------------------------------------------- + +class DMLMsgHeader : + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:milvus.proto.common.DMLMsgHeader) */ { + public: + DMLMsgHeader(); + virtual ~DMLMsgHeader(); + + DMLMsgHeader(const DMLMsgHeader& from); + DMLMsgHeader(DMLMsgHeader&& from) noexcept + : DMLMsgHeader() { + *this = ::std::move(from); + } + + inline DMLMsgHeader& operator=(const DMLMsgHeader& from) { + CopyFrom(from); + return *this; + } + inline DMLMsgHeader& operator=(DMLMsgHeader&& from) noexcept { + if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { + if (this != &from) InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } + + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return GetMetadataStatic().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return GetMetadataStatic().reflection; + } + static const DMLMsgHeader& default_instance(); + + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY + static inline const DMLMsgHeader* internal_default_instance() { + return reinterpret_cast( + &_DMLMsgHeader_default_instance_); + } + static constexpr int kIndexInFileMessages = + 6; + + friend void swap(DMLMsgHeader& a, DMLMsgHeader& b) { + a.Swap(&b); + } + inline void Swap(DMLMsgHeader* other) { + if (other == this) return; + InternalSwap(other); + } + + // implements Message ---------------------------------------------- + + inline DMLMsgHeader* New() const final { + return CreateMaybeMessage(nullptr); + } + + DMLMsgHeader* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + return CreateMaybeMessage(arena); + } + void CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void CopyFrom(const DMLMsgHeader& from); + void MergeFrom(const DMLMsgHeader& from); + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + #else + bool MergePartialFromCodedStream( + ::PROTOBUF_NAMESPACE_ID::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::PROTOBUF_NAMESPACE_ID::io::CodedOutputStream* output) const final; + ::PROTOBUF_NAMESPACE_ID::uint8* InternalSerializeWithCachedSizesToArray( + ::PROTOBUF_NAMESPACE_ID::uint8* target) const final; + int GetCachedSize() const final { return _cached_size_.Get(); } + + private: + inline void SharedCtor(); + inline void SharedDtor(); + void SetCachedSize(int size) const final; + void InternalSwap(DMLMsgHeader* other); + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "milvus.proto.common.DMLMsgHeader"; + } + private: + inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArenaNoVirtual() const { + return nullptr; + } + inline void* MaybeArenaPtr() const { + return nullptr; + } + public: + + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + private: + static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { + ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_common_2eproto); + return ::descriptor_table_common_2eproto.file_level_metadata[kIndexInFileMessages]; + } + + public: + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + enum : int { + kShardNameFieldNumber = 2, + kBaseFieldNumber = 1, + }; + // string shardName = 2; + void clear_shardname(); + const std::string& shardname() const; + void set_shardname(const std::string& value); + void set_shardname(std::string&& value); + void set_shardname(const char* value); + void set_shardname(const char* value, size_t size); + std::string* mutable_shardname(); + std::string* release_shardname(); + void set_allocated_shardname(std::string* shardname); + + // .milvus.proto.common.MsgBase base = 1; + bool has_base() const; + void clear_base(); + const ::milvus::proto::common::MsgBase& base() const; + ::milvus::proto::common::MsgBase* release_base(); + ::milvus::proto::common::MsgBase* mutable_base(); + void set_allocated_base(::milvus::proto::common::MsgBase* base); + + // @@protoc_insertion_point(class_scope:milvus.proto.common.DMLMsgHeader) + private: + class _Internal; + + ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr shardname_; + ::milvus::proto::common::MsgBase* base_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + friend struct ::TableStruct_common_2eproto; +}; // =================================================================== @@ -1581,6 +1732,112 @@ inline void MsgHeader::set_allocated_base(::milvus::proto::common::MsgBase* base // @@protoc_insertion_point(field_set_allocated:milvus.proto.common.MsgHeader.base) } +// ------------------------------------------------------------------- + +// DMLMsgHeader + +// .milvus.proto.common.MsgBase base = 1; +inline bool DMLMsgHeader::has_base() const { + return this != internal_default_instance() && base_ != nullptr; +} +inline void DMLMsgHeader::clear_base() { + if (GetArenaNoVirtual() == nullptr && base_ != nullptr) { + delete base_; + } + base_ = nullptr; +} +inline const ::milvus::proto::common::MsgBase& DMLMsgHeader::base() const { + const ::milvus::proto::common::MsgBase* p = base_; + // @@protoc_insertion_point(field_get:milvus.proto.common.DMLMsgHeader.base) + return p != nullptr ? *p : *reinterpret_cast( + &::milvus::proto::common::_MsgBase_default_instance_); +} +inline ::milvus::proto::common::MsgBase* DMLMsgHeader::release_base() { + // @@protoc_insertion_point(field_release:milvus.proto.common.DMLMsgHeader.base) + + ::milvus::proto::common::MsgBase* temp = base_; + base_ = nullptr; + return temp; +} +inline ::milvus::proto::common::MsgBase* DMLMsgHeader::mutable_base() { + + if (base_ == nullptr) { + auto* p = CreateMaybeMessage<::milvus::proto::common::MsgBase>(GetArenaNoVirtual()); + base_ = p; + } + // @@protoc_insertion_point(field_mutable:milvus.proto.common.DMLMsgHeader.base) + return base_; +} +inline void DMLMsgHeader::set_allocated_base(::milvus::proto::common::MsgBase* base) { + ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaNoVirtual(); + if (message_arena == nullptr) { + delete base_; + } + if (base) { + ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = nullptr; + if (message_arena != submessage_arena) { + base = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( + message_arena, base, submessage_arena); + } + + } else { + + } + base_ = base; + // @@protoc_insertion_point(field_set_allocated:milvus.proto.common.DMLMsgHeader.base) +} + +// string shardName = 2; +inline void DMLMsgHeader::clear_shardname() { + shardname_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); +} +inline const std::string& DMLMsgHeader::shardname() const { + // @@protoc_insertion_point(field_get:milvus.proto.common.DMLMsgHeader.shardName) + return shardname_.GetNoArena(); +} +inline void DMLMsgHeader::set_shardname(const std::string& value) { + + shardname_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value); + // @@protoc_insertion_point(field_set:milvus.proto.common.DMLMsgHeader.shardName) +} +inline void DMLMsgHeader::set_shardname(std::string&& value) { + + shardname_.SetNoArena( + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:milvus.proto.common.DMLMsgHeader.shardName) +} +inline void DMLMsgHeader::set_shardname(const char* value) { + GOOGLE_DCHECK(value != nullptr); + + shardname_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + // @@protoc_insertion_point(field_set_char:milvus.proto.common.DMLMsgHeader.shardName) +} +inline void DMLMsgHeader::set_shardname(const char* value, size_t size) { + + shardname_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + ::std::string(reinterpret_cast(value), size)); + // @@protoc_insertion_point(field_set_pointer:milvus.proto.common.DMLMsgHeader.shardName) +} +inline std::string* DMLMsgHeader::mutable_shardname() { + + // @@protoc_insertion_point(field_mutable:milvus.proto.common.DMLMsgHeader.shardName) + return shardname_.MutableNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); +} +inline std::string* DMLMsgHeader::release_shardname() { + // @@protoc_insertion_point(field_release:milvus.proto.common.DMLMsgHeader.shardName) + + return shardname_.ReleaseNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); +} +inline void DMLMsgHeader::set_allocated_shardname(std::string* shardname) { + if (shardname != nullptr) { + + } else { + + } + shardname_.SetAllocatedNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), shardname); + // @@protoc_insertion_point(field_set_allocated:milvus.proto.common.DMLMsgHeader.shardName) +} + #ifdef __GNUC__ #pragma GCC diagnostic pop #endif // __GNUC__ @@ -1594,6 +1851,8 @@ inline void MsgHeader::set_allocated_base(::milvus::proto::common::MsgBase* base // ------------------------------------------------------------------- +// ------------------------------------------------------------------- + // @@protoc_insertion_point(namespace_scope) diff --git a/internal/datanode/flow_graph_insert_buffer_node.go b/internal/datanode/flow_graph_insert_buffer_node.go index 8eabf06506..ec23e0d4cc 100644 --- a/internal/datanode/flow_graph_insert_buffer_node.go +++ b/internal/datanode/flow_graph_insert_buffer_node.go @@ -355,14 +355,14 @@ func (ibNode *insertBufferNode) updateSegStatesInReplica(insertMsgs []*msgstream partitionID := msg.GetPartitionID() if !ibNode.replica.hasSegment(currentSegID, true) { - err = ibNode.replica.addNewSegment(currentSegID, collID, partitionID, msg.GetChannelID(), + err = ibNode.replica.addNewSegment(currentSegID, collID, partitionID, msg.GetShardName(), startPos, endPos) if err != nil { log.Error("add segment wrong", zap.Int64("segID", currentSegID), zap.Int64("collID", collID), zap.Int64("partID", partitionID), - zap.String("chanName", msg.GetChannelID()), + zap.String("chanName", msg.GetShardName()), zap.Error(err)) return } diff --git a/internal/datanode/mock_test.go b/internal/datanode/mock_test.go index 9239a1a200..f72bbb5f1d 100644 --- a/internal/datanode/mock_test.go +++ b/internal/datanode/mock_test.go @@ -392,7 +392,7 @@ func (df *DataFactory) GenMsgStreamInsertMsg(idx int, chanName string) *msgstrea CollectionName: "col1", PartitionName: "default", SegmentID: 1, - ChannelID: chanName, + ShardName: chanName, Timestamps: []Timestamp{Timestamp(idx + 1000)}, RowIDs: []UniqueID{UniqueID(idx)}, RowData: []*commonpb.Blob{{Value: df.rawData}}, diff --git a/internal/msgstream/mq_msgstream_test.go b/internal/msgstream/mq_msgstream_test.go index 73a03e4ae0..9f3e59537a 100644 --- a/internal/msgstream/mq_msgstream_test.go +++ b/internal/msgstream/mq_msgstream_test.go @@ -267,7 +267,7 @@ func TestStream_PulsarMsgStream_InsertRepackFunc(t *testing.T) { CollectionName: "Collection", PartitionName: "Partition", SegmentID: 1, - ChannelID: "1", + ShardName: "1", Timestamps: []Timestamp{1, 1}, RowIDs: []int64{1, 3}, RowData: []*commonpb.Blob{{}, {}}, @@ -988,7 +988,7 @@ func getTsMsg(msgType MsgType, reqID UniqueID) TsMsg { CollectionName: "Collection", PartitionName: "Partition", SegmentID: 1, - ChannelID: "0", + ShardName: "0", Timestamps: []Timestamp{time}, RowIDs: []int64{1}, RowData: []*commonpb.Blob{{}}, @@ -1007,7 +1007,7 @@ func getTsMsg(msgType MsgType, reqID UniqueID) TsMsg { SourceID: reqID, }, CollectionName: "Collection", - ChannelID: "1", + ShardName: "1", Timestamp: Timestamp(1), } deleteMsg := &DeleteMsg{ diff --git a/internal/msgstream/msg_test.go b/internal/msgstream/msg_test.go index 90f8cfbfb4..8287b84a40 100644 --- a/internal/msgstream/msg_test.go +++ b/internal/msgstream/msg_test.go @@ -94,7 +94,7 @@ func TestInsertMsg(t *testing.T) { CollectionID: 5, PartitionID: 6, SegmentID: 7, - ChannelID: "test-channel", + ShardName: "test-channel", Timestamps: []uint64{2, 1, 3}, RowData: []*commonpb.Blob{}, }, @@ -142,7 +142,7 @@ func TestDeleteMsg(t *testing.T) { }, CollectionName: "test_collection", - ChannelID: "test-channel", + ShardName: "test-channel", Timestamp: uint64(1), }, } diff --git a/internal/msgstream/repack_func.go b/internal/msgstream/repack_func.go index d794932950..83bc7295e6 100644 --- a/internal/msgstream/repack_func.go +++ b/internal/msgstream/repack_func.go @@ -56,7 +56,7 @@ func InsertRepackFunc(tsMsgs []TsMsg, hashKeys [][]int32) (map[int32]*MsgPack, e CollectionName: insertRequest.CollectionName, PartitionName: insertRequest.PartitionName, SegmentID: insertRequest.SegmentID, - ChannelID: insertRequest.ChannelID, + ShardName: insertRequest.ShardName, Timestamps: []uint64{insertRequest.Timestamps[index]}, RowIDs: []int64{insertRequest.RowIDs[index]}, RowData: []*commonpb.Blob{insertRequest.RowData[index]}, diff --git a/internal/msgstream/unmarshal_test.go b/internal/msgstream/unmarshal_test.go index f261acbf7b..df412a51eb 100644 --- a/internal/msgstream/unmarshal_test.go +++ b/internal/msgstream/unmarshal_test.go @@ -52,7 +52,7 @@ func Test_ProtoUnmarshalDispatcher(t *testing.T) { CollectionName: "Collection", PartitionName: "Partition", SegmentID: 1, - ChannelID: "0", + ShardName: "0", Timestamps: []Timestamp{uint64(1)}, RowIDs: []int64{1}, RowData: []*commonpb.Blob{{}}, diff --git a/internal/proto/common.proto b/internal/proto/common.proto index 9d8373253d..45c6131572 100644 --- a/internal/proto/common.proto +++ b/internal/proto/common.proto @@ -161,3 +161,9 @@ enum DslType { message MsgHeader { common.MsgBase base = 1; } + +// Don't Modify This. @czs +message DMLMsgHeader { + common.MsgBase base = 1; + string shardName = 2; +} \ No newline at end of file diff --git a/internal/proto/commonpb/common.pb.go b/internal/proto/commonpb/common.pb.go index 5456159d90..c9e0f9713b 100644 --- a/internal/proto/commonpb/common.pb.go +++ b/internal/proto/commonpb/common.pb.go @@ -686,6 +686,54 @@ func (m *MsgHeader) GetBase() *MsgBase { return nil } +// Don't Modify This. @czs +type DMLMsgHeader struct { + Base *MsgBase `protobuf:"bytes,1,opt,name=base,proto3" json:"base,omitempty"` + ShardName string `protobuf:"bytes,2,opt,name=shardName,proto3" json:"shardName,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *DMLMsgHeader) Reset() { *m = DMLMsgHeader{} } +func (m *DMLMsgHeader) String() string { return proto.CompactTextString(m) } +func (*DMLMsgHeader) ProtoMessage() {} +func (*DMLMsgHeader) Descriptor() ([]byte, []int) { + return fileDescriptor_555bd8c177793206, []int{6} +} + +func (m *DMLMsgHeader) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_DMLMsgHeader.Unmarshal(m, b) +} +func (m *DMLMsgHeader) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_DMLMsgHeader.Marshal(b, m, deterministic) +} +func (m *DMLMsgHeader) XXX_Merge(src proto.Message) { + xxx_messageInfo_DMLMsgHeader.Merge(m, src) +} +func (m *DMLMsgHeader) XXX_Size() int { + return xxx_messageInfo_DMLMsgHeader.Size(m) +} +func (m *DMLMsgHeader) XXX_DiscardUnknown() { + xxx_messageInfo_DMLMsgHeader.DiscardUnknown(m) +} + +var xxx_messageInfo_DMLMsgHeader proto.InternalMessageInfo + +func (m *DMLMsgHeader) GetBase() *MsgBase { + if m != nil { + return m.Base + } + return nil +} + +func (m *DMLMsgHeader) GetShardName() string { + if m != nil { + return m.ShardName + } + return "" +} + func init() { proto.RegisterEnum("milvus.proto.common.ErrorCode", ErrorCode_name, ErrorCode_value) proto.RegisterEnum("milvus.proto.common.IndexState", IndexState_name, IndexState_value) @@ -698,92 +746,95 @@ func init() { proto.RegisterType((*Address)(nil), "milvus.proto.common.Address") proto.RegisterType((*MsgBase)(nil), "milvus.proto.common.MsgBase") proto.RegisterType((*MsgHeader)(nil), "milvus.proto.common.MsgHeader") + proto.RegisterType((*DMLMsgHeader)(nil), "milvus.proto.common.DMLMsgHeader") } func init() { proto.RegisterFile("common.proto", fileDescriptor_555bd8c177793206) } var fileDescriptor_555bd8c177793206 = []byte{ - // 1310 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x55, 0xdb, 0x6e, 0x1b, 0xb7, - 0x16, 0xf5, 0x68, 0x64, 0xcb, 0xa2, 0x65, 0x9b, 0xa6, 0x2f, 0x71, 0x72, 0x8c, 0x83, 0xc0, 0x4f, - 0x81, 0x81, 0xd8, 0xe7, 0x9c, 0xe0, 0xb4, 0x4f, 0x79, 0xb0, 0x35, 0xbe, 0x08, 0x89, 0x2f, 0x1d, - 0x39, 0x69, 0xd1, 0x97, 0x80, 0x9e, 0xd9, 0x92, 0xd8, 0xcc, 0x90, 0x2a, 0xc9, 0x71, 0xac, 0xbf, - 0x68, 0xf3, 0x1d, 0x6d, 0xd1, 0x4b, 0x7a, 0x41, 0xbf, 0xa0, 0xf7, 0xe7, 0x7e, 0x42, 0x3f, 0xa0, - 0xd7, 0x5c, 0x8b, 0xcd, 0x19, 0x49, 0x13, 0x20, 0x7d, 0x9b, 0xbd, 0xb8, 0xb9, 0xb8, 0xf6, 0xda, - 0x9b, 0x1c, 0xd2, 0x88, 0x54, 0x9a, 0x2a, 0xb9, 0xd9, 0xd7, 0xca, 0x2a, 0xb6, 0x98, 0x8a, 0xe4, - 0x3c, 0x33, 0x79, 0xb4, 0x99, 0x2f, 0xad, 0xdf, 0x23, 0x53, 0x6d, 0xcb, 0x6d, 0x66, 0xd8, 0x4d, - 0x42, 0x40, 0x6b, 0xa5, 0xef, 0x45, 0x2a, 0x86, 0x55, 0xef, 0xaa, 0x77, 0x6d, 0xee, 0x7f, 0xff, - 0xde, 0x7c, 0xc5, 0x9e, 0xcd, 0x5d, 0x4c, 0x6b, 0xaa, 0x18, 0xc2, 0x3a, 0x0c, 0x3f, 0xd9, 0x0a, - 0x99, 0xd2, 0xc0, 0x8d, 0x92, 0xab, 0x95, 0xab, 0xde, 0xb5, 0x7a, 0x58, 0x44, 0xeb, 0xaf, 0x91, - 0xc6, 0x2d, 0x18, 0xdc, 0xe5, 0x49, 0x06, 0x27, 0x5c, 0x68, 0x46, 0x89, 0x7f, 0x1f, 0x06, 0x8e, - 0xbf, 0x1e, 0xe2, 0x27, 0x5b, 0x22, 0x93, 0xe7, 0xb8, 0x5c, 0x6c, 0xcc, 0x83, 0xf5, 0x35, 0x52, - 0xdd, 0x49, 0xd4, 0xd9, 0x78, 0x15, 0x77, 0x34, 0x86, 0xab, 0xd7, 0x49, 0x6d, 0x3b, 0x8e, 0x35, - 0x18, 0xc3, 0xe6, 0x48, 0x45, 0xf4, 0x0b, 0xbe, 0x8a, 0xe8, 0x33, 0x46, 0xaa, 0x7d, 0xa5, 0xad, - 0x63, 0xf3, 0x43, 0xf7, 0xbd, 0xfe, 0xd0, 0x23, 0xb5, 0x43, 0xd3, 0xdd, 0xe1, 0x06, 0xd8, 0xeb, - 0x64, 0x3a, 0x35, 0xdd, 0x7b, 0x76, 0xd0, 0x1f, 0x56, 0xb9, 0xf6, 0xca, 0x2a, 0x0f, 0x4d, 0xf7, - 0x74, 0xd0, 0x87, 0xb0, 0x96, 0xe6, 0x1f, 0xa8, 0x24, 0x35, 0xdd, 0x56, 0x50, 0x30, 0xe7, 0x01, - 0x5b, 0x23, 0x75, 0x2b, 0x52, 0x30, 0x96, 0xa7, 0xfd, 0x55, 0xff, 0xaa, 0x77, 0xad, 0x1a, 0x8e, - 0x01, 0x76, 0x85, 0x4c, 0x1b, 0x95, 0xe9, 0x08, 0x5a, 0xc1, 0x6a, 0xd5, 0x6d, 0x1b, 0xc5, 0xeb, - 0x37, 0x49, 0xfd, 0xd0, 0x74, 0x0f, 0x80, 0xc7, 0xa0, 0xd9, 0x7f, 0x48, 0xf5, 0x8c, 0x9b, 0x5c, - 0xd1, 0xcc, 0x3f, 0x2b, 0xc2, 0x0a, 0x42, 0x97, 0xb9, 0xf1, 0x75, 0x95, 0xd4, 0x47, 0x9d, 0x60, - 0x33, 0xa4, 0xd6, 0xce, 0xa2, 0x08, 0x8c, 0xa1, 0x13, 0x6c, 0x91, 0xcc, 0xdf, 0x91, 0x70, 0xd1, - 0x87, 0xc8, 0x42, 0xec, 0x72, 0xa8, 0xc7, 0x16, 0xc8, 0x6c, 0x53, 0x49, 0x09, 0x91, 0xdd, 0xe3, - 0x22, 0x81, 0x98, 0x56, 0xd8, 0x12, 0xa1, 0x27, 0xa0, 0x53, 0x61, 0x8c, 0x50, 0x32, 0x00, 0x29, - 0x20, 0xa6, 0x3e, 0xbb, 0x44, 0x16, 0x9b, 0x2a, 0x49, 0x20, 0xb2, 0x42, 0xc9, 0x23, 0x65, 0x77, - 0x2f, 0x84, 0xb1, 0x86, 0x56, 0x91, 0xb6, 0x95, 0x24, 0xd0, 0xe5, 0xc9, 0xb6, 0xee, 0x66, 0x29, - 0x48, 0x4b, 0x27, 0x91, 0xa3, 0x00, 0x03, 0x91, 0x82, 0x44, 0x26, 0x5a, 0x2b, 0xa1, 0x2d, 0x19, - 0xc3, 0x05, 0xfa, 0x47, 0xa7, 0xd9, 0x65, 0xb2, 0x5c, 0xa0, 0xa5, 0x03, 0x78, 0x0a, 0xb4, 0xce, - 0xe6, 0xc9, 0x4c, 0xb1, 0x74, 0x7a, 0x7c, 0x72, 0x8b, 0x92, 0x12, 0x43, 0xa8, 0x1e, 0x84, 0x10, - 0x29, 0x1d, 0xd3, 0x99, 0x92, 0x84, 0xbb, 0x10, 0x59, 0xa5, 0x5b, 0x01, 0x6d, 0xa0, 0xe0, 0x02, - 0x6c, 0x03, 0xd7, 0x51, 0x2f, 0x04, 0x93, 0x25, 0x96, 0xce, 0x32, 0x4a, 0x1a, 0x7b, 0x22, 0x81, - 0x23, 0x65, 0xf7, 0x54, 0x26, 0x63, 0x3a, 0xc7, 0xe6, 0x08, 0x39, 0x04, 0xcb, 0x0b, 0x07, 0xe6, - 0xf1, 0xd8, 0x26, 0x8f, 0x7a, 0x50, 0x00, 0x94, 0xad, 0x10, 0xd6, 0xe4, 0x52, 0x2a, 0xdb, 0xd4, - 0xc0, 0x2d, 0xec, 0xa9, 0x24, 0x06, 0x4d, 0x17, 0x50, 0xce, 0x4b, 0xb8, 0x48, 0x80, 0xb2, 0x71, - 0x76, 0x00, 0x09, 0x8c, 0xb2, 0x17, 0xc7, 0xd9, 0x05, 0x8e, 0xd9, 0x4b, 0x28, 0x7e, 0x27, 0x13, - 0x49, 0xec, 0x2c, 0xc9, 0xdb, 0xb2, 0x8c, 0x1a, 0x0b, 0xf1, 0x47, 0xb7, 0x5b, 0xed, 0x53, 0xba, - 0xc2, 0x96, 0xc9, 0x42, 0x81, 0x1c, 0x82, 0xd5, 0x22, 0x72, 0xe6, 0x5d, 0x42, 0xa9, 0xc7, 0x99, - 0x3d, 0xee, 0x1c, 0x42, 0xaa, 0xf4, 0x80, 0xae, 0x62, 0x43, 0x1d, 0xd3, 0xb0, 0x45, 0xf4, 0x32, - 0x9e, 0xb0, 0x9b, 0xf6, 0xed, 0x60, 0x6c, 0x2f, 0xbd, 0xc2, 0x18, 0x99, 0x0d, 0x82, 0x10, 0xde, - 0xcd, 0xc0, 0xd8, 0x90, 0x47, 0x40, 0x7f, 0xa9, 0x6d, 0xbc, 0x45, 0x88, 0xdb, 0x8b, 0x77, 0x1f, - 0x18, 0x23, 0x73, 0xe3, 0xe8, 0x48, 0x49, 0xa0, 0x13, 0xac, 0x41, 0xa6, 0xef, 0x48, 0x61, 0x4c, - 0x06, 0x31, 0xf5, 0xd0, 0xb7, 0x96, 0x3c, 0xd1, 0xaa, 0x8b, 0x57, 0x8e, 0x56, 0x70, 0x75, 0x4f, - 0x48, 0x61, 0x7a, 0x6e, 0x62, 0x08, 0x99, 0x2a, 0x0c, 0xac, 0x6e, 0x74, 0x48, 0xa3, 0x0d, 0x5d, - 0x1c, 0x8e, 0x9c, 0x7b, 0x89, 0xd0, 0x72, 0x3c, 0x66, 0x1f, 0xc9, 0xf6, 0x70, 0x78, 0xf7, 0xb5, - 0x7a, 0x20, 0x64, 0x97, 0x56, 0x90, 0xac, 0x0d, 0x3c, 0x71, 0xc4, 0x33, 0xa4, 0xb6, 0x97, 0x64, - 0xee, 0x94, 0xaa, 0x3b, 0x13, 0x03, 0x4c, 0x9b, 0xdc, 0x78, 0x34, 0xed, 0xae, 0xb4, 0xbb, 0x99, - 0xb3, 0xa4, 0x7e, 0x47, 0xc6, 0xd0, 0x11, 0x12, 0x62, 0x3a, 0xe1, 0xdc, 0x77, 0x5d, 0x2a, 0xd9, - 0x10, 0x63, 0x91, 0x81, 0x56, 0xfd, 0x12, 0x06, 0x68, 0xe1, 0x01, 0x37, 0x25, 0xa8, 0x83, 0x2d, - 0x0d, 0xc0, 0x44, 0x5a, 0x9c, 0x95, 0xb7, 0x77, 0xd1, 0xda, 0x76, 0x4f, 0x3d, 0x18, 0x63, 0x86, - 0xf6, 0xf0, 0xa4, 0x7d, 0xb0, 0xed, 0x81, 0xb1, 0x90, 0x36, 0x95, 0xec, 0x88, 0xae, 0xa1, 0x02, - 0x4f, 0xba, 0xad, 0x78, 0x5c, 0xda, 0xfe, 0x0e, 0x36, 0x35, 0x84, 0x04, 0xb8, 0x29, 0xb3, 0xde, - 0x77, 0xf3, 0xe7, 0xa4, 0x6e, 0x27, 0x82, 0x1b, 0x9a, 0x60, 0x29, 0xa8, 0x32, 0x0f, 0x53, 0xf4, - 0x7d, 0x3b, 0xb1, 0xa0, 0xf3, 0x58, 0xb2, 0x25, 0x32, 0x9f, 0xe7, 0x9f, 0x70, 0x6d, 0x85, 0x23, - 0xf9, 0xc6, 0x73, 0x1d, 0xd6, 0xaa, 0x3f, 0xc6, 0xbe, 0xc5, 0xeb, 0xde, 0x38, 0xe0, 0x66, 0x0c, - 0x7d, 0xe7, 0xb1, 0x15, 0xb2, 0x30, 0x2c, 0x6d, 0x8c, 0x7f, 0xef, 0xb1, 0x45, 0x32, 0x87, 0xa5, - 0x8d, 0x30, 0x43, 0x7f, 0x70, 0x20, 0x16, 0x51, 0x02, 0x7f, 0x74, 0x0c, 0x45, 0x15, 0x25, 0xfc, - 0x27, 0x77, 0x18, 0x32, 0x14, 0x8d, 0x36, 0xf4, 0xb1, 0x87, 0x4a, 0x87, 0x87, 0x15, 0x30, 0x7d, - 0xe2, 0x12, 0x91, 0x75, 0x94, 0xf8, 0xd4, 0x25, 0x16, 0x9c, 0x23, 0xf4, 0x99, 0x43, 0x0f, 0xb8, - 0x8c, 0x55, 0xa7, 0x33, 0x42, 0x9f, 0x7b, 0x6c, 0x95, 0x2c, 0xe2, 0xf6, 0x1d, 0x9e, 0x70, 0x19, - 0x8d, 0xf3, 0x5f, 0x78, 0x8c, 0x0e, 0x8d, 0x74, 0x83, 0x4c, 0x3f, 0xa8, 0x38, 0x53, 0x0a, 0x01, - 0x39, 0xf6, 0x61, 0x85, 0xcd, 0xe5, 0xee, 0xe6, 0xf1, 0x47, 0x15, 0x36, 0x43, 0xa6, 0x5a, 0xd2, - 0x80, 0xb6, 0xf4, 0x3d, 0x1c, 0xb6, 0xa9, 0xfc, 0xba, 0xd2, 0xf7, 0x71, 0xa4, 0x27, 0xdd, 0xb0, - 0xd1, 0x87, 0x6e, 0x21, 0x7f, 0x58, 0xe8, 0xaf, 0xbe, 0x2b, 0xb5, 0xfc, 0xca, 0xfc, 0xe6, 0xe3, - 0x49, 0xfb, 0x60, 0xc7, 0x37, 0x88, 0xfe, 0xee, 0xb3, 0x2b, 0x64, 0x79, 0x88, 0xb9, 0x3b, 0x3f, - 0xba, 0x3b, 0x7f, 0xf8, 0x6c, 0x8d, 0x5c, 0xda, 0x07, 0x3b, 0x9e, 0x03, 0xdc, 0x24, 0x8c, 0x15, - 0x91, 0xa1, 0x7f, 0xfa, 0xec, 0x5f, 0x64, 0x65, 0x1f, 0xec, 0xc8, 0xdf, 0xd2, 0xe2, 0x5f, 0x3e, - 0x9b, 0x25, 0xd3, 0x21, 0x3e, 0x0a, 0x70, 0x0e, 0xf4, 0xb1, 0x8f, 0x4d, 0x1a, 0x86, 0x85, 0x9c, - 0x27, 0x3e, 0x5a, 0xf7, 0x26, 0xb7, 0x51, 0x2f, 0x48, 0x9b, 0x3d, 0x2e, 0x25, 0x24, 0x86, 0x3e, - 0xf5, 0xd9, 0x32, 0xa1, 0x21, 0xa4, 0xea, 0x1c, 0x4a, 0xf0, 0x33, 0x7c, 0xec, 0x99, 0x4b, 0x7e, - 0x23, 0x03, 0x3d, 0x18, 0x2d, 0x3c, 0xf7, 0xd1, 0xea, 0x3c, 0xff, 0xe5, 0x95, 0x17, 0x3e, 0x5a, - 0x5d, 0x38, 0xdf, 0x92, 0x1d, 0x45, 0x7f, 0xae, 0xa2, 0xaa, 0x53, 0x91, 0xc2, 0xa9, 0x88, 0xee, - 0xd3, 0x8f, 0xeb, 0xa8, 0xca, 0x6d, 0x3a, 0x52, 0x31, 0xa0, 0x7c, 0x43, 0x3f, 0xa9, 0xa3, 0xf5, - 0xd8, 0xba, 0xdc, 0xfa, 0x4f, 0x5d, 0x5c, 0xbc, 0x49, 0xad, 0x80, 0x7e, 0x86, 0x3f, 0x00, 0x52, - 0xc4, 0xa7, 0xed, 0x63, 0xfa, 0xa8, 0x8e, 0x65, 0x6c, 0x27, 0x89, 0x8a, 0xb8, 0x1d, 0x0d, 0xd0, - 0xe7, 0x75, 0x9c, 0xc0, 0xd2, 0x73, 0x52, 0x18, 0xf3, 0x45, 0x1d, 0xcb, 0x2b, 0x70, 0xd7, 0xb6, - 0x00, 0x9f, 0x99, 0x2f, 0x1d, 0x6b, 0xc0, 0x2d, 0x47, 0x25, 0xa7, 0x96, 0x7e, 0x55, 0xdf, 0x58, - 0x27, 0xb5, 0xc0, 0x24, 0xee, 0xd5, 0xa8, 0x11, 0x3f, 0x30, 0x09, 0x9d, 0xc0, 0x4b, 0xb6, 0xa3, - 0x54, 0xb2, 0x7b, 0xd1, 0xd7, 0x77, 0xff, 0x4b, 0xbd, 0x9d, 0xff, 0xbf, 0x7d, 0xa3, 0x2b, 0x6c, - 0x2f, 0x3b, 0xc3, 0x1f, 0xef, 0x56, 0xfe, 0x27, 0xbe, 0x2e, 0x54, 0xf1, 0xb5, 0x25, 0xa4, 0x05, - 0x2d, 0x79, 0xb2, 0xe5, 0x7e, 0xce, 0x5b, 0xf9, 0xcf, 0xb9, 0x7f, 0x76, 0x36, 0xe5, 0xe2, 0x1b, - 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0xa4, 0x10, 0x52, 0xd9, 0x76, 0x09, 0x00, 0x00, + // 1334 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xd9, 0x72, 0x1b, 0x37, + 0x16, 0x15, 0xd9, 0x94, 0x28, 0x42, 0x94, 0x04, 0x41, 0x8b, 0x65, 0x8f, 0x6a, 0xca, 0xa5, 0x27, + 0x97, 0xaa, 0x2c, 0xcd, 0x8c, 0x6b, 0x66, 0x9e, 0xfc, 0x20, 0xb1, 0xb5, 0xb0, 0x6c, 0x2d, 0xd3, + 0x94, 0x3d, 0xa9, 0x3c, 0xc4, 0x05, 0x75, 0x5f, 0x92, 0x88, 0xbb, 0x01, 0x06, 0x40, 0xcb, 0xe2, + 0x5f, 0x24, 0xfe, 0x8e, 0x24, 0x95, 0xc5, 0x59, 0x2a, 0x5f, 0x90, 0xfd, 0x39, 0x9f, 0x90, 0x0f, + 0xc8, 0xea, 0x35, 0x75, 0xd1, 0x4d, 0x76, 0xbb, 0xca, 0x79, 0xca, 0x5b, 0xdf, 0x83, 0x8b, 0x83, + 0x73, 0xcf, 0xbd, 0x40, 0x93, 0x66, 0xa8, 0x92, 0x44, 0xc9, 0xcd, 0x81, 0x56, 0x56, 0xb1, 0xc5, + 0x44, 0xc4, 0xe7, 0xa9, 0xc9, 0xa2, 0xcd, 0x6c, 0x69, 0xfd, 0x1e, 0x99, 0xea, 0x58, 0x6e, 0x53, + 0xc3, 0x6e, 0x12, 0x02, 0x5a, 0x2b, 0x7d, 0x2f, 0x54, 0x11, 0xac, 0x56, 0xae, 0x56, 0xae, 0xcd, + 0xfd, 0xeb, 0xef, 0x9b, 0xaf, 0xd8, 0xb3, 0xb9, 0x8b, 0x69, 0x2d, 0x15, 0x41, 0xd0, 0x80, 0xd1, + 0x27, 0x5b, 0x21, 0x53, 0x1a, 0xb8, 0x51, 0x72, 0xb5, 0x7a, 0xb5, 0x72, 0xad, 0x11, 0xe4, 0xd1, + 0xfa, 0x7f, 0x48, 0xf3, 0x16, 0x0c, 0xef, 0xf2, 0x38, 0x85, 0x13, 0x2e, 0x34, 0xa3, 0xc4, 0xbb, + 0x0f, 0x43, 0xc7, 0xdf, 0x08, 0xf0, 0x93, 0x2d, 0x91, 0xc9, 0x73, 0x5c, 0xce, 0x37, 0x66, 0xc1, + 0xfa, 0x1a, 0xa9, 0xed, 0xc4, 0xea, 0xac, 0x58, 0xc5, 0x1d, 0xcd, 0xd1, 0xea, 0x75, 0x52, 0xdf, + 0x8e, 0x22, 0x0d, 0xc6, 0xb0, 0x39, 0x52, 0x15, 0x83, 0x9c, 0xaf, 0x2a, 0x06, 0x8c, 0x91, 0xda, + 0x40, 0x69, 0xeb, 0xd8, 0xbc, 0xc0, 0x7d, 0xaf, 0x3f, 0xac, 0x90, 0xfa, 0xa1, 0xe9, 0xed, 0x70, + 0x03, 0xec, 0xbf, 0x64, 0x3a, 0x31, 0xbd, 0x7b, 0x76, 0x38, 0x18, 0x55, 0xb9, 0xf6, 0xca, 0x2a, + 0x0f, 0x4d, 0xef, 0x74, 0x38, 0x80, 0xa0, 0x9e, 0x64, 0x1f, 0xa8, 0x24, 0x31, 0xbd, 0xb6, 0x9f, + 0x33, 0x67, 0x01, 0x5b, 0x23, 0x0d, 0x2b, 0x12, 0x30, 0x96, 0x27, 0x83, 0x55, 0xef, 0x6a, 0xe5, + 0x5a, 0x2d, 0x28, 0x00, 0x76, 0x85, 0x4c, 0x1b, 0x95, 0xea, 0x10, 0xda, 0xfe, 0x6a, 0xcd, 0x6d, + 0x1b, 0xc7, 0xeb, 0x37, 0x49, 0xe3, 0xd0, 0xf4, 0x0e, 0x80, 0x47, 0xa0, 0xd9, 0x3f, 0x48, 0xed, + 0x8c, 0x9b, 0x4c, 0xd1, 0xcc, 0x9f, 0x2b, 0xc2, 0x0a, 0x02, 0x97, 0xb9, 0xfe, 0x06, 0x69, 0xfa, + 0x87, 0xb7, 0xff, 0x02, 0x03, 0x4a, 0x37, 0x7d, 0xae, 0xa3, 0x23, 0x9e, 0x8c, 0xcc, 0x2f, 0x80, + 0x8d, 0x2f, 0x6a, 0xa4, 0x31, 0xee, 0x34, 0x9b, 0x21, 0xf5, 0x4e, 0x1a, 0x86, 0x60, 0x0c, 0x9d, + 0x60, 0x8b, 0x64, 0xfe, 0x8e, 0x84, 0x8b, 0x01, 0x84, 0x16, 0x22, 0x97, 0x43, 0x2b, 0x6c, 0x81, + 0xcc, 0xb6, 0x94, 0x94, 0x10, 0xda, 0x3d, 0x2e, 0x62, 0x88, 0x68, 0x95, 0x2d, 0x11, 0x7a, 0x02, + 0x3a, 0x11, 0xc6, 0x08, 0x25, 0x7d, 0x90, 0x02, 0x22, 0xea, 0xb1, 0x4b, 0x64, 0xb1, 0xa5, 0xe2, + 0x18, 0x42, 0x2b, 0x94, 0x3c, 0x52, 0x76, 0xf7, 0x42, 0x18, 0x6b, 0x68, 0x0d, 0x69, 0xdb, 0x71, + 0x0c, 0x3d, 0x1e, 0x6f, 0xeb, 0x5e, 0x9a, 0x80, 0xb4, 0x74, 0x12, 0x39, 0x72, 0xd0, 0x17, 0x09, + 0x48, 0x64, 0xa2, 0xf5, 0x12, 0xda, 0x96, 0x11, 0x5c, 0x60, 0x7f, 0xe8, 0x34, 0xbb, 0x4c, 0x96, + 0x73, 0xb4, 0x74, 0x00, 0x4f, 0x80, 0x36, 0xd8, 0x3c, 0x99, 0xc9, 0x97, 0x4e, 0x8f, 0x4f, 0x6e, + 0x51, 0x52, 0x62, 0x08, 0xd4, 0x83, 0x00, 0x42, 0xa5, 0x23, 0x3a, 0x53, 0x92, 0x70, 0x17, 0x42, + 0xab, 0x74, 0xdb, 0xa7, 0x4d, 0x14, 0x9c, 0x83, 0x1d, 0xe0, 0x3a, 0xec, 0x07, 0x60, 0xd2, 0xd8, + 0xd2, 0x59, 0x46, 0x49, 0x73, 0x4f, 0xc4, 0x70, 0xa4, 0xec, 0x9e, 0x4a, 0x65, 0x44, 0xe7, 0xd8, + 0x1c, 0x21, 0x87, 0x60, 0x79, 0xee, 0xc0, 0x3c, 0x1e, 0xdb, 0xe2, 0x61, 0x1f, 0x72, 0x80, 0xb2, + 0x15, 0xc2, 0x5a, 0x5c, 0x4a, 0x65, 0x5b, 0x1a, 0xb8, 0x85, 0x3d, 0x15, 0x47, 0xa0, 0xe9, 0x02, + 0xca, 0x79, 0x09, 0x17, 0x31, 0x50, 0x56, 0x64, 0xfb, 0x10, 0xc3, 0x38, 0x7b, 0xb1, 0xc8, 0xce, + 0x71, 0xcc, 0x5e, 0x42, 0xf1, 0x3b, 0xa9, 0x88, 0x23, 0x67, 0x49, 0xd6, 0x96, 0x65, 0xd4, 0x98, + 0x8b, 0x3f, 0xba, 0xdd, 0xee, 0x9c, 0xd2, 0x15, 0xb6, 0x4c, 0x16, 0x72, 0xe4, 0x10, 0xac, 0x16, + 0xa1, 0x33, 0xef, 0x12, 0x4a, 0x3d, 0x4e, 0xed, 0x71, 0xf7, 0x10, 0x12, 0xa5, 0x87, 0x74, 0x15, + 0x1b, 0xea, 0x98, 0x46, 0x2d, 0xa2, 0x97, 0xf1, 0x84, 0xdd, 0x64, 0x60, 0x87, 0x85, 0xbd, 0xf4, + 0x0a, 0x63, 0x64, 0xd6, 0xf7, 0x03, 0x78, 0x2b, 0x05, 0x63, 0x03, 0x1e, 0x02, 0xfd, 0xb1, 0xbe, + 0xf1, 0x1a, 0x21, 0x6e, 0x2f, 0xbe, 0x2d, 0xc0, 0x18, 0x99, 0x2b, 0xa2, 0x23, 0x25, 0x81, 0x4e, + 0xb0, 0x26, 0x99, 0xbe, 0x23, 0x85, 0x31, 0x29, 0x44, 0xb4, 0x82, 0xbe, 0xb5, 0xe5, 0x89, 0x56, + 0x3d, 0xbc, 0xd2, 0xb4, 0x8a, 0xab, 0x7b, 0x42, 0x0a, 0xd3, 0x77, 0x13, 0x43, 0xc8, 0x54, 0x6e, + 0x60, 0x6d, 0xa3, 0x4b, 0x9a, 0x1d, 0xe8, 0xe1, 0x70, 0x64, 0xdc, 0x4b, 0x84, 0x96, 0xe3, 0x82, + 0x7d, 0x2c, 0xbb, 0x82, 0xc3, 0xbb, 0xaf, 0xd5, 0x03, 0x21, 0x7b, 0xb4, 0x8a, 0x64, 0x1d, 0xe0, + 0xb1, 0x23, 0x9e, 0x21, 0xf5, 0xbd, 0x38, 0x75, 0xa7, 0xd4, 0xdc, 0x99, 0x18, 0x60, 0xda, 0xe4, + 0xc6, 0xa3, 0x69, 0xf7, 0x64, 0xb8, 0x9b, 0x3f, 0x4b, 0x1a, 0x77, 0x64, 0x04, 0x5d, 0x21, 0x21, + 0xa2, 0x13, 0xce, 0x7d, 0xd7, 0xa5, 0x92, 0x0d, 0x11, 0x16, 0xe9, 0x6b, 0x35, 0x28, 0x61, 0x80, + 0x16, 0x1e, 0x70, 0x53, 0x82, 0xba, 0xd8, 0x52, 0x1f, 0x4c, 0xa8, 0xc5, 0x59, 0x79, 0x7b, 0x0f, + 0xad, 0xed, 0xf4, 0xd5, 0x83, 0x02, 0x33, 0xb4, 0x8f, 0x27, 0xed, 0x83, 0xed, 0x0c, 0x8d, 0x85, + 0xa4, 0xa5, 0x64, 0x57, 0xf4, 0x0c, 0x15, 0x78, 0xd2, 0x6d, 0xc5, 0xa3, 0xd2, 0xf6, 0x37, 0xb1, + 0xa9, 0x01, 0xc4, 0xc0, 0x4d, 0x99, 0xf5, 0xbe, 0x9b, 0x3f, 0x27, 0x75, 0x3b, 0x16, 0xdc, 0xd0, + 0x18, 0x4b, 0x41, 0x95, 0x59, 0x98, 0xa0, 0xef, 0xdb, 0xb1, 0x05, 0x9d, 0xc5, 0x92, 0x2d, 0x91, + 0xf9, 0x2c, 0xff, 0x84, 0x6b, 0x2b, 0x1c, 0xc9, 0x97, 0x15, 0xd7, 0x61, 0xad, 0x06, 0x05, 0xf6, + 0x15, 0x5e, 0xf7, 0xe6, 0x01, 0x37, 0x05, 0xf4, 0x75, 0x85, 0xad, 0x90, 0x85, 0x51, 0x69, 0x05, + 0xfe, 0x4d, 0x85, 0x2d, 0x92, 0x39, 0x2c, 0x6d, 0x8c, 0x19, 0xfa, 0xad, 0x03, 0xb1, 0x88, 0x12, + 0xf8, 0x9d, 0x63, 0xc8, 0xab, 0x28, 0xe1, 0xdf, 0xbb, 0xc3, 0x90, 0x21, 0x6f, 0xb4, 0xa1, 0x8f, + 0x2b, 0xa8, 0x74, 0x74, 0x58, 0x0e, 0xd3, 0x27, 0x2e, 0x11, 0x59, 0xc7, 0x89, 0x4f, 0x5d, 0x62, + 0xce, 0x39, 0x46, 0x9f, 0x39, 0xf4, 0x80, 0xcb, 0x48, 0x75, 0xbb, 0x63, 0xf4, 0x79, 0x85, 0xad, + 0x92, 0x45, 0xdc, 0xbe, 0xc3, 0x63, 0x2e, 0xc3, 0x22, 0xff, 0x45, 0x85, 0xd1, 0x91, 0x91, 0x6e, + 0x90, 0xe9, 0xbb, 0x55, 0x67, 0x4a, 0x2e, 0x20, 0xc3, 0xde, 0xab, 0xb2, 0xb9, 0xcc, 0xdd, 0x2c, + 0x7e, 0xbf, 0xca, 0x66, 0xc8, 0x54, 0x5b, 0x1a, 0xd0, 0x96, 0xbe, 0x8d, 0xc3, 0x36, 0x95, 0x5d, + 0x57, 0xfa, 0x0e, 0x8e, 0xf4, 0xa4, 0x1b, 0x36, 0xfa, 0xd0, 0x2d, 0x64, 0x0f, 0x0b, 0xfd, 0xc9, + 0x73, 0xa5, 0x96, 0x5f, 0x99, 0x9f, 0x3d, 0x3c, 0x69, 0x1f, 0x6c, 0x71, 0x83, 0xe8, 0x2f, 0x1e, + 0xbb, 0x42, 0x96, 0x47, 0x98, 0xbb, 0xf3, 0xe3, 0xbb, 0xf3, 0xab, 0xc7, 0xd6, 0xc8, 0xa5, 0x7d, + 0xb0, 0xc5, 0x1c, 0xe0, 0x26, 0x61, 0xac, 0x08, 0x0d, 0xfd, 0xcd, 0x63, 0x7f, 0x23, 0x2b, 0xfb, + 0x60, 0xc7, 0xfe, 0x96, 0x16, 0x7f, 0xf7, 0xd8, 0x2c, 0x99, 0x0e, 0xf0, 0x51, 0x80, 0x73, 0xa0, + 0x8f, 0x3d, 0x6c, 0xd2, 0x28, 0xcc, 0xe5, 0x3c, 0xf1, 0xd0, 0xba, 0xff, 0x73, 0x1b, 0xf6, 0xfd, + 0xa4, 0xd5, 0xe7, 0x52, 0x42, 0x6c, 0xe8, 0x53, 0x8f, 0x2d, 0x13, 0x1a, 0x40, 0xa2, 0xce, 0xa1, + 0x04, 0x3f, 0xc3, 0xc7, 0x9e, 0xb9, 0xe4, 0xff, 0xa5, 0xa0, 0x87, 0xe3, 0x85, 0xe7, 0x1e, 0x5a, + 0x9d, 0xe5, 0xbf, 0xbc, 0xf2, 0xc2, 0x43, 0xab, 0x73, 0xe7, 0xdb, 0xb2, 0xab, 0xe8, 0x0f, 0x35, + 0x54, 0x75, 0x2a, 0x12, 0x38, 0x15, 0xe1, 0x7d, 0xfa, 0x41, 0x03, 0x55, 0xb9, 0x4d, 0x47, 0x2a, + 0x02, 0x94, 0x6f, 0xe8, 0x87, 0x0d, 0xb4, 0x1e, 0x5b, 0x97, 0x59, 0xff, 0x91, 0x8b, 0xf3, 0x37, + 0xa9, 0xed, 0xd3, 0x8f, 0xf1, 0x07, 0x40, 0xf2, 0xf8, 0xb4, 0x73, 0x4c, 0x1f, 0x35, 0xb0, 0x8c, + 0xed, 0x38, 0x56, 0x21, 0xb7, 0xe3, 0x01, 0xfa, 0xa4, 0x81, 0x13, 0x58, 0x7a, 0x4e, 0x72, 0x63, + 0x3e, 0x6d, 0x60, 0x79, 0x39, 0xee, 0xda, 0xe6, 0xe3, 0x33, 0xf3, 0x99, 0x63, 0xf5, 0xb9, 0xe5, + 0xa8, 0xe4, 0xd4, 0xd2, 0xcf, 0x1b, 0x1b, 0xeb, 0xa4, 0xee, 0x9b, 0xd8, 0xbd, 0x1a, 0x75, 0xe2, + 0xf9, 0x26, 0xa6, 0x13, 0x78, 0xc9, 0x76, 0x94, 0x8a, 0x77, 0x2f, 0x06, 0xfa, 0xee, 0x3f, 0x69, + 0x65, 0xe7, 0xdf, 0xaf, 0xdf, 0xe8, 0x09, 0xdb, 0x4f, 0xcf, 0xf0, 0xb7, 0xbc, 0x95, 0xfd, 0xa7, + 0xaf, 0x0b, 0x95, 0x7f, 0x6d, 0x09, 0x69, 0x41, 0x4b, 0x1e, 0x6f, 0xb9, 0x5f, 0xf7, 0x56, 0xf6, + 0xeb, 0x1e, 0x9c, 0x9d, 0x4d, 0xb9, 0xf8, 0xc6, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4e, 0x36, + 0xfe, 0x7f, 0xd6, 0x09, 0x00, 0x00, } diff --git a/internal/proto/internal.proto b/internal/proto/internal.proto index 24e5052069..d7bc4e3cc6 100644 --- a/internal/proto/internal.proto +++ b/internal/proto/internal.proto @@ -127,14 +127,14 @@ message CreateIndexRequest { message InsertRequest { common.MsgBase base = 1; - string db_name = 2; - string collection_name = 3; - string partition_name = 4; - int64 dbID = 5; - int64 collectionID = 6; - int64 partitionID = 7; - int64 segmentID = 8; - string channelID = 9; + string shardName = 2; + string db_name = 3; + string collection_name = 4; + string partition_name = 5; + int64 dbID = 6; + int64 collectionID = 7; + int64 partitionID = 8; + int64 segmentID = 9; repeated uint64 timestamps = 10; repeated int64 rowIDs = 11; repeated common.Blob row_data = 12; @@ -197,13 +197,13 @@ message RetrieveResults { message DeleteRequest { common.MsgBase base = 1; - string db_name = 2; - string collection_name = 3; - string partition_name = 4; - int64 dbID = 5; - int64 collectionID = 6; - int64 partitionID = 7; - string channelID = 8; + string shardName = 2; + string db_name = 3; + string collection_name = 4; + string partition_name = 5; + int64 dbID = 6; + int64 collectionID = 7; + int64 partitionID = 8; bytes expr_plan = 9; uint64 timestamp = 10; } diff --git a/internal/proto/internalpb/internal.pb.go b/internal/proto/internalpb/internal.pb.go index f4bb6c6a44..c35c458946 100644 --- a/internal/proto/internalpb/internal.pb.go +++ b/internal/proto/internalpb/internal.pb.go @@ -1083,14 +1083,14 @@ func (m *CreateIndexRequest) GetExtraParams() []*commonpb.KeyValuePair { type InsertRequest struct { Base *commonpb.MsgBase `protobuf:"bytes,1,opt,name=base,proto3" json:"base,omitempty"` - DbName string `protobuf:"bytes,2,opt,name=db_name,json=dbName,proto3" json:"db_name,omitempty"` - CollectionName string `protobuf:"bytes,3,opt,name=collection_name,json=collectionName,proto3" json:"collection_name,omitempty"` - PartitionName string `protobuf:"bytes,4,opt,name=partition_name,json=partitionName,proto3" json:"partition_name,omitempty"` - DbID int64 `protobuf:"varint,5,opt,name=dbID,proto3" json:"dbID,omitempty"` - CollectionID int64 `protobuf:"varint,6,opt,name=collectionID,proto3" json:"collectionID,omitempty"` - PartitionID int64 `protobuf:"varint,7,opt,name=partitionID,proto3" json:"partitionID,omitempty"` - SegmentID int64 `protobuf:"varint,8,opt,name=segmentID,proto3" json:"segmentID,omitempty"` - ChannelID string `protobuf:"bytes,9,opt,name=channelID,proto3" json:"channelID,omitempty"` + ShardName string `protobuf:"bytes,2,opt,name=shardName,proto3" json:"shardName,omitempty"` + DbName string `protobuf:"bytes,3,opt,name=db_name,json=dbName,proto3" json:"db_name,omitempty"` + CollectionName string `protobuf:"bytes,4,opt,name=collection_name,json=collectionName,proto3" json:"collection_name,omitempty"` + PartitionName string `protobuf:"bytes,5,opt,name=partition_name,json=partitionName,proto3" json:"partition_name,omitempty"` + DbID int64 `protobuf:"varint,6,opt,name=dbID,proto3" json:"dbID,omitempty"` + CollectionID int64 `protobuf:"varint,7,opt,name=collectionID,proto3" json:"collectionID,omitempty"` + PartitionID int64 `protobuf:"varint,8,opt,name=partitionID,proto3" json:"partitionID,omitempty"` + SegmentID int64 `protobuf:"varint,9,opt,name=segmentID,proto3" json:"segmentID,omitempty"` Timestamps []uint64 `protobuf:"varint,10,rep,packed,name=timestamps,proto3" json:"timestamps,omitempty"` RowIDs []int64 `protobuf:"varint,11,rep,packed,name=rowIDs,proto3" json:"rowIDs,omitempty"` RowData []*commonpb.Blob `protobuf:"bytes,12,rep,name=row_data,json=rowData,proto3" json:"row_data,omitempty"` @@ -1131,6 +1131,13 @@ func (m *InsertRequest) GetBase() *commonpb.MsgBase { return nil } +func (m *InsertRequest) GetShardName() string { + if m != nil { + return m.ShardName + } + return "" +} + func (m *InsertRequest) GetDbName() string { if m != nil { return m.DbName @@ -1180,13 +1187,6 @@ func (m *InsertRequest) GetSegmentID() int64 { return 0 } -func (m *InsertRequest) GetChannelID() string { - if m != nil { - return m.ChannelID - } - return "" -} - func (m *InsertRequest) GetTimestamps() []uint64 { if m != nil { return m.Timestamps @@ -1664,13 +1664,13 @@ func (m *RetrieveResults) GetGlobalSealedSegmentIDs() []int64 { type DeleteRequest struct { Base *commonpb.MsgBase `protobuf:"bytes,1,opt,name=base,proto3" json:"base,omitempty"` - DbName string `protobuf:"bytes,2,opt,name=db_name,json=dbName,proto3" json:"db_name,omitempty"` - CollectionName string `protobuf:"bytes,3,opt,name=collection_name,json=collectionName,proto3" json:"collection_name,omitempty"` - PartitionName string `protobuf:"bytes,4,opt,name=partition_name,json=partitionName,proto3" json:"partition_name,omitempty"` - DbID int64 `protobuf:"varint,5,opt,name=dbID,proto3" json:"dbID,omitempty"` - CollectionID int64 `protobuf:"varint,6,opt,name=collectionID,proto3" json:"collectionID,omitempty"` - PartitionID int64 `protobuf:"varint,7,opt,name=partitionID,proto3" json:"partitionID,omitempty"` - ChannelID string `protobuf:"bytes,8,opt,name=channelID,proto3" json:"channelID,omitempty"` + ShardName string `protobuf:"bytes,2,opt,name=shardName,proto3" json:"shardName,omitempty"` + DbName string `protobuf:"bytes,3,opt,name=db_name,json=dbName,proto3" json:"db_name,omitempty"` + CollectionName string `protobuf:"bytes,4,opt,name=collection_name,json=collectionName,proto3" json:"collection_name,omitempty"` + PartitionName string `protobuf:"bytes,5,opt,name=partition_name,json=partitionName,proto3" json:"partition_name,omitempty"` + DbID int64 `protobuf:"varint,6,opt,name=dbID,proto3" json:"dbID,omitempty"` + CollectionID int64 `protobuf:"varint,7,opt,name=collectionID,proto3" json:"collectionID,omitempty"` + PartitionID int64 `protobuf:"varint,8,opt,name=partitionID,proto3" json:"partitionID,omitempty"` ExprPlan []byte `protobuf:"bytes,9,opt,name=expr_plan,json=exprPlan,proto3" json:"expr_plan,omitempty"` Timestamp uint64 `protobuf:"varint,10,opt,name=timestamp,proto3" json:"timestamp,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -1710,6 +1710,13 @@ func (m *DeleteRequest) GetBase() *commonpb.MsgBase { return nil } +func (m *DeleteRequest) GetShardName() string { + if m != nil { + return m.ShardName + } + return "" +} + func (m *DeleteRequest) GetDbName() string { if m != nil { return m.DbName @@ -1752,13 +1759,6 @@ func (m *DeleteRequest) GetPartitionID() int64 { return 0 } -func (m *DeleteRequest) GetChannelID() string { - if m != nil { - return m.ChannelID - } - return "" -} - func (m *DeleteRequest) GetExprPlan() []byte { if m != nil { return m.ExprPlan @@ -2420,130 +2420,132 @@ func init() { func init() { proto.RegisterFile("internal.proto", fileDescriptor_41f4a519b878ee3b) } var fileDescriptor_41f4a519b878ee3b = []byte{ - // 1997 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0x5f, 0x6f, 0x24, 0x47, - 0x11, 0x67, 0x76, 0xd6, 0xde, 0xdd, 0xda, 0xb5, 0xbd, 0x6e, 0xfb, 0x2e, 0x63, 0xfb, 0x72, 0xe7, - 0x4c, 0x02, 0x98, 0x9c, 0x38, 0x1f, 0x0e, 0x90, 0x08, 0x21, 0x2e, 0x67, 0x6f, 0x38, 0x56, 0x17, - 0x1b, 0x33, 0xbe, 0x44, 0x22, 0x2f, 0xa3, 0xde, 0x99, 0xf6, 0x7a, 0xc8, 0xfc, 0xcb, 0x74, 0x8f, - 0xef, 0x9c, 0x27, 0x84, 0xe0, 0x05, 0x04, 0x12, 0x48, 0x7c, 0x0d, 0x5e, 0x79, 0xe2, 0x8f, 0x78, - 0xe2, 0x2b, 0xf0, 0xc0, 0xf7, 0x40, 0x3c, 0xa1, 0xae, 0xee, 0xf9, 0xb3, 0xeb, 0xb5, 0xf1, 0xf9, - 0x04, 0x09, 0x3a, 0xde, 0xb6, 0xab, 0xaa, 0x6b, 0xba, 0x7e, 0xf5, 0xab, 0xee, 0xea, 0x5e, 0x58, - 0x0c, 0x62, 0xc1, 0xb2, 0x98, 0x86, 0xf7, 0xd2, 0x2c, 0x11, 0x09, 0xb9, 0x11, 0x05, 0xe1, 0x69, - 0xce, 0xd5, 0xe8, 0x5e, 0xa1, 0x5c, 0xef, 0x79, 0x49, 0x14, 0x25, 0xb1, 0x12, 0xaf, 0xf7, 0xb8, - 0x77, 0xc2, 0x22, 0xaa, 0x46, 0xf6, 0x1f, 0x0d, 0x58, 0xd8, 0x4b, 0xa2, 0x34, 0x89, 0x59, 0x2c, - 0x86, 0xf1, 0x71, 0x42, 0x6e, 0xc2, 0x7c, 0x9c, 0xf8, 0x6c, 0x38, 0xb0, 0x8c, 0x4d, 0x63, 0xcb, - 0x74, 0xf4, 0x88, 0x10, 0x68, 0x66, 0x49, 0xc8, 0xac, 0xc6, 0xa6, 0xb1, 0xd5, 0x71, 0xf0, 0x37, - 0x79, 0x00, 0xc0, 0x05, 0x15, 0xcc, 0xf5, 0x12, 0x9f, 0x59, 0xe6, 0xa6, 0xb1, 0xb5, 0xb8, 0xb3, - 0x79, 0x6f, 0xe6, 0x2a, 0xee, 0x1d, 0x49, 0xc3, 0xbd, 0xc4, 0x67, 0x4e, 0x87, 0x17, 0x3f, 0xc9, - 0xbb, 0x00, 0xec, 0x99, 0xc8, 0xa8, 0x1b, 0xc4, 0xc7, 0x89, 0xd5, 0xdc, 0x34, 0xb7, 0xba, 0x3b, - 0xaf, 0x4d, 0x3a, 0xd0, 0x8b, 0x7f, 0xcc, 0xce, 0x3e, 0xa4, 0x61, 0xce, 0x0e, 0x69, 0x90, 0x39, - 0x1d, 0x9c, 0x24, 0x97, 0x6b, 0xff, 0xcd, 0x80, 0xa5, 0x32, 0x00, 0xfc, 0x06, 0x27, 0xdf, 0x82, - 0x39, 0xfc, 0x04, 0x46, 0xd0, 0xdd, 0x79, 0xe3, 0x82, 0x15, 0x4d, 0xc4, 0xed, 0xa8, 0x29, 0xe4, - 0x03, 0x58, 0xe1, 0xf9, 0xc8, 0x2b, 0x54, 0x2e, 0x4a, 0xb9, 0xd5, 0xc0, 0xa5, 0x5d, 0xcd, 0x13, - 0xa9, 0x3b, 0xd0, 0x4b, 0x7a, 0x0b, 0xe6, 0xa5, 0xa7, 0x9c, 0x23, 0x4a, 0xdd, 0x9d, 0x8d, 0x99, - 0x41, 0x1e, 0xa1, 0x89, 0xa3, 0x4d, 0xed, 0x0d, 0x58, 0x7b, 0xc4, 0xc4, 0x54, 0x74, 0x0e, 0xfb, - 0x24, 0x67, 0x5c, 0x68, 0xe5, 0x93, 0x20, 0x62, 0x4f, 0x02, 0xef, 0xe3, 0xbd, 0x13, 0x1a, 0xc7, - 0x2c, 0x2c, 0x94, 0xaf, 0xc2, 0xc6, 0x23, 0x86, 0x13, 0x02, 0x2e, 0x02, 0x8f, 0x4f, 0xa9, 0x6f, - 0xc0, 0xca, 0x23, 0x26, 0x06, 0xfe, 0x94, 0xf8, 0x43, 0x68, 0x1f, 0xc8, 0x64, 0x4b, 0x1a, 0x7c, - 0x13, 0x5a, 0xd4, 0xf7, 0x33, 0xc6, 0xb9, 0x46, 0xf1, 0xd6, 0xcc, 0x15, 0x3f, 0x54, 0x36, 0x4e, - 0x61, 0x3c, 0x8b, 0x26, 0xf6, 0x8f, 0x00, 0x86, 0x71, 0x20, 0x0e, 0x69, 0x46, 0x23, 0x7e, 0x21, - 0xc1, 0x06, 0xd0, 0xe3, 0x82, 0x66, 0xc2, 0x4d, 0xd1, 0x4e, 0x43, 0x7e, 0x05, 0x36, 0x74, 0x71, - 0x9a, 0xf2, 0x6e, 0xff, 0x10, 0xe0, 0x48, 0x64, 0x41, 0x3c, 0x7e, 0x3f, 0xe0, 0x42, 0x7e, 0xeb, - 0x54, 0xda, 0xc9, 0x20, 0xcc, 0xad, 0x8e, 0xa3, 0x47, 0xb5, 0x74, 0x34, 0xae, 0x9e, 0x8e, 0x07, - 0xd0, 0x2d, 0xe0, 0xde, 0xe7, 0x63, 0x72, 0x1f, 0x9a, 0x23, 0xca, 0xd9, 0xa5, 0xf0, 0xec, 0xf3, - 0xf1, 0x2e, 0xe5, 0xcc, 0x41, 0x4b, 0xfb, 0xe7, 0x26, 0xbc, 0xb2, 0x97, 0x31, 0x24, 0x7f, 0x18, - 0x32, 0x4f, 0x04, 0x49, 0xac, 0xb1, 0x7f, 0x7e, 0x6f, 0xe4, 0x15, 0x68, 0xf9, 0x23, 0x37, 0xa6, - 0x51, 0x01, 0xf6, 0xbc, 0x3f, 0x3a, 0xa0, 0x11, 0x23, 0x5f, 0x82, 0x45, 0xaf, 0xf4, 0x2f, 0x25, - 0xc8, 0xb9, 0x8e, 0x33, 0x25, 0x25, 0x6f, 0xc0, 0x42, 0x4a, 0x33, 0x11, 0x94, 0x66, 0x4d, 0x34, - 0x9b, 0x14, 0xca, 0x84, 0xfa, 0xa3, 0xe1, 0xc0, 0x9a, 0xc3, 0x64, 0xe1, 0x6f, 0x62, 0x43, 0xaf, - 0xf2, 0x35, 0x1c, 0x58, 0xf3, 0xa8, 0x9b, 0x90, 0x91, 0x4d, 0xe8, 0x96, 0x8e, 0x86, 0x03, 0xab, - 0x85, 0x26, 0x75, 0x91, 0x4c, 0x8e, 0xda, 0x8b, 0xac, 0xf6, 0xa6, 0xb1, 0xd5, 0x73, 0xf4, 0x88, - 0xdc, 0x87, 0x95, 0xd3, 0x20, 0x13, 0x39, 0x0d, 0x35, 0x3f, 0xe5, 0x3a, 0xb8, 0xd5, 0xc1, 0x0c, - 0xce, 0x52, 0x91, 0x1d, 0x58, 0x4d, 0x4f, 0xce, 0x78, 0xe0, 0x4d, 0x4d, 0x01, 0x9c, 0x32, 0x53, - 0x67, 0xff, 0xc5, 0x80, 0x1b, 0x83, 0x2c, 0x49, 0x3f, 0x17, 0xa9, 0x28, 0x40, 0x6e, 0x5e, 0x02, - 0xf2, 0xdc, 0x79, 0x90, 0xed, 0x5f, 0x36, 0xe0, 0xa6, 0x62, 0xd4, 0x61, 0x01, 0xec, 0x7f, 0x20, - 0x8a, 0x2f, 0xc3, 0x52, 0xf5, 0x55, 0x65, 0x30, 0x3b, 0x8c, 0x2f, 0xc2, 0x62, 0x99, 0x60, 0x65, - 0xf7, 0xdf, 0xa5, 0x94, 0xfd, 0x8b, 0x06, 0xac, 0xca, 0xa4, 0xfe, 0x1f, 0x0d, 0x89, 0xc6, 0xcf, - 0x0c, 0x20, 0x8a, 0x1d, 0x0f, 0xc3, 0x80, 0xf2, 0xeb, 0x63, 0x31, 0x23, 0xe4, 0xc6, 0xcc, 0x90, - 0x57, 0x61, 0x8e, 0xca, 0x4f, 0x69, 0x44, 0xd4, 0xc0, 0xfe, 0x08, 0xfa, 0x32, 0x29, 0x2f, 0xb8, - 0x88, 0xd2, 0x77, 0xa3, 0xee, 0xfb, 0xa7, 0x06, 0x2c, 0x3f, 0x0c, 0x05, 0xcb, 0x3e, 0xdb, 0x10, - 0xff, 0xd4, 0x28, 0xa0, 0x1e, 0xc6, 0x3e, 0x7b, 0xf6, 0x59, 0xd2, 0xee, 0x55, 0x80, 0xe3, 0x80, - 0x85, 0x7e, 0x9d, 0x72, 0x1d, 0x94, 0xbc, 0x10, 0xdd, 0x2c, 0x68, 0xa1, 0x93, 0x92, 0x6a, 0xc5, - 0x50, 0x1e, 0xdc, 0xaa, 0x89, 0xd3, 0x07, 0x77, 0xfb, 0xca, 0x07, 0x37, 0x4e, 0xd3, 0x07, 0xf7, - 0xef, 0x4c, 0x58, 0x18, 0xc6, 0x9c, 0x65, 0xe2, 0x65, 0xae, 0x59, 0x72, 0x0b, 0x3a, 0x9c, 0x8d, - 0x23, 0xd9, 0x4b, 0x0e, 0xf0, 0x5c, 0x34, 0x9d, 0x4a, 0x20, 0xb5, 0x9e, 0x3a, 0xc4, 0x86, 0x03, - 0xab, 0xa3, 0x52, 0x5b, 0x0a, 0xc8, 0x6d, 0x00, 0x11, 0x44, 0x8c, 0x0b, 0x1a, 0xa5, 0xea, 0xf0, - 0x6b, 0x3a, 0x35, 0x89, 0x3c, 0x70, 0xb3, 0xe4, 0xe9, 0x70, 0xc0, 0xad, 0xee, 0xa6, 0x29, 0x3b, - 0x2f, 0x35, 0x22, 0x5f, 0x87, 0x76, 0x96, 0x3c, 0x75, 0x7d, 0x2a, 0xa8, 0xd5, 0xc3, 0xe4, 0xad, - 0xcd, 0x04, 0x7b, 0x37, 0x4c, 0x46, 0x4e, 0x2b, 0x4b, 0x9e, 0x0e, 0xa8, 0xa0, 0xf6, 0x3f, 0x4c, - 0x58, 0x38, 0x62, 0x34, 0xf3, 0x4e, 0xae, 0x9f, 0xb0, 0xaf, 0x40, 0x3f, 0x63, 0x3c, 0x0f, 0x85, - 0x5b, 0x85, 0xa5, 0x32, 0xb7, 0xa4, 0xe4, 0x7b, 0x65, 0x70, 0x05, 0xe4, 0xe6, 0x25, 0x90, 0x37, - 0x67, 0x40, 0x6e, 0x43, 0xaf, 0x86, 0x2f, 0xb7, 0xe6, 0x30, 0xf4, 0x09, 0x19, 0xe9, 0x83, 0xe9, - 0xf3, 0x10, 0x33, 0xd6, 0x71, 0xe4, 0x4f, 0x72, 0x17, 0x96, 0xd3, 0x90, 0x7a, 0xec, 0x24, 0x09, - 0x7d, 0x96, 0xb9, 0xe3, 0x2c, 0xc9, 0x53, 0x4c, 0x57, 0xcf, 0xe9, 0xd7, 0x14, 0x8f, 0xa4, 0x9c, - 0xbc, 0x0d, 0x6d, 0x9f, 0x87, 0xae, 0x38, 0x4b, 0x19, 0xa6, 0x6c, 0xf1, 0x82, 0xd8, 0x07, 0x3c, - 0x7c, 0x72, 0x96, 0x32, 0xa7, 0xe5, 0xab, 0x1f, 0xe4, 0x3e, 0xac, 0x72, 0x96, 0x05, 0x34, 0x0c, - 0x3e, 0x65, 0xbe, 0xcb, 0x9e, 0xa5, 0x99, 0x9b, 0x86, 0x34, 0xc6, 0xcc, 0xf6, 0x1c, 0x52, 0xe9, - 0xde, 0x7b, 0x96, 0x66, 0x87, 0x21, 0x8d, 0xc9, 0x16, 0xf4, 0x93, 0x5c, 0xa4, 0xb9, 0x70, 0xb1, - 0xfa, 0xb8, 0x1b, 0xf8, 0x98, 0x68, 0xd3, 0x59, 0x54, 0xf2, 0xef, 0xa2, 0x78, 0xe8, 0x4b, 0x68, - 0x45, 0x46, 0x4f, 0x59, 0xe8, 0x96, 0x0c, 0xb0, 0xba, 0x9b, 0xc6, 0x56, 0xd3, 0x59, 0x52, 0xf2, - 0x27, 0x85, 0x98, 0x6c, 0xc3, 0xca, 0x38, 0xa7, 0x19, 0x8d, 0x05, 0x63, 0x35, 0xeb, 0x1e, 0x5a, - 0x93, 0x52, 0x55, 0x4e, 0xb0, 0x7f, 0xdd, 0xac, 0x52, 0x2f, 0xb3, 0xc4, 0xaf, 0x91, 0xfa, 0xeb, - 0xb4, 0xe0, 0x33, 0xf9, 0x62, 0xce, 0xe6, 0xcb, 0x1d, 0xe8, 0x46, 0x4c, 0x64, 0x81, 0xa7, 0xf2, - 0xa2, 0xca, 0x18, 0x94, 0x08, 0xc1, 0xbf, 0x03, 0xdd, 0x38, 0x8f, 0xdc, 0x4f, 0x72, 0x96, 0x05, - 0x8c, 0xeb, 0x52, 0x86, 0x38, 0x8f, 0x7e, 0xa0, 0x24, 0x64, 0x05, 0xe6, 0x44, 0x92, 0xba, 0x1f, - 0xeb, 0x4a, 0x6e, 0x8a, 0x24, 0x7d, 0x4c, 0xbe, 0x0d, 0xeb, 0x9c, 0xd1, 0x90, 0xf9, 0x6e, 0x59, - 0x95, 0xdc, 0xe5, 0x88, 0x05, 0xf3, 0xad, 0x16, 0xa6, 0xc2, 0x52, 0x16, 0x47, 0xa5, 0xc1, 0x91, - 0xd6, 0x4b, 0xa4, 0xcb, 0x85, 0xd7, 0xa6, 0xb5, 0xb1, 0x4f, 0x25, 0x95, 0xaa, 0x9c, 0xf0, 0x0e, - 0x58, 0xe3, 0x30, 0x19, 0xd1, 0xd0, 0x3d, 0xf7, 0x55, 0x6c, 0x88, 0x4d, 0xe7, 0xa6, 0xd2, 0x1f, - 0x4d, 0x7d, 0x52, 0x86, 0xc7, 0xc3, 0xc0, 0x63, 0xbe, 0x3b, 0x0a, 0x93, 0x91, 0x05, 0x48, 0x29, - 0x50, 0x22, 0x59, 0xc8, 0x92, 0x4a, 0xda, 0x40, 0xc2, 0xe0, 0x25, 0x79, 0x2c, 0x90, 0x20, 0xa6, - 0xb3, 0xa8, 0xe4, 0x07, 0x79, 0xb4, 0x27, 0xa5, 0xe4, 0x75, 0x58, 0xd0, 0x96, 0xc9, 0xf1, 0x31, - 0x67, 0x02, 0x99, 0x61, 0x3a, 0x3d, 0x25, 0xfc, 0x3e, 0xca, 0xec, 0x9f, 0x98, 0xb0, 0xe4, 0x48, - 0x74, 0xd9, 0x29, 0xfb, 0x9f, 0xdf, 0x10, 0x2e, 0x2a, 0xcc, 0xf9, 0xe7, 0x2a, 0xcc, 0xd6, 0x95, - 0x0b, 0xb3, 0xfd, 0x5c, 0x85, 0xd9, 0xb9, 0xb0, 0x30, 0xff, 0x30, 0x91, 0x84, 0xcf, 0x6b, 0x69, - 0xbe, 0x09, 0x66, 0xe0, 0x73, 0x4c, 0x4e, 0x77, 0xc7, 0x9a, 0x74, 0xae, 0x5f, 0xa7, 0x86, 0x03, - 0xee, 0x48, 0x23, 0xf2, 0x00, 0xba, 0x1a, 0x50, 0x3c, 0x9e, 0xe6, 0xf0, 0x78, 0xba, 0x3d, 0x73, - 0x0e, 0x22, 0x2c, 0x8f, 0x26, 0x47, 0x35, 0x40, 0x5c, 0xfe, 0x26, 0xdf, 0x81, 0x8d, 0xf3, 0x05, - 0x9b, 0x69, 0x8c, 0x7c, 0x6b, 0x1e, 0x73, 0xb4, 0x36, 0x5d, 0xb1, 0x05, 0x88, 0x3e, 0xf9, 0x1a, - 0xac, 0xd6, 0x4a, 0xb6, 0x9a, 0xd8, 0x52, 0xd7, 0xd1, 0x4a, 0x57, 0x4d, 0xb9, 0xac, 0x68, 0xdb, - 0x97, 0x15, 0xad, 0xfd, 0xf7, 0x06, 0x2c, 0x0c, 0x58, 0xc8, 0x04, 0x7b, 0xd9, 0x9b, 0xa0, 0x8a, - 0x44, 0xed, 0xe9, 0x36, 0x67, 0x03, 0x3a, 0xd3, 0x47, 0x65, 0x9b, 0x15, 0x75, 0x78, 0x0b, 0x3a, - 0x55, 0xa1, 0x00, 0x16, 0x4a, 0x25, 0xb0, 0x63, 0x58, 0x7f, 0x3f, 0xa1, 0xfe, 0x2e, 0x0d, 0x69, - 0xec, 0x31, 0x0d, 0xfc, 0x0b, 0xdc, 0x1a, 0x6e, 0x03, 0xd4, 0x72, 0xdb, 0xc0, 0xdc, 0xd6, 0x24, - 0xf6, 0x3f, 0x0d, 0xe8, 0xc8, 0x0f, 0xe2, 0xa5, 0xe0, 0x1a, 0xfe, 0x27, 0xba, 0xc1, 0xc6, 0x8c, - 0x6e, 0xb0, 0xec, 0xeb, 0x75, 0x2a, 0x6b, 0x8d, 0x7e, 0xad, 0x61, 0x6f, 0x4e, 0x36, 0xec, 0x77, - 0xa0, 0x1b, 0xc8, 0x05, 0xb9, 0x29, 0x15, 0x27, 0x6a, 0x03, 0xec, 0x38, 0x80, 0xa2, 0x43, 0x29, - 0x91, 0x1d, 0x7d, 0x61, 0x80, 0x1d, 0xfd, 0xfc, 0x95, 0x3b, 0x7a, 0xed, 0x04, 0x3b, 0xfa, 0x3f, - 0x37, 0xc0, 0xd2, 0x10, 0x57, 0x2f, 0x91, 0x1f, 0xa4, 0x3e, 0x3e, 0x88, 0xde, 0x82, 0x4e, 0xc9, - 0x7b, 0xfd, 0x10, 0x58, 0x09, 0x24, 0xae, 0xfb, 0x2c, 0x4a, 0xb2, 0xb3, 0xa3, 0xe0, 0x53, 0xa6, - 0x03, 0xaf, 0x49, 0x64, 0x6c, 0x07, 0x79, 0xe4, 0x24, 0x4f, 0xb9, 0xde, 0xfe, 0x8b, 0xa1, 0x8c, - 0xcd, 0xc3, 0x7b, 0x18, 0xee, 0x97, 0x18, 0x79, 0xd3, 0x01, 0x25, 0x92, 0xfb, 0x24, 0x59, 0x83, - 0x36, 0x8b, 0x7d, 0xa5, 0x9d, 0x43, 0x6d, 0x8b, 0xc5, 0x3e, 0xaa, 0x86, 0xb0, 0xa8, 0x5f, 0x20, - 0x13, 0x8e, 0x54, 0x44, 0xfa, 0x76, 0x77, 0xec, 0x0b, 0x9e, 0x7d, 0xf7, 0xf9, 0xf8, 0x50, 0x5b, - 0x3a, 0x0b, 0xea, 0x11, 0x52, 0x0f, 0xc9, 0x7b, 0xd0, 0x93, 0x5f, 0x29, 0x1d, 0xb5, 0xae, 0xec, - 0xa8, 0xcb, 0x62, 0xbf, 0x18, 0xd8, 0xbf, 0x31, 0x60, 0xf9, 0x1c, 0x84, 0xd7, 0xe0, 0xd1, 0x63, - 0x68, 0x1f, 0xb1, 0xb1, 0x74, 0x51, 0xbc, 0xab, 0x6e, 0x5f, 0xf4, 0x4c, 0x7f, 0x41, 0xc2, 0x9c, - 0xd2, 0x81, 0xbc, 0x72, 0x03, 0x12, 0x1a, 0x87, 0xe7, 0xc8, 0x62, 0x5c, 0x87, 0x2c, 0xf2, 0xc4, - 0x95, 0x6d, 0x48, 0xc6, 0x42, 0x2a, 0xaa, 0x1d, 0x93, 0xeb, 0xdc, 0x93, 0x38, 0x8f, 0x1c, 0xa5, - 0x2a, 0x8a, 0xd6, 0xfe, 0x95, 0x01, 0x80, 0x5b, 0xbe, 0x5a, 0xc6, 0xf4, 0xce, 0x63, 0x5c, 0x7e, - 0x87, 0x6d, 0x4c, 0x96, 0xc4, 0x6e, 0x51, 0x12, 0x1c, 0x31, 0x32, 0x67, 0xc5, 0x50, 0x62, 0x54, - 0x05, 0xaf, 0xab, 0x46, 0xe1, 0xf2, 0x5b, 0x03, 0x7a, 0x35, 0xf8, 0xf8, 0x64, 0xf5, 0x1a, 0xd3, - 0xd5, 0x8b, 0x0d, 0xaa, 0x64, 0xb4, 0xcb, 0x6b, 0x24, 0x8f, 0x2a, 0x92, 0xaf, 0x41, 0x1b, 0x21, - 0xa9, 0xb1, 0x3c, 0xd6, 0x2c, 0xbf, 0x0b, 0xcb, 0x19, 0xf3, 0x58, 0x2c, 0xc2, 0x33, 0x37, 0x4a, - 0xfc, 0xe0, 0x38, 0x60, 0x3e, 0x72, 0xbd, 0xed, 0xf4, 0x0b, 0xc5, 0xbe, 0x96, 0xdb, 0x7f, 0x35, - 0x60, 0x51, 0xf6, 0xb4, 0x67, 0x07, 0x89, 0xcf, 0xd4, 0xca, 0x9e, 0x9f, 0x41, 0xef, 0x62, 0x2c, - 0x1a, 0x1e, 0x45, 0xa1, 0xd7, 0xff, 0x3d, 0x85, 0xb8, 0xd3, 0xe6, 0x9a, 0x36, 0x12, 0x62, 0xf5, - 0x2e, 0x71, 0x15, 0x88, 0xab, 0xc4, 0xea, 0xc3, 0x5c, 0x41, 0xfc, 0x63, 0x03, 0xba, 0xb5, 0x62, - 0x21, 0xaf, 0x41, 0x4f, 0x9f, 0x0b, 0xea, 0x9c, 0x32, 0x70, 0x13, 0xec, 0x7a, 0xd5, 0x43, 0x2f, - 0x59, 0x85, 0xb9, 0x88, 0x8f, 0x75, 0xc6, 0x7b, 0x8e, 0x1a, 0x90, 0x75, 0x68, 0x47, 0x7c, 0x8c, - 0xd7, 0x37, 0xbd, 0x73, 0x96, 0xe3, 0xc9, 0x23, 0xa4, 0x39, 0x7d, 0x84, 0xfc, 0xde, 0x00, 0xa2, - 0x5b, 0x99, 0x17, 0xfa, 0x37, 0x00, 0x09, 0x5b, 0x7f, 0xac, 0x6e, 0xe0, 0x36, 0x3c, 0x21, 0x9b, - 0xba, 0xd1, 0x9b, 0xe7, 0x6e, 0xf4, 0x77, 0x61, 0xd9, 0x67, 0xc7, 0x54, 0x76, 0x5d, 0xd3, 0x4b, - 0xee, 0x6b, 0x45, 0xd9, 0x1c, 0xbe, 0xf9, 0x0e, 0x74, 0xca, 0x3f, 0xe1, 0x48, 0x1f, 0x7a, 0xc3, - 0x38, 0x10, 0xd8, 0xc6, 0x06, 0xf1, 0xb8, 0xff, 0x05, 0xd2, 0x85, 0xd6, 0xf7, 0x18, 0x0d, 0xc5, - 0xc9, 0x59, 0xdf, 0x20, 0x3d, 0x68, 0x3f, 0x1c, 0xc5, 0x49, 0x16, 0xd1, 0xb0, 0xdf, 0xd8, 0x7d, - 0xfb, 0xa3, 0x6f, 0x8c, 0x03, 0x71, 0x92, 0x8f, 0x64, 0x24, 0xdb, 0x2a, 0xb4, 0xaf, 0x06, 0x89, - 0xfe, 0xb5, 0x5d, 0x64, 0x6d, 0x1b, 0xa3, 0x2d, 0x87, 0xe9, 0x68, 0x34, 0x8f, 0x92, 0xb7, 0xfe, - 0x15, 0x00, 0x00, 0xff, 0xff, 0x12, 0xea, 0x05, 0xbc, 0xaa, 0x1c, 0x00, 0x00, + // 2018 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0xdd, 0x6f, 0x24, 0x47, + 0x11, 0x67, 0x76, 0x76, 0xbd, 0xbb, 0xb5, 0x6b, 0xdf, 0x5e, 0x9f, 0xef, 0x32, 0xfe, 0xc8, 0x9d, + 0x33, 0x09, 0x60, 0x72, 0xe2, 0x7c, 0x38, 0x40, 0x22, 0x84, 0xb8, 0x9c, 0xbd, 0xe1, 0x58, 0x5d, + 0x6c, 0xcc, 0xf8, 0x12, 0x89, 0xbc, 0x8c, 0x7a, 0x67, 0xda, 0xeb, 0x21, 0xf3, 0x95, 0xe9, 0x1e, + 0xdf, 0x39, 0x4f, 0x08, 0xc1, 0x0b, 0x08, 0x24, 0x90, 0xf8, 0x37, 0x78, 0xe5, 0x89, 0x0f, 0xf1, + 0xc4, 0xbf, 0xc0, 0x03, 0xff, 0x07, 0xe2, 0x09, 0x75, 0x75, 0xcf, 0xc7, 0xae, 0xd7, 0x3e, 0x9f, + 0x4f, 0x90, 0x20, 0xe5, 0x6d, 0xbb, 0xaa, 0xba, 0xa7, 0xeb, 0x57, 0xbf, 0xea, 0xaa, 0xee, 0x85, + 0xa5, 0x20, 0x16, 0x2c, 0x8b, 0x69, 0x78, 0x2f, 0xcd, 0x12, 0x91, 0x90, 0x9b, 0x51, 0x10, 0x9e, + 0xe4, 0x5c, 0x8d, 0xee, 0x15, 0xca, 0xd5, 0xbe, 0x97, 0x44, 0x51, 0x12, 0x2b, 0xf1, 0x6a, 0x9f, + 0x7b, 0xc7, 0x2c, 0xa2, 0x6a, 0x64, 0xff, 0xd9, 0x80, 0xc5, 0xdd, 0x24, 0x4a, 0x93, 0x98, 0xc5, + 0x62, 0x14, 0x1f, 0x25, 0xe4, 0x16, 0x2c, 0xc4, 0x89, 0xcf, 0x46, 0x43, 0xcb, 0xd8, 0x30, 0x36, + 0x4d, 0x47, 0x8f, 0x08, 0x81, 0x66, 0x96, 0x84, 0xcc, 0x6a, 0x6c, 0x18, 0x9b, 0x5d, 0x07, 0x7f, + 0x93, 0x07, 0x00, 0x5c, 0x50, 0xc1, 0x5c, 0x2f, 0xf1, 0x99, 0x65, 0x6e, 0x18, 0x9b, 0x4b, 0xdb, + 0x1b, 0xf7, 0xe6, 0xee, 0xe2, 0xde, 0xa1, 0x34, 0xdc, 0x4d, 0x7c, 0xe6, 0x74, 0x79, 0xf1, 0x93, + 0xbc, 0x0b, 0xc0, 0x9e, 0x89, 0x8c, 0xba, 0x41, 0x7c, 0x94, 0x58, 0xcd, 0x0d, 0x73, 0xb3, 0xb7, + 0xfd, 0xda, 0xf4, 0x02, 0x7a, 0xf3, 0x8f, 0xd9, 0xe9, 0x87, 0x34, 0xcc, 0xd9, 0x01, 0x0d, 0x32, + 0xa7, 0x8b, 0x93, 0xe4, 0x76, 0xed, 0x7f, 0x18, 0x70, 0xad, 0x74, 0x00, 0xbf, 0xc1, 0xc9, 0x77, + 0xa0, 0x85, 0x9f, 0x40, 0x0f, 0x7a, 0xdb, 0x6f, 0x9c, 0xb3, 0xa3, 0x29, 0xbf, 0x1d, 0x35, 0x85, + 0x7c, 0x00, 0x37, 0x78, 0x3e, 0xf6, 0x0a, 0x95, 0x8b, 0x52, 0x6e, 0x35, 0x70, 0x6b, 0x97, 0x5b, + 0x89, 0xd4, 0x17, 0xd0, 0x5b, 0x7a, 0x0b, 0x16, 0xe4, 0x4a, 0x39, 0x47, 0x94, 0x7a, 0xdb, 0x6b, + 0x73, 0x9d, 0x3c, 0x44, 0x13, 0x47, 0x9b, 0xda, 0x6b, 0xb0, 0xf2, 0x88, 0x89, 0x19, 0xef, 0x1c, + 0xf6, 0x49, 0xce, 0xb8, 0xd0, 0xca, 0x27, 0x41, 0xc4, 0x9e, 0x04, 0xde, 0xc7, 0xbb, 0xc7, 0x34, + 0x8e, 0x59, 0x58, 0x28, 0x5f, 0x85, 0xb5, 0x47, 0x0c, 0x27, 0x04, 0x5c, 0x04, 0x1e, 0x9f, 0x51, + 0xdf, 0x84, 0x1b, 0x8f, 0x98, 0x18, 0xfa, 0x33, 0xe2, 0x0f, 0xa1, 0xb3, 0x2f, 0x83, 0x2d, 0x69, + 0xf0, 0x6d, 0x68, 0x53, 0xdf, 0xcf, 0x18, 0xe7, 0x1a, 0xc5, 0xf5, 0xb9, 0x3b, 0x7e, 0xa8, 0x6c, + 0x9c, 0xc2, 0x78, 0x1e, 0x4d, 0xec, 0x9f, 0x00, 0x8c, 0xe2, 0x40, 0x1c, 0xd0, 0x8c, 0x46, 0xfc, + 0x5c, 0x82, 0x0d, 0xa1, 0xcf, 0x05, 0xcd, 0x84, 0x9b, 0xa2, 0x9d, 0x86, 0xfc, 0x12, 0x6c, 0xe8, + 0xe1, 0x34, 0xb5, 0xba, 0xfd, 0x63, 0x80, 0x43, 0x91, 0x05, 0xf1, 0xe4, 0xfd, 0x80, 0x0b, 0xf9, + 0xad, 0x13, 0x69, 0x27, 0x9d, 0x30, 0x37, 0xbb, 0x8e, 0x1e, 0xd5, 0xc2, 0xd1, 0xb8, 0x7c, 0x38, + 0x1e, 0x40, 0xaf, 0x80, 0x7b, 0x8f, 0x4f, 0xc8, 0x7d, 0x68, 0x8e, 0x29, 0x67, 0x17, 0xc2, 0xb3, + 0xc7, 0x27, 0x3b, 0x94, 0x33, 0x07, 0x2d, 0xed, 0x5f, 0x9a, 0xf0, 0xca, 0x6e, 0xc6, 0x90, 0xfc, + 0x61, 0xc8, 0x3c, 0x11, 0x24, 0xb1, 0xc6, 0xfe, 0xc5, 0x57, 0x23, 0xaf, 0x40, 0xdb, 0x1f, 0xbb, + 0x31, 0x8d, 0x0a, 0xb0, 0x17, 0xfc, 0xf1, 0x3e, 0x8d, 0x18, 0xf9, 0x0a, 0x2c, 0x79, 0xe5, 0xfa, + 0x52, 0x82, 0x9c, 0xeb, 0x3a, 0x33, 0x52, 0xf2, 0x06, 0x2c, 0xa6, 0x34, 0x13, 0x41, 0x69, 0xd6, + 0x44, 0xb3, 0x69, 0xa1, 0x0c, 0xa8, 0x3f, 0x1e, 0x0d, 0xad, 0x16, 0x06, 0x0b, 0x7f, 0x13, 0x1b, + 0xfa, 0xd5, 0x5a, 0xa3, 0xa1, 0xb5, 0x80, 0xba, 0x29, 0x19, 0xd9, 0x80, 0x5e, 0xb9, 0xd0, 0x68, + 0x68, 0xb5, 0xd1, 0xa4, 0x2e, 0x92, 0xc1, 0x51, 0x67, 0x91, 0xd5, 0xd9, 0x30, 0x36, 0xfb, 0x8e, + 0x1e, 0x91, 0xfb, 0x70, 0xe3, 0x24, 0xc8, 0x44, 0x4e, 0x43, 0xcd, 0x4f, 0xb9, 0x0f, 0x6e, 0x75, + 0x31, 0x82, 0xf3, 0x54, 0x64, 0x1b, 0x96, 0xd3, 0xe3, 0x53, 0x1e, 0x78, 0x33, 0x53, 0x00, 0xa7, + 0xcc, 0xd5, 0xd9, 0x7f, 0x33, 0xe0, 0xe6, 0x30, 0x4b, 0xd2, 0xcf, 0x45, 0x28, 0x0a, 0x90, 0x9b, + 0x17, 0x80, 0xdc, 0x3a, 0x0b, 0xb2, 0xfd, 0xeb, 0x06, 0xdc, 0x52, 0x8c, 0x3a, 0x28, 0x80, 0xfd, + 0x2f, 0x78, 0xf1, 0x55, 0xb8, 0x56, 0x7d, 0x55, 0x19, 0xcc, 0x77, 0xe3, 0xcb, 0xb0, 0x54, 0x06, + 0x58, 0xd9, 0xfd, 0x6f, 0x29, 0x65, 0xff, 0xaa, 0x01, 0xcb, 0x32, 0xa8, 0x5f, 0xa0, 0x21, 0xd1, + 0xf8, 0x85, 0x01, 0x44, 0xb1, 0xe3, 0x61, 0x18, 0x50, 0x7e, 0x75, 0x2c, 0xe6, 0xb8, 0xdc, 0x98, + 0xeb, 0xf2, 0x32, 0xb4, 0xa8, 0xfc, 0x94, 0x46, 0x44, 0x0d, 0xec, 0x8f, 0x60, 0x20, 0x83, 0xf2, + 0x92, 0x9b, 0x28, 0xd7, 0x6e, 0xd4, 0xd7, 0xfe, 0xb9, 0x01, 0xd7, 0x1f, 0x86, 0x82, 0x65, 0x9f, + 0xad, 0x8b, 0x7f, 0x69, 0x14, 0x50, 0x8f, 0x62, 0x9f, 0x3d, 0xfb, 0x2c, 0x69, 0xf7, 0x2a, 0xc0, + 0x51, 0xc0, 0x42, 0xbf, 0x4e, 0xb9, 0x2e, 0x4a, 0x5e, 0x8a, 0x6e, 0x16, 0xb4, 0x71, 0x91, 0x92, + 0x6a, 0xc5, 0x50, 0x16, 0x6e, 0xd5, 0xc4, 0xe9, 0xc2, 0xdd, 0xb9, 0x74, 0xe1, 0xc6, 0x69, 0xba, + 0x70, 0xff, 0xc1, 0x84, 0xc5, 0x51, 0xcc, 0x59, 0x26, 0xae, 0x0e, 0xde, 0x3a, 0x74, 0xf9, 0x31, + 0xcd, 0xd0, 0x51, 0x0d, 0x5f, 0x25, 0xa8, 0x43, 0x6b, 0x3e, 0x0f, 0xda, 0xe6, 0x25, 0x33, 0xba, + 0x75, 0x51, 0x46, 0x2f, 0x5c, 0x00, 0x71, 0xfb, 0xf9, 0x19, 0xdd, 0x39, 0x5b, 0x32, 0xa5, 0x83, + 0x6c, 0x12, 0xc9, 0x4e, 0x73, 0x68, 0x75, 0x51, 0x5f, 0x09, 0xc8, 0x6d, 0x00, 0x11, 0x44, 0x8c, + 0x0b, 0x1a, 0xa5, 0xaa, 0xf8, 0x35, 0x9d, 0x9a, 0x44, 0x16, 0xdc, 0x2c, 0x79, 0x3a, 0x1a, 0x72, + 0xab, 0xb7, 0x61, 0xca, 0xce, 0x4b, 0x8d, 0xc8, 0x37, 0xa1, 0x93, 0x25, 0x4f, 0x5d, 0x9f, 0x0a, + 0x6a, 0xf5, 0x31, 0x78, 0x2b, 0x73, 0xc1, 0xde, 0x09, 0x93, 0xb1, 0xd3, 0xce, 0x92, 0xa7, 0x43, + 0x2a, 0xa8, 0xfd, 0x2f, 0x13, 0x16, 0x0f, 0x19, 0xcd, 0xbc, 0xe3, 0xab, 0x07, 0xec, 0x6b, 0x30, + 0xc8, 0x18, 0xcf, 0x43, 0xe1, 0x7a, 0xaa, 0x36, 0x8f, 0x86, 0x3a, 0x6e, 0xd7, 0x94, 0x7c, 0xb7, + 0x10, 0x97, 0xa0, 0x9a, 0x17, 0x80, 0xda, 0x9c, 0x03, 0xaa, 0x0d, 0xfd, 0x1a, 0x82, 0xdc, 0x6a, + 0xa1, 0xeb, 0x53, 0x32, 0x32, 0x00, 0xd3, 0xe7, 0x21, 0xc6, 0xab, 0xeb, 0xc8, 0x9f, 0xe4, 0x2e, + 0x5c, 0x4f, 0x43, 0xea, 0xb1, 0xe3, 0x24, 0xf4, 0x59, 0xe6, 0x4e, 0xb2, 0x24, 0x4f, 0x31, 0x66, + 0x7d, 0x67, 0x50, 0x53, 0x3c, 0x92, 0x72, 0xf2, 0x36, 0x74, 0x7c, 0x1e, 0xba, 0xe2, 0x34, 0x65, + 0x18, 0xb4, 0xa5, 0x73, 0x7c, 0x1f, 0xf2, 0xf0, 0xc9, 0x69, 0xca, 0x9c, 0xb6, 0xaf, 0x7e, 0x90, + 0xfb, 0xb0, 0xcc, 0x59, 0x16, 0xd0, 0x30, 0xf8, 0x94, 0xf9, 0x2e, 0x7b, 0x96, 0x66, 0x6e, 0x1a, + 0xd2, 0x18, 0x23, 0xdb, 0x77, 0x48, 0xa5, 0x7b, 0xef, 0x59, 0x9a, 0x1d, 0x84, 0x34, 0x26, 0x9b, + 0x30, 0x48, 0x72, 0x91, 0xe6, 0xc2, 0xc5, 0xec, 0xe3, 0x6e, 0xe0, 0x63, 0xa0, 0x4d, 0x67, 0x49, + 0xc9, 0xbf, 0x8f, 0xe2, 0x91, 0x2f, 0xa1, 0x15, 0x19, 0x3d, 0x61, 0xa1, 0x5b, 0x32, 0xc0, 0xea, + 0x6d, 0x18, 0x9b, 0x4d, 0xe7, 0x9a, 0x92, 0x3f, 0x29, 0xc4, 0x64, 0x0b, 0x6e, 0x4c, 0x72, 0x9a, + 0xd1, 0x58, 0x30, 0x56, 0xb3, 0xee, 0xa3, 0x35, 0x29, 0x55, 0xe5, 0x04, 0xfb, 0xb7, 0xcd, 0x2a, + 0xf4, 0x32, 0x4a, 0xfc, 0x0a, 0xa1, 0xbf, 0x4a, 0x0b, 0x3e, 0x97, 0x2f, 0xe6, 0x7c, 0xbe, 0xdc, + 0x81, 0x5e, 0xc4, 0x44, 0x16, 0x78, 0x2a, 0x2e, 0x2a, 0xa1, 0x41, 0x89, 0x10, 0xfc, 0x3b, 0xd0, + 0x8b, 0xf3, 0xc8, 0xfd, 0x24, 0x67, 0x59, 0xc0, 0xb8, 0x3e, 0x0f, 0x21, 0xce, 0xa3, 0x1f, 0x29, + 0x09, 0xb9, 0x01, 0x2d, 0x91, 0xa4, 0xee, 0xc7, 0x45, 0x1e, 0x8b, 0x24, 0x7d, 0x4c, 0xbe, 0x0b, + 0xab, 0x9c, 0xd1, 0x90, 0xf9, 0x6e, 0x99, 0x77, 0xdc, 0xe5, 0x88, 0x05, 0xf3, 0xad, 0x36, 0x86, + 0xc2, 0x52, 0x16, 0x87, 0xa5, 0xc1, 0xa1, 0xd6, 0x4b, 0xa4, 0xcb, 0x8d, 0xd7, 0xa6, 0x75, 0xb0, + 0x4f, 0x25, 0x95, 0xaa, 0x9c, 0xf0, 0x0e, 0x58, 0x93, 0x30, 0x19, 0xd3, 0xd0, 0x3d, 0xf3, 0x55, + 0x6c, 0x88, 0x4d, 0xe7, 0x96, 0xd2, 0x1f, 0xce, 0x7c, 0x52, 0xba, 0xc7, 0xc3, 0xc0, 0x63, 0xbe, + 0x3b, 0x0e, 0x93, 0xb1, 0x05, 0x48, 0x29, 0x50, 0x22, 0x99, 0xc8, 0x92, 0x4a, 0xda, 0x40, 0xc2, + 0xe0, 0x25, 0x79, 0x2c, 0x90, 0x20, 0xa6, 0xb3, 0xa4, 0xe4, 0xfb, 0x79, 0xb4, 0x2b, 0xa5, 0xe4, + 0x75, 0x58, 0xd4, 0x96, 0xc9, 0xd1, 0x11, 0x67, 0x02, 0x99, 0x61, 0x3a, 0x7d, 0x25, 0xfc, 0x21, + 0xca, 0xec, 0x9f, 0x99, 0x70, 0xcd, 0x91, 0xe8, 0xb2, 0x13, 0xf6, 0x7f, 0x7f, 0x20, 0x9c, 0x97, + 0x98, 0x0b, 0x2f, 0x94, 0x98, 0xed, 0x4b, 0x27, 0x66, 0xe7, 0x85, 0x12, 0xb3, 0x7b, 0x6e, 0x62, + 0xfe, 0x69, 0x2a, 0x08, 0x9f, 0xd7, 0xd4, 0x7c, 0x13, 0xcc, 0xc0, 0xe7, 0x18, 0x9c, 0xde, 0xb6, + 0x35, 0xbd, 0xb8, 0x7e, 0x9d, 0x1a, 0x0d, 0xb9, 0x23, 0x8d, 0xc8, 0x03, 0xe8, 0x69, 0x40, 0xb1, + 0x3c, 0xb5, 0xb0, 0x3c, 0xdd, 0x9e, 0x3b, 0x07, 0x11, 0x96, 0xa5, 0xc9, 0x51, 0x0d, 0x10, 0x97, + 0xbf, 0xc9, 0xf7, 0x60, 0xed, 0x6c, 0xc2, 0x66, 0x1a, 0x23, 0xdf, 0x5a, 0xc0, 0x18, 0xad, 0xcc, + 0x66, 0x6c, 0x01, 0xa2, 0x4f, 0xbe, 0x01, 0xcb, 0xb5, 0x94, 0xad, 0x26, 0xb6, 0xd5, 0x75, 0xb4, + 0xd2, 0x55, 0x53, 0x2e, 0x4a, 0xda, 0xce, 0x45, 0x49, 0x6b, 0xff, 0xb3, 0x01, 0x8b, 0x43, 0x16, + 0x32, 0xc1, 0xbe, 0x68, 0x82, 0xce, 0x6d, 0x82, 0xd6, 0xa0, 0x3b, 0x5b, 0x2a, 0x3b, 0xac, 0xc8, + 0xc3, 0x75, 0xe8, 0x56, 0x89, 0x02, 0x98, 0x28, 0x95, 0xc0, 0x8e, 0x61, 0xf5, 0xfd, 0x84, 0xfa, + 0x3b, 0x34, 0xa4, 0xb1, 0xc7, 0x34, 0xf0, 0x2f, 0x71, 0x6b, 0xb8, 0x0d, 0x50, 0x8b, 0x6d, 0x03, + 0x63, 0x5b, 0x93, 0xd8, 0xff, 0x36, 0xa0, 0x2b, 0x3f, 0x88, 0x97, 0x82, 0x2b, 0xc6, 0xb2, 0xec, + 0xf7, 0x1a, 0xb3, 0xfd, 0xde, 0x3a, 0x54, 0x7d, 0xbd, 0x8e, 0x66, 0xad, 0xd1, 0xaf, 0x35, 0xec, + 0xcd, 0xe9, 0x86, 0xfd, 0x0e, 0xf4, 0x02, 0xb9, 0x21, 0x37, 0xa5, 0xe2, 0x58, 0x1d, 0x80, 0x5d, + 0x07, 0x50, 0x74, 0x20, 0x25, 0xb2, 0xa3, 0x2f, 0x0c, 0xb0, 0xa3, 0x5f, 0xb8, 0x74, 0x47, 0xaf, + 0x17, 0xc1, 0x8e, 0xfe, 0xaf, 0x0d, 0xb0, 0x34, 0xc4, 0xd5, 0x4b, 0xe4, 0x07, 0xa9, 0x8f, 0x0f, + 0xa2, 0xeb, 0xd0, 0x2d, 0x79, 0xaf, 0x1f, 0x02, 0x2b, 0x81, 0xc4, 0x75, 0x8f, 0x45, 0x49, 0x76, + 0x7a, 0x18, 0x7c, 0xca, 0xb4, 0xe3, 0x35, 0x89, 0xf4, 0x6d, 0x3f, 0x8f, 0x9c, 0xe4, 0x29, 0xd7, + 0xc7, 0x7f, 0x31, 0x94, 0xbe, 0x79, 0x78, 0x0f, 0xc3, 0xf3, 0x12, 0x3d, 0x6f, 0x3a, 0xa0, 0x44, + 0xf2, 0x9c, 0x24, 0x2b, 0xd0, 0x61, 0xb1, 0xaf, 0xb4, 0x2d, 0xd4, 0xb6, 0x59, 0xec, 0xa3, 0x6a, + 0x04, 0x4b, 0xfa, 0x05, 0x32, 0xe1, 0x48, 0x36, 0x24, 0x6f, 0x6f, 0xdb, 0x3e, 0xe7, 0xd9, 0x77, + 0x8f, 0x4f, 0x0e, 0xb4, 0xa5, 0xb3, 0xa8, 0x1e, 0x21, 0xf5, 0x90, 0xbc, 0x07, 0x7d, 0xf9, 0x95, + 0x72, 0xa1, 0xf6, 0xa5, 0x17, 0xea, 0xb1, 0xd8, 0x2f, 0x06, 0xf6, 0xef, 0x0c, 0xb8, 0x7e, 0x06, + 0xc2, 0x2b, 0xf0, 0xe8, 0x31, 0x74, 0x0e, 0xd9, 0x44, 0x2e, 0x51, 0xbc, 0xab, 0x6e, 0x9d, 0xf7, + 0x4c, 0x7f, 0x4e, 0xc0, 0x9c, 0x72, 0x01, 0x79, 0xe5, 0x06, 0x24, 0x34, 0x0e, 0xcf, 0x90, 0xc5, + 0xb8, 0x0a, 0x59, 0x64, 0xc5, 0x95, 0x6d, 0x48, 0xc6, 0x42, 0x2a, 0xaa, 0x13, 0x93, 0xeb, 0xd8, + 0x93, 0x38, 0x8f, 0x1c, 0xa5, 0x2a, 0x92, 0xd6, 0xfe, 0x8d, 0x01, 0x80, 0x47, 0xbe, 0xda, 0xc6, + 0xec, 0xd9, 0x62, 0x5c, 0x7c, 0x87, 0x6d, 0x4c, 0xa7, 0xc4, 0x4e, 0x91, 0x12, 0x1c, 0x31, 0x32, + 0xe7, 0xf9, 0x50, 0x62, 0x54, 0x39, 0xaf, 0xb3, 0x46, 0xe1, 0xf2, 0x7b, 0x03, 0xfa, 0x35, 0xf8, + 0xf8, 0x74, 0xf6, 0x1a, 0xb3, 0xd9, 0x8b, 0x0d, 0xaa, 0x64, 0xb4, 0xcb, 0x6b, 0x24, 0x8f, 0x2a, + 0x92, 0xaf, 0x40, 0x07, 0x21, 0xa9, 0xb1, 0x3c, 0xd6, 0x2c, 0xbf, 0x0b, 0xd7, 0x33, 0xe6, 0xb1, + 0x58, 0x84, 0xa7, 0x6e, 0x94, 0xf8, 0xc1, 0x51, 0xc0, 0x7c, 0xe4, 0x7a, 0xc7, 0x19, 0x14, 0x8a, + 0x3d, 0x2d, 0xb7, 0xff, 0x6e, 0xc0, 0x92, 0xec, 0x69, 0x4f, 0xf7, 0x13, 0x9f, 0xa9, 0x9d, 0xbd, + 0x38, 0x83, 0xde, 0x45, 0x5f, 0x34, 0x3c, 0x8a, 0x42, 0xaf, 0x3f, 0x9f, 0x42, 0xdc, 0xe9, 0x70, + 0x4d, 0x1b, 0x09, 0xb1, 0x7a, 0x97, 0xb8, 0x0c, 0xc4, 0x55, 0x60, 0x75, 0x31, 0x57, 0x10, 0xff, + 0xd4, 0x80, 0x5e, 0x2d, 0x59, 0xc8, 0x6b, 0xd0, 0xd7, 0x05, 0x58, 0x55, 0x22, 0x03, 0x0f, 0xc1, + 0x9e, 0x57, 0x3d, 0xf4, 0x92, 0x65, 0x68, 0x45, 0x7c, 0xa2, 0x23, 0xde, 0x77, 0xd4, 0x80, 0xac, + 0x42, 0x27, 0xe2, 0x13, 0xbc, 0xbe, 0xe9, 0x93, 0xb3, 0x1c, 0x4f, 0x97, 0x90, 0xe6, 0x6c, 0x09, + 0xf9, 0xa3, 0x01, 0x44, 0xb7, 0x32, 0x2f, 0xf5, 0x6f, 0x00, 0x12, 0xb6, 0xfe, 0x58, 0xdd, 0xc0, + 0x63, 0x78, 0x4a, 0x36, 0x73, 0xa3, 0x37, 0xcf, 0xdc, 0xe8, 0xef, 0xc2, 0x75, 0x9f, 0x1d, 0x51, + 0xd9, 0x75, 0xcd, 0x6e, 0x79, 0xa0, 0x15, 0x65, 0x73, 0xf8, 0xe6, 0x3b, 0xd0, 0x2d, 0xff, 0x84, + 0x23, 0x03, 0xe8, 0x8f, 0xe2, 0x40, 0x60, 0x1b, 0x1b, 0xc4, 0x93, 0xc1, 0x97, 0x48, 0x0f, 0xda, + 0x3f, 0x60, 0x34, 0x14, 0xc7, 0xa7, 0x03, 0x83, 0xf4, 0xa1, 0xf3, 0x70, 0x1c, 0x27, 0x59, 0x44, + 0xc3, 0x41, 0x63, 0xe7, 0xed, 0x8f, 0xbe, 0x35, 0x09, 0xc4, 0x71, 0x3e, 0x96, 0x9e, 0x6c, 0x29, + 0xd7, 0xbe, 0x1e, 0x24, 0xfa, 0xd7, 0x56, 0x11, 0xb5, 0x2d, 0xf4, 0xb6, 0x1c, 0xa6, 0xe3, 0xf1, + 0x02, 0x4a, 0xde, 0xfa, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1f, 0x11, 0x60, 0xe1, 0xaa, 0x1c, + 0x00, 0x00, } diff --git a/internal/proxy/task.go b/internal/proxy/task.go index 79b2eac676..b0dd826a8e 100644 --- a/internal/proxy/task.go +++ b/internal/proxy/task.go @@ -923,7 +923,7 @@ func (it *insertTask) _assignSegmentID(stream msgstream.MsgStream, pack *msgstre size += int(unsafe.Sizeof(msg.CollectionID)) size += int(unsafe.Sizeof(msg.PartitionID)) size += int(unsafe.Sizeof(msg.SegmentID)) - size += int(unsafe.Sizeof(msg.ChannelID)) + size += int(unsafe.Sizeof(msg.ShardName)) size += int(unsafe.Sizeof(msg.Timestamps)) size += int(unsafe.Sizeof(msg.RowIDs)) return size @@ -962,8 +962,7 @@ func (it *insertTask) _assignSegmentID(stream msgstream.MsgStream, pack *msgstre CollectionName: collectionName, PartitionName: partitionName, SegmentID: segmentID, - // todo rename to ChannelName - ChannelID: channelNames[key], + ShardName: channelNames[key], } insertMsg := &msgstream.InsertMsg{ BaseMsg: msgstream.BaseMsg{ diff --git a/internal/querynode/data_sync_service_test.go b/internal/querynode/data_sync_service_test.go index 01d36911f0..a64ebf5457 100644 --- a/internal/querynode/data_sync_service_test.go +++ b/internal/querynode/data_sync_service_test.go @@ -71,7 +71,7 @@ func TestDataSyncService_Start(t *testing.T) { CollectionID: collectionID, PartitionID: defaultPartitionID, SegmentID: UniqueID(0), - ChannelID: "0", + ShardName: "0", Timestamps: []Timestamp{Timestamp(i + 1000), Timestamp(i + 1000)}, RowIDs: []int64{int64(i), int64(i)}, RowData: []*commonpb.Blob{ diff --git a/internal/querynode/flow_graph_insert_node.go b/internal/querynode/flow_graph_insert_node.go index 1d13bc2c4c..1d928e8947 100644 --- a/internal/querynode/flow_graph_insert_node.go +++ b/internal/querynode/flow_graph_insert_node.go @@ -84,7 +84,7 @@ func (iNode *insertNode) Operate(in []flowgraph.Msg) []flowgraph.Msg { // check if segment exists, if not, create this segment if !iNode.replica.hasSegment(task.SegmentID) { - err := iNode.replica.addSegment(task.SegmentID, task.PartitionID, task.CollectionID, task.ChannelID, segmentTypeGrowing, true) + err := iNode.replica.addSegment(task.SegmentID, task.PartitionID, task.CollectionID, task.ShardName, segmentTypeGrowing, true) if err != nil { log.Warn(err.Error()) continue diff --git a/internal/querynode/load_service_test.go b/internal/querynode/load_service_test.go index 3fd948b3ee..196a34b444 100644 --- a/internal/querynode/load_service_test.go +++ b/internal/querynode/load_service_test.go @@ -885,7 +885,7 @@ func doInsert(ctx context.Context, collectionID UniqueID, partitionID UniqueID, CollectionID: collectionID, PartitionID: partitionID, SegmentID: segmentID, - ChannelID: "0", + ShardName: "0", Timestamps: []uint64{uint64(i + 1000)}, RowIDs: []int64{int64(i)}, RowData: []*commonpb.Blob{ diff --git a/internal/querynode/mock_test.go b/internal/querynode/mock_test.go index 2d28970051..1aa734f0cf 100644 --- a/internal/querynode/mock_test.go +++ b/internal/querynode/mock_test.go @@ -705,7 +705,7 @@ func genSimpleInsertMsg() (*msgstream.InsertMsg, error) { CollectionID: defaultCollectionID, PartitionID: defaultPartitionID, SegmentID: defaultSegmentID, - ChannelID: defaultVChannel, + ShardName: defaultVChannel, Timestamps: genSimpleTimestampFieldData(), RowIDs: genSimpleRowIDField(), RowData: rowData, diff --git a/internal/util/typeutil/conversion_test.go b/internal/util/typeutil/conversion_test.go index b1f4946d48..51f8db8e87 100644 --- a/internal/util/typeutil/conversion_test.go +++ b/internal/util/typeutil/conversion_test.go @@ -73,4 +73,5 @@ func TestConversion(t *testing.T) { ret1 := SliceRemoveDuplicate(arr) assert.Equal(t, 3, len(ret1)) }) + }