From faa23fde864c9c2d1ba4c989e3822f647fff11b3 Mon Sep 17 00:00:00 2001 From: "zhenshan.cao" Date: Mon, 8 Feb 2021 14:20:29 +0800 Subject: [PATCH] Fix getindexstate failed to fetch indexstate Signed-off-by: zhenshan.cao --- internal/core/src/pb/milvus.pb.cc | 357 +++++++++++++++----------- internal/core/src/pb/milvus.pb.h | 27 +- internal/indexservice/indexservice.go | 25 ++ internal/masterservice/task.go | 1 + internal/proto/milvus.proto | 3 +- internal/proto/milvuspb/milvus.pb.go | 254 +++++++++--------- internal/proxynode/impl.go | 8 +- internal/proxynode/paramtable.go | 100 +------- internal/proxynode/task.go | 53 +++- tests/python/requirements.txt | 2 +- 10 files changed, 445 insertions(+), 385 deletions(-) diff --git a/internal/core/src/pb/milvus.pb.cc b/internal/core/src/pb/milvus.pb.cc index 0a8ff050b0..8d9a01020f 100644 --- a/internal/core/src/pb/milvus.pb.cc +++ b/internal/core/src/pb/milvus.pb.cc @@ -1169,6 +1169,7 @@ const ::PROTOBUF_NAMESPACE_ID::uint32 TableStruct_milvus_2eproto::offsets[] PROT ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ PROTOBUF_FIELD_OFFSET(::milvus::proto::milvus::IndexDescription, index_name_), + PROTOBUF_FIELD_OFFSET(::milvus::proto::milvus::IndexDescription, indexid_), PROTOBUF_FIELD_OFFSET(::milvus::proto::milvus::IndexDescription, params_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::milvus::proto::milvus::DescribeIndexResponse, _internal_metadata_), @@ -1355,24 +1356,24 @@ static const ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema schemas[] PROTOB { 209, -1, sizeof(::milvus::proto::milvus::CreateIndexRequest)}, { 219, -1, sizeof(::milvus::proto::milvus::DescribeIndexRequest)}, { 229, -1, sizeof(::milvus::proto::milvus::IndexDescription)}, - { 236, -1, sizeof(::milvus::proto::milvus::DescribeIndexResponse)}, - { 243, -1, sizeof(::milvus::proto::milvus::IndexStateRequest)}, - { 253, -1, sizeof(::milvus::proto::milvus::IndexStateResponse)}, - { 260, -1, sizeof(::milvus::proto::milvus::InsertRequest)}, - { 271, -1, sizeof(::milvus::proto::milvus::InsertResponse)}, - { 279, -1, sizeof(::milvus::proto::milvus::PlaceholderValue)}, - { 287, -1, sizeof(::milvus::proto::milvus::PlaceholderGroup)}, - { 293, -1, sizeof(::milvus::proto::milvus::SearchRequest)}, - { 304, -1, sizeof(::milvus::proto::milvus::Hits)}, - { 312, -1, sizeof(::milvus::proto::milvus::SearchResults)}, - { 319, -1, sizeof(::milvus::proto::milvus::FlushRequest)}, - { 327, -1, sizeof(::milvus::proto::milvus::PersistentSegmentInfo)}, - { 341, -1, sizeof(::milvus::proto::milvus::PersistentSegmentInfoRequest)}, - { 349, -1, sizeof(::milvus::proto::milvus::PersistentSegmentInfoResponse)}, - { 356, -1, sizeof(::milvus::proto::milvus::QuerySegmentInfo)}, - { 368, -1, sizeof(::milvus::proto::milvus::QuerySegmentInfoRequest)}, - { 376, -1, sizeof(::milvus::proto::milvus::QuerySegmentInfoResponse)}, - { 383, -1, sizeof(::milvus::proto::milvus::RegisterLinkResponse)}, + { 237, -1, sizeof(::milvus::proto::milvus::DescribeIndexResponse)}, + { 244, -1, sizeof(::milvus::proto::milvus::IndexStateRequest)}, + { 254, -1, sizeof(::milvus::proto::milvus::IndexStateResponse)}, + { 261, -1, sizeof(::milvus::proto::milvus::InsertRequest)}, + { 272, -1, sizeof(::milvus::proto::milvus::InsertResponse)}, + { 280, -1, sizeof(::milvus::proto::milvus::PlaceholderValue)}, + { 288, -1, sizeof(::milvus::proto::milvus::PlaceholderGroup)}, + { 294, -1, sizeof(::milvus::proto::milvus::SearchRequest)}, + { 305, -1, sizeof(::milvus::proto::milvus::Hits)}, + { 313, -1, sizeof(::milvus::proto::milvus::SearchResults)}, + { 320, -1, sizeof(::milvus::proto::milvus::FlushRequest)}, + { 328, -1, sizeof(::milvus::proto::milvus::PersistentSegmentInfo)}, + { 342, -1, sizeof(::milvus::proto::milvus::PersistentSegmentInfoRequest)}, + { 350, -1, sizeof(::milvus::proto::milvus::PersistentSegmentInfoResponse)}, + { 357, -1, sizeof(::milvus::proto::milvus::QuerySegmentInfo)}, + { 369, -1, sizeof(::milvus::proto::milvus::QuerySegmentInfoRequest)}, + { 377, -1, sizeof(::milvus::proto::milvus::QuerySegmentInfoResponse)}, + { 384, -1, sizeof(::milvus::proto::milvus::RegisterLinkResponse)}, }; static ::PROTOBUF_NAMESPACE_ID::Message const * const file_default_instances[] = { @@ -1511,133 +1512,133 @@ const char descriptor_table_protodef_milvus_2eproto[] PROTOBUF_SECTION_VARIABLE( "exRequest\022*\n\004base\030\001 \001(\0132\034.milvus.proto.c" "ommon.MsgBase\022\017\n\007db_name\030\002 \001(\t\022\027\n\017collec" "tion_name\030\003 \001(\t\022\022\n\nfield_name\030\004 \001(\t\022\022\n\ni" - "ndex_name\030\005 \001(\t\"Y\n\020IndexDescription\022\022\n\ni" - "ndex_name\030\001 \001(\t\0221\n\006params\030\002 \003(\0132!.milvus" - ".proto.common.KeyValuePair\"\207\001\n\025DescribeI" - "ndexResponse\022+\n\006status\030\001 \001(\0132\033.milvus.pr" - "oto.common.Status\022A\n\022index_descriptions\030" - "\002 \003(\0132%.milvus.proto.milvus.IndexDescrip" - "tion\"\221\001\n\021IndexStateRequest\022*\n\004base\030\001 \001(\013" - "2\034.milvus.proto.common.MsgBase\022\017\n\007db_nam" - "e\030\002 \001(\t\022\027\n\017collection_name\030\003 \001(\t\022\022\n\nfiel" - "d_name\030\004 \001(\t\022\022\n\nindex_name\030\005 \001(\t\"q\n\022Inde" - "xStateResponse\022+\n\006status\030\001 \001(\0132\033.milvus." - "proto.common.Status\022.\n\005state\030\002 \001(\0162\037.mil" - "vus.proto.common.IndexState\"\275\001\n\rInsertRe" - "quest\022*\n\004base\030\001 \001(\0132\034.milvus.proto.commo" - "n.MsgBase\022\017\n\007db_name\030\002 \001(\t\022\027\n\017collection" - "_name\030\003 \001(\t\022\026\n\016partition_name\030\004 \001(\t\022+\n\010r" - "ow_data\030\005 \003(\0132\031.milvus.proto.common.Blob" - "\022\021\n\thash_keys\030\006 \003(\r\"e\n\016InsertResponse\022+\n" - "\006status\030\001 \001(\0132\033.milvus.proto.common.Stat" - "us\022\023\n\013rowID_begin\030\002 \001(\003\022\021\n\trowID_end\030\003 \001" - "(\003\"c\n\020PlaceholderValue\022\013\n\003tag\030\001 \001(\t\0222\n\004t" - "ype\030\002 \001(\0162$.milvus.proto.milvus.Placehol" - "derType\022\016\n\006values\030\003 \003(\014\"O\n\020PlaceholderGr" - "oup\022;\n\014placeholders\030\001 \003(\0132%.milvus.proto" - ".milvus.PlaceholderValue\"\246\001\n\rSearchReque" - "st\022*\n\004base\030\001 \001(\0132\034.milvus.proto.common.M" - "sgBase\022\017\n\007db_name\030\002 \001(\t\022\027\n\017collection_na" - "me\030\003 \001(\t\022\027\n\017partition_names\030\004 \003(\t\022\013\n\003dsl" - "\030\005 \001(\t\022\031\n\021placeholder_group\030\006 \001(\014\"5\n\004Hit" - "s\022\013\n\003IDs\030\001 \003(\003\022\020\n\010row_data\030\002 \003(\014\022\016\n\006scor" - "es\030\003 \003(\002\"J\n\rSearchResults\022+\n\006status\030\001 \001(" - "\0132\033.milvus.proto.common.Status\022\014\n\004hits\030\002" - " \003(\014\"e\n\014FlushRequest\022*\n\004base\030\001 \001(\0132\034.mil" - "vus.proto.common.MsgBase\022\017\n\007db_name\030\002 \001(" - "\t\022\030\n\020collection_names\030\003 \003(\t\"\351\001\n\025Persiste" - "ntSegmentInfo\022\021\n\tsegmentID\030\001 \001(\003\022\024\n\014coll" - "ectionID\030\002 \001(\003\022\023\n\013partitionID\030\003 \001(\003\022\021\n\to" - "pen_time\030\004 \001(\004\022\023\n\013sealed_time\030\005 \001(\004\022\024\n\014f" - "lushed_time\030\006 \001(\004\022\020\n\010num_rows\030\007 \001(\003\022\020\n\010m" - "em_size\030\010 \001(\003\0220\n\005state\030\t \001(\0162!.milvus.pr" - "oto.common.SegmentState\"r\n\034PersistentSeg" - "mentInfoRequest\022*\n\004base\030\001 \001(\0132\034.milvus.p" - "roto.common.MsgBase\022\016\n\006dbName\030\002 \001(\t\022\026\n\016c" - "ollectionName\030\003 \001(\t\"\207\001\n\035PersistentSegmen" - "tInfoResponse\022+\n\006status\030\001 \001(\0132\033.milvus.p" - "roto.common.Status\0229\n\005infos\030\002 \003(\0132*.milv" - "us.proto.milvus.PersistentSegmentInfo\"\231\001" - "\n\020QuerySegmentInfo\022\021\n\tsegmentID\030\001 \001(\003\022\024\n" - "\014collectionID\030\002 \001(\003\022\023\n\013partitionID\030\003 \001(\003" - "\022\020\n\010mem_size\030\004 \001(\003\022\020\n\010num_rows\030\005 \001(\003\022\022\n\n" - "index_name\030\006 \001(\t\022\017\n\007indexID\030\007 \001(\003\"m\n\027Que" - "rySegmentInfoRequest\022*\n\004base\030\001 \001(\0132\034.mil" - "vus.proto.common.MsgBase\022\016\n\006dbName\030\002 \001(\t" - "\022\026\n\016collectionName\030\003 \001(\t\"}\n\030QuerySegment" - "InfoResponse\022+\n\006status\030\001 \001(\0132\033.milvus.pr" - "oto.common.Status\0224\n\005infos\030\002 \003(\0132%.milvu" - "s.proto.milvus.QuerySegmentInfo\"r\n\024Regis" - "terLinkResponse\022-\n\007address\030\001 \001(\0132\034.milvu" - "s.proto.common.Address\022+\n\006status\030\002 \001(\0132\033" - ".milvus.proto.common.Status*@\n\017Placehold" - "erType\022\010\n\004NONE\020\000\022\021\n\rVECTOR_BINARY\020d\022\020\n\014V" - "ECTOR_FLOAT\020e2\353\022\n\rMilvusService\022_\n\020Creat" - "eCollection\022,.milvus.proto.milvus.Create" - "CollectionRequest\032\033.milvus.proto.common." - "Status\"\000\022[\n\016DropCollection\022*.milvus.prot" - "o.milvus.DropCollectionRequest\032\033.milvus." - "proto.common.Status\"\000\022_\n\rHasCollection\022)" - ".milvus.proto.milvus.HasCollectionReques" - "t\032!.milvus.proto.milvus.BoolResponse\"\000\022[" - "\n\016LoadCollection\022*.milvus.proto.milvus.L" - "oadCollectionRequest\032\033.milvus.proto.comm" - "on.Status\"\000\022a\n\021ReleaseCollection\022-.milvu" - "s.proto.milvus.ReleaseCollectionRequest\032" - "\033.milvus.proto.common.Status\"\000\022w\n\022Descri" - "beCollection\022..milvus.proto.milvus.Descr" - "ibeCollectionRequest\032/.milvus.proto.milv" - "us.DescribeCollectionResponse\"\000\022v\n\027GetCo" - "llectionStatistics\022+.milvus.proto.milvus" - ".CollectionStatsRequest\032,.milvus.proto.m" - "ilvus.CollectionStatsResponse\"\000\022l\n\017ShowC" - "ollections\022*.milvus.proto.milvus.ShowCol" - "lectionRequest\032+.milvus.proto.milvus.Sho" - "wCollectionResponse\"\000\022]\n\017CreatePartition" - "\022+.milvus.proto.milvus.CreatePartitionRe" - "quest\032\033.milvus.proto.common.Status\"\000\022Y\n\r" - "DropPartition\022).milvus.proto.milvus.Drop" - "PartitionRequest\032\033.milvus.proto.common.S" - "tatus\"\000\022]\n\014HasPartition\022(.milvus.proto.m" - "ilvus.HasPartitionRequest\032!.milvus.proto" - ".milvus.BoolResponse\"\000\022Y\n\016LoadPartitions" - "\022(.milvus.proto.milvus.LoadPartitonReque" - "st\032\033.milvus.proto.common.Status\"\000\022`\n\021Rel" - "easePartitions\022,.milvus.proto.milvus.Rel" - "easePartitionRequest\032\033.milvus.proto.comm" - "on.Status\"\000\022s\n\026GetPartitionStatistics\022*." - "milvus.proto.milvus.PartitionStatsReques" - "t\032+.milvus.proto.milvus.PartitionStatsRe" - "sponse\"\000\022i\n\016ShowPartitions\022).milvus.prot" - "o.milvus.ShowPartitionRequest\032*.milvus.p" - "roto.milvus.ShowPartitionResponse\"\000\022U\n\013C" - "reateIndex\022\'.milvus.proto.milvus.CreateI" - "ndexRequest\032\033.milvus.proto.common.Status" - "\"\000\022h\n\rDescribeIndex\022).milvus.proto.milvu" - "s.DescribeIndexRequest\032*.milvus.proto.mi" - "lvus.DescribeIndexResponse\"\000\022b\n\rGetIndex" - "State\022&.milvus.proto.milvus.IndexStateRe" - "quest\032\'.milvus.proto.milvus.IndexStateRe" - "sponse\"\000\022S\n\006Insert\022\".milvus.proto.milvus" - ".InsertRequest\032#.milvus.proto.milvus.Ins" - "ertResponse\"\000\022R\n\006Search\022\".milvus.proto.m" - "ilvus.SearchRequest\032\".milvus.proto.milvu" - "s.SearchResults\"\000\022I\n\005Flush\022!.milvus.prot" - "o.milvus.FlushRequest\032\033.milvus.proto.com" - "mon.Status\"\000\022Q\n\014GetDdChannel\022\032.milvus.pr" - "oto.common.Empty\032#.milvus.proto.milvus.S" - "tringResponse\"\000\022\203\001\n\030GetPersistentSegment" - "Info\0221.milvus.proto.milvus.PersistentSeg" - "mentInfoRequest\0322.milvus.proto.milvus.Pe" - "rsistentSegmentInfoResponse\"\000\022t\n\023GetQuer" - "ySegmentInfo\022,.milvus.proto.milvus.Query" - "SegmentInfoRequest\032-.milvus.proto.milvus" - ".QuerySegmentInfoResponse\"\0002g\n\014ProxyServ" - "ice\022W\n\014RegisterLink\022\032.milvus.proto.commo" - "n.Empty\032).milvus.proto.milvus.RegisterLi" - "nkResponse\"\000BBZ@github.com/zilliztech/mi" - "lvus-distributed/internal/proto/milvuspb" - "b\006proto3" + "ndex_name\030\005 \001(\t\"j\n\020IndexDescription\022\022\n\ni" + "ndex_name\030\001 \001(\t\022\017\n\007indexID\030\002 \001(\003\0221\n\006para" + "ms\030\003 \003(\0132!.milvus.proto.common.KeyValueP" + "air\"\207\001\n\025DescribeIndexResponse\022+\n\006status\030" + "\001 \001(\0132\033.milvus.proto.common.Status\022A\n\022in" + "dex_descriptions\030\002 \003(\0132%.milvus.proto.mi" + "lvus.IndexDescription\"\221\001\n\021IndexStateRequ" + "est\022*\n\004base\030\001 \001(\0132\034.milvus.proto.common." + "MsgBase\022\017\n\007db_name\030\002 \001(\t\022\027\n\017collection_n" + "ame\030\003 \001(\t\022\022\n\nfield_name\030\004 \001(\t\022\022\n\nindex_n" + "ame\030\005 \001(\t\"q\n\022IndexStateResponse\022+\n\006statu" + "s\030\001 \001(\0132\033.milvus.proto.common.Status\022.\n\005" + "state\030\002 \001(\0162\037.milvus.proto.common.IndexS" + "tate\"\275\001\n\rInsertRequest\022*\n\004base\030\001 \001(\0132\034.m" + "ilvus.proto.common.MsgBase\022\017\n\007db_name\030\002 " + "\001(\t\022\027\n\017collection_name\030\003 \001(\t\022\026\n\016partitio" + "n_name\030\004 \001(\t\022+\n\010row_data\030\005 \003(\0132\031.milvus." + "proto.common.Blob\022\021\n\thash_keys\030\006 \003(\r\"e\n\016" + "InsertResponse\022+\n\006status\030\001 \001(\0132\033.milvus." + "proto.common.Status\022\023\n\013rowID_begin\030\002 \001(\003" + "\022\021\n\trowID_end\030\003 \001(\003\"c\n\020PlaceholderValue\022" + "\013\n\003tag\030\001 \001(\t\0222\n\004type\030\002 \001(\0162$.milvus.prot" + "o.milvus.PlaceholderType\022\016\n\006values\030\003 \003(\014" + "\"O\n\020PlaceholderGroup\022;\n\014placeholders\030\001 \003" + "(\0132%.milvus.proto.milvus.PlaceholderValu" + "e\"\246\001\n\rSearchRequest\022*\n\004base\030\001 \001(\0132\034.milv" + "us.proto.common.MsgBase\022\017\n\007db_name\030\002 \001(\t" + "\022\027\n\017collection_name\030\003 \001(\t\022\027\n\017partition_n" + "ames\030\004 \003(\t\022\013\n\003dsl\030\005 \001(\t\022\031\n\021placeholder_g" + "roup\030\006 \001(\014\"5\n\004Hits\022\013\n\003IDs\030\001 \003(\003\022\020\n\010row_d" + "ata\030\002 \003(\014\022\016\n\006scores\030\003 \003(\002\"J\n\rSearchResul" + "ts\022+\n\006status\030\001 \001(\0132\033.milvus.proto.common" + ".Status\022\014\n\004hits\030\002 \003(\014\"e\n\014FlushRequest\022*\n" + "\004base\030\001 \001(\0132\034.milvus.proto.common.MsgBas" + "e\022\017\n\007db_name\030\002 \001(\t\022\030\n\020collection_names\030\003" + " \003(\t\"\351\001\n\025PersistentSegmentInfo\022\021\n\tsegmen" + "tID\030\001 \001(\003\022\024\n\014collectionID\030\002 \001(\003\022\023\n\013parti" + "tionID\030\003 \001(\003\022\021\n\topen_time\030\004 \001(\004\022\023\n\013seale" + "d_time\030\005 \001(\004\022\024\n\014flushed_time\030\006 \001(\004\022\020\n\010nu" + "m_rows\030\007 \001(\003\022\020\n\010mem_size\030\010 \001(\003\0220\n\005state\030" + "\t \001(\0162!.milvus.proto.common.SegmentState" + "\"r\n\034PersistentSegmentInfoRequest\022*\n\004base" + "\030\001 \001(\0132\034.milvus.proto.common.MsgBase\022\016\n\006" + "dbName\030\002 \001(\t\022\026\n\016collectionName\030\003 \001(\t\"\207\001\n" + "\035PersistentSegmentInfoResponse\022+\n\006status" + "\030\001 \001(\0132\033.milvus.proto.common.Status\0229\n\005i" + "nfos\030\002 \003(\0132*.milvus.proto.milvus.Persist" + "entSegmentInfo\"\231\001\n\020QuerySegmentInfo\022\021\n\ts" + "egmentID\030\001 \001(\003\022\024\n\014collectionID\030\002 \001(\003\022\023\n\013" + "partitionID\030\003 \001(\003\022\020\n\010mem_size\030\004 \001(\003\022\020\n\010n" + "um_rows\030\005 \001(\003\022\022\n\nindex_name\030\006 \001(\t\022\017\n\007ind" + "exID\030\007 \001(\003\"m\n\027QuerySegmentInfoRequest\022*\n" + "\004base\030\001 \001(\0132\034.milvus.proto.common.MsgBas" + "e\022\016\n\006dbName\030\002 \001(\t\022\026\n\016collectionName\030\003 \001(" + "\t\"}\n\030QuerySegmentInfoResponse\022+\n\006status\030" + "\001 \001(\0132\033.milvus.proto.common.Status\0224\n\005in" + "fos\030\002 \003(\0132%.milvus.proto.milvus.QuerySeg" + "mentInfo\"r\n\024RegisterLinkResponse\022-\n\007addr" + "ess\030\001 \001(\0132\034.milvus.proto.common.Address\022" + "+\n\006status\030\002 \001(\0132\033.milvus.proto.common.St" + "atus*@\n\017PlaceholderType\022\010\n\004NONE\020\000\022\021\n\rVEC" + "TOR_BINARY\020d\022\020\n\014VECTOR_FLOAT\020e2\353\022\n\rMilvu" + "sService\022_\n\020CreateCollection\022,.milvus.pr" + "oto.milvus.CreateCollectionRequest\032\033.mil" + "vus.proto.common.Status\"\000\022[\n\016DropCollect" + "ion\022*.milvus.proto.milvus.DropCollection" + "Request\032\033.milvus.proto.common.Status\"\000\022_" + "\n\rHasCollection\022).milvus.proto.milvus.Ha" + "sCollectionRequest\032!.milvus.proto.milvus" + ".BoolResponse\"\000\022[\n\016LoadCollection\022*.milv" + "us.proto.milvus.LoadCollectionRequest\032\033." + "milvus.proto.common.Status\"\000\022a\n\021ReleaseC" + "ollection\022-.milvus.proto.milvus.ReleaseC" + "ollectionRequest\032\033.milvus.proto.common.S" + "tatus\"\000\022w\n\022DescribeCollection\022..milvus.p" + "roto.milvus.DescribeCollectionRequest\032/." + "milvus.proto.milvus.DescribeCollectionRe" + "sponse\"\000\022v\n\027GetCollectionStatistics\022+.mi" + "lvus.proto.milvus.CollectionStatsRequest" + "\032,.milvus.proto.milvus.CollectionStatsRe" + "sponse\"\000\022l\n\017ShowCollections\022*.milvus.pro" + "to.milvus.ShowCollectionRequest\032+.milvus" + ".proto.milvus.ShowCollectionResponse\"\000\022]" + "\n\017CreatePartition\022+.milvus.proto.milvus." + "CreatePartitionRequest\032\033.milvus.proto.co" + "mmon.Status\"\000\022Y\n\rDropPartition\022).milvus." + "proto.milvus.DropPartitionRequest\032\033.milv" + "us.proto.common.Status\"\000\022]\n\014HasPartition" + "\022(.milvus.proto.milvus.HasPartitionReque" + "st\032!.milvus.proto.milvus.BoolResponse\"\000\022" + "Y\n\016LoadPartitions\022(.milvus.proto.milvus." + "LoadPartitonRequest\032\033.milvus.proto.commo" + "n.Status\"\000\022`\n\021ReleasePartitions\022,.milvus" + ".proto.milvus.ReleasePartitionRequest\032\033." + "milvus.proto.common.Status\"\000\022s\n\026GetParti" + "tionStatistics\022*.milvus.proto.milvus.Par" + "titionStatsRequest\032+.milvus.proto.milvus" + ".PartitionStatsResponse\"\000\022i\n\016ShowPartiti" + "ons\022).milvus.proto.milvus.ShowPartitionR" + "equest\032*.milvus.proto.milvus.ShowPartiti" + "onResponse\"\000\022U\n\013CreateIndex\022\'.milvus.pro" + "to.milvus.CreateIndexRequest\032\033.milvus.pr" + "oto.common.Status\"\000\022h\n\rDescribeIndex\022).m" + "ilvus.proto.milvus.DescribeIndexRequest\032" + "*.milvus.proto.milvus.DescribeIndexRespo" + "nse\"\000\022b\n\rGetIndexState\022&.milvus.proto.mi" + "lvus.IndexStateRequest\032\'.milvus.proto.mi" + "lvus.IndexStateResponse\"\000\022S\n\006Insert\022\".mi" + "lvus.proto.milvus.InsertRequest\032#.milvus" + ".proto.milvus.InsertResponse\"\000\022R\n\006Search" + "\022\".milvus.proto.milvus.SearchRequest\032\".m" + "ilvus.proto.milvus.SearchResults\"\000\022I\n\005Fl" + "ush\022!.milvus.proto.milvus.FlushRequest\032\033" + ".milvus.proto.common.Status\"\000\022Q\n\014GetDdCh" + "annel\022\032.milvus.proto.common.Empty\032#.milv" + "us.proto.milvus.StringResponse\"\000\022\203\001\n\030Get" + "PersistentSegmentInfo\0221.milvus.proto.mil" + "vus.PersistentSegmentInfoRequest\0322.milvu" + "s.proto.milvus.PersistentSegmentInfoResp" + "onse\"\000\022t\n\023GetQuerySegmentInfo\022,.milvus.p" + "roto.milvus.QuerySegmentInfoRequest\032-.mi" + "lvus.proto.milvus.QuerySegmentInfoRespon" + "se\"\0002g\n\014ProxyService\022W\n\014RegisterLink\022\032.m" + "ilvus.proto.common.Empty\032).milvus.proto." + "milvus.RegisterLinkResponse\"\000BBZ@github." + "com/zilliztech/milvus-distributed/intern" + "al/proto/milvuspbb\006proto3" ; static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_milvus_2eproto_deps[2] = { &::descriptor_table_common_2eproto, @@ -1695,7 +1696,7 @@ static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_mil static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_milvus_2eproto_once; static bool descriptor_table_milvus_2eproto_initialized = false; const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_milvus_2eproto = { - &descriptor_table_milvus_2eproto_initialized, descriptor_table_protodef_milvus_2eproto, "milvus.proto", 8448, + &descriptor_table_milvus_2eproto_initialized, descriptor_table_protodef_milvus_2eproto, "milvus.proto", 8465, &descriptor_table_milvus_2eproto_once, descriptor_table_milvus_2eproto_sccs, descriptor_table_milvus_2eproto_deps, 47, 2, schemas, file_default_instances, TableStruct_milvus_2eproto::offsets, file_level_metadata_milvus_2eproto, 47, file_level_enum_descriptors_milvus_2eproto, file_level_service_descriptors_milvus_2eproto, @@ -13017,12 +13018,14 @@ IndexDescription::IndexDescription(const IndexDescription& from) if (!from.index_name().empty()) { index_name_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.index_name_); } + indexid_ = from.indexid_; // @@protoc_insertion_point(copy_constructor:milvus.proto.milvus.IndexDescription) } void IndexDescription::SharedCtor() { ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_IndexDescription_milvus_2eproto.base); index_name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + indexid_ = PROTOBUF_LONGLONG(0); } IndexDescription::~IndexDescription() { @@ -13051,6 +13054,7 @@ void IndexDescription::Clear() { params_.Clear(); index_name_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + indexid_ = PROTOBUF_LONGLONG(0); _internal_metadata_.Clear(); } @@ -13069,16 +13073,23 @@ const char* IndexDescription::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPA CHK_(ptr); } else goto handle_unusual; continue; - // repeated .milvus.proto.common.KeyValuePair params = 2; + // int64 indexID = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 18)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) { + indexid_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr); + CHK_(ptr); + } else goto handle_unusual; + continue; + // repeated .milvus.proto.common.KeyValuePair params = 3; + case 3: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 26)) { ptr -= 1; do { ptr += 1; ptr = ctx->ParseMessage(add_params(), ptr); CHK_(ptr); if (!ctx->DataAvailable(ptr)) break; - } while (::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad<::PROTOBUF_NAMESPACE_ID::uint8>(ptr) == 18); + } while (::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad<::PROTOBUF_NAMESPACE_ID::uint8>(ptr) == 26); } else goto handle_unusual; continue; default: { @@ -13126,9 +13137,22 @@ bool IndexDescription::MergePartialFromCodedStream( break; } - // repeated .milvus.proto.common.KeyValuePair params = 2; + // int64 indexID = 2; case 2: { - if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (18 & 0xFF)) { + if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (16 & 0xFF)) { + + DO_((::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::ReadPrimitive< + ::PROTOBUF_NAMESPACE_ID::int64, ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_INT64>( + input, &indexid_))); + } else { + goto handle_unusual; + } + break; + } + + // repeated .milvus.proto.common.KeyValuePair params = 3; + case 3: { + if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (26 & 0xFF)) { DO_(::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::ReadMessage( input, add_params())); } else { @@ -13174,11 +13198,16 @@ void IndexDescription::SerializeWithCachedSizes( 1, this->index_name(), output); } - // repeated .milvus.proto.common.KeyValuePair params = 2; + // int64 indexID = 2; + if (this->indexid() != 0) { + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64(2, this->indexid(), output); + } + + // repeated .milvus.proto.common.KeyValuePair params = 3; for (unsigned int i = 0, n = static_cast(this->params_size()); i < n; i++) { ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, + 3, this->params(static_cast(i)), output); } @@ -13207,12 +13236,17 @@ void IndexDescription::SerializeWithCachedSizes( 1, this->index_name(), target); } - // repeated .milvus.proto.common.KeyValuePair params = 2; + // int64 indexID = 2; + if (this->indexid() != 0) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(2, this->indexid(), target); + } + + // repeated .milvus.proto.common.KeyValuePair params = 3; for (unsigned int i = 0, n = static_cast(this->params_size()); i < n; i++) { target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: InternalWriteMessageToArray( - 2, this->params(static_cast(i)), target); + 3, this->params(static_cast(i)), target); } if (_internal_metadata_.have_unknown_fields()) { @@ -13236,7 +13270,7 @@ size_t IndexDescription::ByteSizeLong() const { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - // repeated .milvus.proto.common.KeyValuePair params = 2; + // repeated .milvus.proto.common.KeyValuePair params = 3; { unsigned int count = static_cast(this->params_size()); total_size += 1UL * count; @@ -13254,6 +13288,13 @@ size_t IndexDescription::ByteSizeLong() const { this->index_name()); } + // int64 indexID = 2; + if (this->indexid() != 0) { + total_size += 1 + + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64Size( + this->indexid()); + } + int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; @@ -13286,6 +13327,9 @@ void IndexDescription::MergeFrom(const IndexDescription& from) { index_name_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.index_name_); } + if (from.indexid() != 0) { + set_indexid(from.indexid()); + } } void IndexDescription::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { @@ -13312,6 +13356,7 @@ void IndexDescription::InternalSwap(IndexDescription* other) { CastToBase(¶ms_)->InternalSwap(CastToBase(&other->params_)); index_name_.Swap(&other->index_name_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + swap(indexid_, other->indexid_); } ::PROTOBUF_NAMESPACE_ID::Metadata IndexDescription::GetMetadata() const { diff --git a/internal/core/src/pb/milvus.pb.h b/internal/core/src/pb/milvus.pb.h index 502256c4d2..847c542a7d 100644 --- a/internal/core/src/pb/milvus.pb.h +++ b/internal/core/src/pb/milvus.pb.h @@ -4912,10 +4912,11 @@ class IndexDescription : // accessors ------------------------------------------------------- enum : int { - kParamsFieldNumber = 2, + kParamsFieldNumber = 3, kIndexNameFieldNumber = 1, + kIndexIDFieldNumber = 2, }; - // repeated .milvus.proto.common.KeyValuePair params = 2; + // repeated .milvus.proto.common.KeyValuePair params = 3; int params_size() const; void clear_params(); ::milvus::proto::common::KeyValuePair* mutable_params(int index); @@ -4937,6 +4938,11 @@ class IndexDescription : std::string* release_index_name(); void set_allocated_index_name(std::string* index_name); + // int64 indexID = 2; + void clear_indexid(); + ::PROTOBUF_NAMESPACE_ID::int64 indexid() const; + void set_indexid(::PROTOBUF_NAMESPACE_ID::int64 value); + // @@protoc_insertion_point(class_scope:milvus.proto.milvus.IndexDescription) private: class _Internal; @@ -4944,6 +4950,7 @@ class IndexDescription : ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_; ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::milvus::proto::common::KeyValuePair > params_; ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr index_name_; + ::PROTOBUF_NAMESPACE_ID::int64 indexid_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; friend struct ::TableStruct_milvus_2eproto; }; @@ -12036,7 +12043,21 @@ inline void IndexDescription::set_allocated_index_name(std::string* index_name) // @@protoc_insertion_point(field_set_allocated:milvus.proto.milvus.IndexDescription.index_name) } -// repeated .milvus.proto.common.KeyValuePair params = 2; +// int64 indexID = 2; +inline void IndexDescription::clear_indexid() { + indexid_ = PROTOBUF_LONGLONG(0); +} +inline ::PROTOBUF_NAMESPACE_ID::int64 IndexDescription::indexid() const { + // @@protoc_insertion_point(field_get:milvus.proto.milvus.IndexDescription.indexID) + return indexid_; +} +inline void IndexDescription::set_indexid(::PROTOBUF_NAMESPACE_ID::int64 value) { + + indexid_ = value; + // @@protoc_insertion_point(field_set:milvus.proto.milvus.IndexDescription.indexID) +} + +// repeated .milvus.proto.common.KeyValuePair params = 3; inline int IndexDescription::params_size() const { return params_.size(); } diff --git a/internal/indexservice/indexservice.go b/internal/indexservice/indexservice.go index 085908bf3a..2f2dfebbf4 100644 --- a/internal/indexservice/indexservice.go +++ b/internal/indexservice/indexservice.go @@ -128,6 +128,9 @@ func (i *ServiceImpl) Init() error { } func (i *ServiceImpl) Start() error { + i.loopWg.Add(1) + go i.tsLoop() + i.sched.Start() // Start callbacks for _, cb := range i.startCallbacks { @@ -223,6 +226,7 @@ func (i *ServiceImpl) BuildIndex(req *indexpb.BuildIndexRequest) (*indexpb.Build ret.Status.Reason = err.Error() return ret, nil } + ret.Status.ErrorCode = commonpb.ErrorCode_SUCCESS ret.IndexBuildID = t.indexBuildID return ret, nil } @@ -276,3 +280,24 @@ func (i *ServiceImpl) NotifyBuildIndex(nty *indexpb.BuildIndexNotification) (*co i.nodeClients.IncPriority(nty.NodeID, -1) return ret, nil } + +func (i *ServiceImpl) tsLoop() { + tsoTicker := time.NewTicker(UpdateTimestampStep) + defer tsoTicker.Stop() + ctx, cancel := context.WithCancel(i.loopCtx) + defer cancel() + defer i.loopWg.Done() + for { + select { + case <-tsoTicker.C: + if err := i.idAllocator.UpdateID(); err != nil { + log.Println("failed to update id", err) + return + } + case <-ctx.Done(): + // Server is closed and it should return nil. + log.Println("tsLoop is closed") + return + } + } +} diff --git a/internal/masterservice/task.go b/internal/masterservice/task.go index e7200ca7d7..1a051a3535 100644 --- a/internal/masterservice/task.go +++ b/internal/masterservice/task.go @@ -630,6 +630,7 @@ func (t *DescribeIndexReqTask) Execute() error { desc := &milvuspb.IndexDescription{ IndexName: i.IndexName, Params: i.IndexParams, + IndexID: i.IndexID, } t.Rsp.IndexDescriptions = append(t.Rsp.IndexDescriptions, desc) } diff --git a/internal/proto/milvus.proto b/internal/proto/milvus.proto index 7869ae0605..e1ce2b6fe4 100644 --- a/internal/proto/milvus.proto +++ b/internal/proto/milvus.proto @@ -186,7 +186,8 @@ message DescribeIndexRequest { message IndexDescription { string index_name = 1; - repeated common.KeyValuePair params = 2; + int64 indexID = 2; + repeated common.KeyValuePair params = 3; } message DescribeIndexResponse { diff --git a/internal/proto/milvuspb/milvus.pb.go b/internal/proto/milvuspb/milvus.pb.go index 7a83430374..d695b90081 100644 --- a/internal/proto/milvuspb/milvus.pb.go +++ b/internal/proto/milvuspb/milvus.pb.go @@ -1637,7 +1637,8 @@ func (m *DescribeIndexRequest) GetIndexName() string { type IndexDescription struct { IndexName string `protobuf:"bytes,1,opt,name=index_name,json=indexName,proto3" json:"index_name,omitempty"` - Params []*commonpb.KeyValuePair `protobuf:"bytes,2,rep,name=params,proto3" json:"params,omitempty"` + IndexID int64 `protobuf:"varint,2,opt,name=indexID,proto3" json:"indexID,omitempty"` + Params []*commonpb.KeyValuePair `protobuf:"bytes,3,rep,name=params,proto3" json:"params,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1675,6 +1676,13 @@ func (m *IndexDescription) GetIndexName() string { return "" } +func (m *IndexDescription) GetIndexID() int64 { + if m != nil { + return m.IndexID + } + return 0 +} + func (m *IndexDescription) GetParams() []*commonpb.KeyValuePair { if m != nil { return m.Params @@ -2810,128 +2818,128 @@ func init() { proto.RegisterFile("milvus.proto", fileDescriptor_02345ba45cc0e303 var fileDescriptor_02345ba45cc0e303 = []byte{ // 1964 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0xed, 0x6f, 0x1b, 0x49, - 0x19, 0xcf, 0xd8, 0x8e, 0x93, 0x3c, 0xb1, 0x13, 0x67, 0xf2, 0xe6, 0xfa, 0x5a, 0x2e, 0x1d, 0xb8, - 0x6b, 0xfa, 0x1a, 0xc8, 0xf1, 0x2a, 0x84, 0xd4, 0xa6, 0xe9, 0xa5, 0x56, 0x7b, 0x6d, 0x6e, 0x1d, - 0x0e, 0xca, 0xa9, 0x32, 0x6b, 0xef, 0xd4, 0x5e, 0x6e, 0xbd, 0x6b, 0x76, 0xc6, 0x49, 0xd3, 0x4f, - 0x88, 0x22, 0x90, 0xb8, 0x13, 0xf0, 0x09, 0x89, 0xaf, 0x48, 0x7c, 0x45, 0x70, 0x20, 0xfe, 0x03, - 0x24, 0x24, 0xfe, 0x0e, 0x3e, 0x9d, 0xf8, 0x13, 0x90, 0xd0, 0xcc, 0xac, 0x37, 0xbb, 0xeb, 0xd9, - 0xd8, 0xad, 0xef, 0x1a, 0xf7, 0x9b, 0xe7, 0xd9, 0x67, 0x66, 0x7e, 0xcf, 0xdb, 0xcc, 0x33, 0xcf, - 0x63, 0x28, 0x74, 0x6c, 0xe7, 0xb0, 0xc7, 0x6e, 0x74, 0x7d, 0x8f, 0x7b, 0x78, 0x39, 0x3a, 0xba, - 0xa1, 0x06, 0x95, 0x42, 0xd3, 0xeb, 0x74, 0x3c, 0x57, 0x11, 0x2b, 0x05, 0xd6, 0x6c, 0xd3, 0x8e, - 0xa9, 0x46, 0xe4, 0x4f, 0x08, 0xd6, 0x6f, 0xfb, 0xd4, 0xe4, 0xf4, 0xb6, 0xe7, 0x38, 0xb4, 0xc9, - 0x6d, 0xcf, 0x35, 0xe8, 0x4f, 0x7b, 0x94, 0x71, 0xfc, 0x55, 0xc8, 0x35, 0x4c, 0x46, 0xcb, 0x68, - 0x03, 0x6d, 0xce, 0x6f, 0x9f, 0xbf, 0x11, 0x5b, 0x3b, 0x58, 0xf3, 0x3d, 0xd6, 0xda, 0x31, 0x19, - 0x35, 0x24, 0x27, 0x5e, 0x87, 0x19, 0xab, 0x51, 0x77, 0xcd, 0x0e, 0x2d, 0x67, 0x36, 0xd0, 0xe6, - 0x9c, 0x91, 0xb7, 0x1a, 0x0f, 0xcc, 0x0e, 0xc5, 0x97, 0x60, 0xb1, 0x19, 0xae, 0xaf, 0x18, 0xb2, - 0x92, 0x61, 0xe1, 0x84, 0x2c, 0x19, 0xd7, 0x20, 0xaf, 0xf0, 0x95, 0x73, 0x1b, 0x68, 0xb3, 0x60, - 0x04, 0x23, 0xf2, 0x31, 0x82, 0xd5, 0x5d, 0xdf, 0xeb, 0x4e, 0x04, 0x4a, 0xf2, 0x6b, 0x04, 0x2b, - 0x77, 0x4d, 0x36, 0x19, 0x60, 0x1e, 0x41, 0x61, 0xc7, 0xf3, 0x1c, 0x83, 0xb2, 0xae, 0xe7, 0x32, - 0x8a, 0xdf, 0x81, 0x3c, 0xe3, 0x26, 0xef, 0xb1, 0x00, 0xc5, 0x1b, 0x5a, 0x14, 0x35, 0xc9, 0x62, - 0x04, 0xac, 0x78, 0x05, 0xa6, 0x0f, 0x4d, 0xa7, 0xa7, 0x40, 0xcc, 0x1a, 0x6a, 0x40, 0x3e, 0x84, - 0x85, 0x1a, 0xf7, 0x6d, 0xb7, 0xf5, 0x39, 0x2e, 0x3e, 0xd7, 0x5f, 0xfc, 0xb7, 0x08, 0xce, 0xed, - 0x52, 0xd6, 0xf4, 0xed, 0xc6, 0x64, 0x38, 0x1f, 0xf9, 0x3b, 0x82, 0x8a, 0x0e, 0xd1, 0x38, 0xb2, - 0x7f, 0x2f, 0x74, 0xe8, 0x8c, 0x9c, 0xf4, 0x56, 0x7c, 0x52, 0x10, 0x8c, 0x27, 0xbb, 0xd5, 0x24, - 0xa1, 0xef, 0xf7, 0x98, 0x40, 0xe1, 0x04, 0x64, 0x75, 0x57, 0x02, 0xcf, 0x1a, 0x31, 0x9a, 0x8c, - 0x8d, 0xfb, 0x9e, 0x69, 0x4d, 0x86, 0x12, 0x7f, 0x83, 0xa0, 0x6c, 0x50, 0x87, 0x9a, 0x6c, 0x42, - 0xac, 0xfa, 0x09, 0x82, 0xb5, 0x88, 0x7e, 0xb9, 0xc9, 0xd9, 0x59, 0xc2, 0xf9, 0x95, 0x38, 0x71, - 0x93, 0x70, 0xc6, 0xf1, 0xb0, 0x6f, 0xc1, 0xb4, 0xf8, 0xc5, 0xca, 0x99, 0x8d, 0xec, 0xe6, 0xfc, - 0xf6, 0x45, 0xed, 0x9c, 0x7b, 0xf4, 0xf8, 0x03, 0x11, 0x75, 0xfb, 0xa6, 0xed, 0x1b, 0x8a, 0x9f, - 0x34, 0x60, 0xb5, 0xd6, 0xf6, 0x8e, 0xbe, 0x48, 0x2b, 0x91, 0xa7, 0xb0, 0x96, 0xdc, 0x63, 0x1c, - 0x59, 0x2f, 0x43, 0x29, 0xa1, 0x65, 0x25, 0xf6, 0x9c, 0xb1, 0x18, 0x57, 0x33, 0x23, 0x7f, 0x13, - 0x66, 0x97, 0x37, 0xdb, 0xbe, 0xe9, 0x73, 0xfb, 0xac, 0x2f, 0xb6, 0xb7, 0x60, 0xa1, 0xdb, 0xc7, - 0xa1, 0xf8, 0x72, 0x92, 0xaf, 0x18, 0x52, 0xa5, 0xbe, 0xfe, 0x8a, 0x60, 0x45, 0xdc, 0x73, 0xaf, - 0x13, 0xe6, 0xbf, 0x20, 0x58, 0xbe, 0x6b, 0xb2, 0xd7, 0x09, 0xf2, 0xa7, 0x08, 0x96, 0xc5, 0x91, - 0xa9, 0x30, 0x9f, 0x2d, 0xe4, 0x4b, 0xb0, 0x18, 0x87, 0xcc, 0xca, 0x39, 0xe9, 0xd2, 0x0b, 0x31, - 0xcc, 0x8c, 0xfc, 0x03, 0xc1, 0x7a, 0x70, 0xb2, 0x4e, 0x84, 0xae, 0x47, 0x06, 0xfe, 0x29, 0x82, - 0xd5, 0x10, 0xf1, 0x59, 0x1f, 0xc0, 0xa3, 0xba, 0xc8, 0x2f, 0x11, 0xac, 0x25, 0x41, 0x9f, 0xc9, - 0x31, 0xfd, 0x67, 0x04, 0x2b, 0xe2, 0x0c, 0x9d, 0x08, 0x9b, 0x27, 0xf3, 0x91, 0x9c, 0x26, 0x1f, - 0xf9, 0x03, 0x52, 0x17, 0x4b, 0x04, 0xf0, 0x38, 0x8a, 0xd3, 0xb8, 0x59, 0x46, 0xe7, 0x66, 0x02, - 0x5b, 0x48, 0xa9, 0xee, 0xb2, 0x72, 0x76, 0x23, 0x2b, 0xb0, 0x45, 0x69, 0x32, 0x19, 0xe8, 0xa7, - 0x78, 0x35, 0xda, 0xea, 0x50, 0x97, 0xbf, 0xbc, 0x3a, 0x93, 0xca, 0xc8, 0x0c, 0x2a, 0x03, 0x9f, - 0x87, 0x39, 0xa6, 0xf6, 0x09, 0xb3, 0xb7, 0x13, 0x02, 0xf9, 0x39, 0x82, 0xf5, 0x01, 0x38, 0xe3, - 0x28, 0xab, 0x0c, 0x33, 0xb6, 0x6b, 0xd1, 0xa7, 0x21, 0x9a, 0xfe, 0x50, 0x7c, 0x69, 0xf4, 0x6c, - 0xc7, 0x0a, 0x61, 0xf4, 0x87, 0x42, 0x27, 0x58, 0xd8, 0xeb, 0x95, 0xe8, 0x63, 0x03, 0xe6, 0x23, - 0x06, 0x09, 0xa0, 0x44, 0x49, 0xe4, 0x27, 0xb0, 0x1c, 0x43, 0x33, 0x8e, 0x3a, 0xbe, 0x04, 0x10, - 0x2a, 0x5b, 0xb9, 0x4d, 0xd6, 0x88, 0x50, 0xc8, 0x7f, 0x11, 0x60, 0x95, 0x24, 0x54, 0x85, 0x9a, - 0xce, 0x32, 0xb2, 0x2e, 0x00, 0x3c, 0xb1, 0xa9, 0x63, 0x45, 0x8f, 0xa4, 0x39, 0x49, 0x91, 0x9f, - 0x77, 0xa1, 0x40, 0x9f, 0x72, 0xdf, 0xac, 0x77, 0x4d, 0xdf, 0xec, 0xb0, 0xf2, 0xf4, 0xa8, 0xa7, - 0xc8, 0xbc, 0x9c, 0xb6, 0x2f, 0x67, 0x91, 0x7f, 0x89, 0xf4, 0x22, 0xf0, 0xb7, 0x49, 0x97, 0xf8, - 0x02, 0x80, 0xf4, 0x5d, 0xf5, 0x79, 0x5a, 0x7d, 0x96, 0x14, 0x79, 0x3e, 0x3b, 0x50, 0x92, 0x12, - 0x28, 0x71, 0xba, 0x62, 0xd5, 0xc4, 0x14, 0x94, 0x98, 0x82, 0xbf, 0x03, 0xf9, 0x40, 0x7b, 0x23, - 0x9f, 0xc1, 0xc1, 0x04, 0xf2, 0x47, 0x04, 0xab, 0x09, 0xc5, 0x8d, 0xe3, 0x97, 0x07, 0x80, 0x15, - 0x50, 0xeb, 0x04, 0x7d, 0x1f, 0x55, 0xe2, 0x85, 0x18, 0x0c, 0x92, 0xb2, 0x1a, 0x4b, 0x76, 0x82, - 0xc2, 0xc8, 0x3f, 0x11, 0x2c, 0x49, 0x3e, 0xb1, 0x1b, 0x7d, 0x7d, 0x4d, 0xfb, 0x33, 0x04, 0x38, - 0x2a, 0xc7, 0x38, 0x9a, 0xfe, 0x86, 0xba, 0x76, 0x95, 0x24, 0x0b, 0xdb, 0x6f, 0x6a, 0xe7, 0x44, - 0x36, 0x53, 0xdc, 0xe4, 0x7f, 0x08, 0x8a, 0x55, 0x97, 0x51, 0x9f, 0x4f, 0x7e, 0xaa, 0x82, 0xbf, - 0x0e, 0xb3, 0xbe, 0x77, 0x54, 0xb7, 0x4c, 0x6e, 0x06, 0xe7, 0xc2, 0x39, 0x2d, 0xbc, 0x1d, 0xc7, - 0x6b, 0x18, 0x33, 0xbe, 0x77, 0xb4, 0x6b, 0x72, 0x13, 0xbf, 0x01, 0x73, 0x6d, 0x93, 0xb5, 0xeb, - 0x1f, 0xd1, 0x63, 0x56, 0xce, 0x6f, 0x64, 0x37, 0x8b, 0xc6, 0xac, 0x20, 0xdc, 0xa3, 0xc7, 0x8c, - 0x3c, 0x47, 0xb0, 0xd0, 0x97, 0x7f, 0x1c, 0xf5, 0xbf, 0x09, 0xf3, 0xbe, 0x77, 0x54, 0xdd, 0xad, - 0x37, 0x68, 0xcb, 0x76, 0x83, 0x1b, 0x01, 0x24, 0x69, 0x47, 0x50, 0x04, 0x0a, 0xc5, 0x40, 0x5d, - 0x2b, 0xb8, 0x0d, 0x66, 0x25, 0xe1, 0x8e, 0x6b, 0x91, 0x43, 0x28, 0xed, 0x3b, 0x66, 0x93, 0xb6, - 0x3d, 0xc7, 0xa2, 0xbe, 0x8c, 0x4a, 0x5c, 0x82, 0x2c, 0x37, 0x5b, 0x41, 0x70, 0x8b, 0x9f, 0xf8, - 0xdb, 0x90, 0xe3, 0xc7, 0xdd, 0xbe, 0x85, 0xbf, 0xa2, 0x0d, 0x9f, 0xc8, 0x32, 0x07, 0xc7, 0x5d, - 0x6a, 0xc8, 0x19, 0x78, 0x0d, 0xf2, 0xb2, 0x16, 0xa5, 0x72, 0x85, 0x82, 0x11, 0x8c, 0xc8, 0xe3, - 0xd8, 0xbe, 0x7b, 0xbe, 0xd7, 0xeb, 0xe2, 0x2a, 0x14, 0xba, 0x27, 0x34, 0xa1, 0x84, 0xf4, 0x60, - 0x4d, 0x82, 0x36, 0x62, 0x53, 0xc9, 0x67, 0x08, 0x8a, 0x35, 0x6a, 0xfa, 0xcd, 0xf6, 0xeb, 0x90, - 0xbe, 0x0b, 0x8d, 0x5b, 0xcc, 0x09, 0xc2, 0x54, 0xfc, 0xc4, 0x57, 0x61, 0x29, 0x22, 0x50, 0xbd, - 0x25, 0x14, 0x54, 0xce, 0xcb, 0x82, 0x6d, 0xa9, 0x9b, 0x50, 0x1c, 0xb9, 0x07, 0xb9, 0xbb, 0x36, - 0x97, 0xcb, 0x88, 0x4b, 0x18, 0xc9, 0x4b, 0x58, 0xfc, 0xc4, 0xe7, 0x22, 0x7e, 0x9b, 0x91, 0x06, - 0x08, 0x9d, 0x53, 0xd6, 0x81, 0x3d, 0x3f, 0xb0, 0x4c, 0xc6, 0x08, 0x46, 0xe4, 0x87, 0x27, 0x9a, - 0x63, 0x3d, 0x87, 0xb3, 0x97, 0xf3, 0x4a, 0x0c, 0xb9, 0xb6, 0x1d, 0xa4, 0xe2, 0x05, 0x43, 0xfe, - 0x26, 0xbf, 0x40, 0x50, 0x78, 0xd7, 0xe9, 0xb1, 0x2f, 0xc2, 0x26, 0xba, 0xb2, 0x45, 0x56, 0x5f, - 0xb6, 0xf8, 0x77, 0x06, 0x56, 0xf7, 0xa9, 0xcf, 0x6c, 0xc6, 0xa9, 0xcb, 0x83, 0x24, 0xa8, 0xea, - 0x3e, 0xf1, 0xe2, 0x99, 0x24, 0x4a, 0x64, 0x92, 0x9f, 0x4f, 0xee, 0x25, 0xa2, 0xd1, 0xeb, 0x52, - 0xb7, 0xce, 0xed, 0xe0, 0xac, 0xc9, 0x19, 0xb3, 0x82, 0x70, 0x60, 0x77, 0xa8, 0x88, 0x65, 0x46, - 0x4d, 0x87, 0x5a, 0xea, 0xf3, 0xb4, 0xfc, 0x0c, 0x8a, 0x24, 0x19, 0x2e, 0x42, 0xe1, 0x89, 0xd0, - 0x60, 0x9f, 0x23, 0x2f, 0x39, 0xe6, 0x03, 0x9a, 0x64, 0x39, 0x07, 0xb3, 0x6e, 0xaf, 0x53, 0xf7, - 0xbd, 0x23, 0x56, 0x9e, 0x51, 0x69, 0xa8, 0xdb, 0xeb, 0x18, 0xde, 0x91, 0xf4, 0x86, 0x0e, 0xed, - 0xd4, 0x99, 0xfd, 0x8c, 0x96, 0x67, 0xd5, 0xa7, 0x0e, 0xed, 0xd4, 0xec, 0x67, 0xb4, 0xff, 0x76, - 0xa2, 0xe5, 0x39, 0x19, 0xe2, 0xfa, 0x7b, 0x3b, 0xd0, 0x55, 0xec, 0x18, 0xff, 0x1d, 0x82, 0xf3, - 0x5a, 0x6d, 0xbe, 0xbc, 0x91, 0xd7, 0x20, 0xb0, 0x6a, 0xc2, 0xc6, 0x6f, 0x43, 0x22, 0xc0, 0x52, - 0xea, 0x7f, 0xbf, 0x47, 0x70, 0x21, 0x05, 0xd2, 0x38, 0x07, 0xed, 0x4d, 0x98, 0xb6, 0xdd, 0x27, - 0x5e, 0x3f, 0x89, 0xb8, 0xa2, 0x3f, 0x97, 0xb4, 0xfb, 0xaa, 0x89, 0xe4, 0x3f, 0x08, 0x4a, 0xef, - 0xf7, 0xa8, 0x7f, 0xfc, 0xaa, 0x9d, 0x2e, 0x6a, 0xf8, 0x5c, 0xdc, 0xf0, 0x51, 0x77, 0x99, 0x8e, - 0xbb, 0x4b, 0x3c, 0x87, 0xc8, 0x27, 0x73, 0xbd, 0xc8, 0x43, 0x68, 0x26, 0xf6, 0x10, 0x22, 0x1f, - 0x23, 0x58, 0x4f, 0xca, 0x79, 0x76, 0xee, 0xf0, 0x09, 0x82, 0xf2, 0x20, 0x9a, 0x71, 0x3c, 0xe1, - 0xbb, 0x71, 0x4f, 0xd0, 0xdf, 0x50, 0x03, 0x5b, 0x06, 0x4e, 0xf0, 0x1c, 0xc1, 0x8a, 0x41, 0x5b, - 0xc2, 0x49, 0xfc, 0xfb, 0xb6, 0xfb, 0x51, 0x08, 0xe5, 0x9b, 0x30, 0x63, 0x5a, 0x96, 0x4f, 0x19, - 0x3b, 0x55, 0x39, 0xb7, 0x14, 0x8f, 0xd1, 0x67, 0x8e, 0x88, 0x90, 0x19, 0x59, 0x84, 0x2b, 0x37, - 0x61, 0x31, 0x71, 0x61, 0xe3, 0x59, 0xc8, 0x3d, 0x78, 0xf8, 0xe0, 0x4e, 0x69, 0x0a, 0x2f, 0x41, - 0xf1, 0x83, 0x3b, 0xb7, 0x0f, 0x1e, 0x1a, 0xf5, 0x9d, 0xea, 0x83, 0x5b, 0xc6, 0xa3, 0x92, 0x85, - 0x4b, 0x50, 0x08, 0x48, 0xef, 0xde, 0x7f, 0x78, 0xeb, 0xa0, 0x44, 0xb7, 0x3f, 0xc3, 0x50, 0x7c, - 0x4f, 0x6e, 0x54, 0xa3, 0xfe, 0xa1, 0xdd, 0xa4, 0xb8, 0x0e, 0xa5, 0x64, 0xa3, 0x13, 0x5f, 0xd3, - 0xea, 0x26, 0xa5, 0x1f, 0x5a, 0x39, 0x0d, 0x3a, 0x99, 0xc2, 0x1f, 0xc2, 0x42, 0xbc, 0x43, 0x89, - 0xf5, 0x41, 0xa8, 0x6d, 0x63, 0x0e, 0x5b, 0xbc, 0x0e, 0xc5, 0x58, 0xc3, 0x11, 0x5f, 0xd6, 0xae, - 0xad, 0x6b, 0x4a, 0x56, 0x2e, 0x6a, 0x59, 0xa3, 0x3d, 0x43, 0x85, 0x3e, 0xde, 0x43, 0x4a, 0x41, - 0xaf, 0x6d, 0x34, 0x0d, 0x43, 0x6f, 0xc2, 0xd2, 0x40, 0x4b, 0x08, 0x5f, 0xd7, 0xae, 0x9f, 0xd6, - 0x3a, 0x1a, 0xb6, 0xc5, 0x11, 0xe0, 0xc1, 0xd6, 0x1d, 0xbe, 0xa1, 0xb7, 0x40, 0x5a, 0xd7, 0xb1, - 0xb2, 0x35, 0x32, 0x7f, 0xa8, 0xb8, 0x43, 0x58, 0xdf, 0xa3, 0x3c, 0xde, 0xd1, 0xb1, 0x19, 0xb7, - 0x9b, 0x0c, 0x5f, 0xd5, 0xbb, 0x97, 0xb6, 0x17, 0x55, 0xb9, 0x36, 0x1a, 0x73, 0xb8, 0xaf, 0x03, - 0x8b, 0xf1, 0xce, 0x0a, 0x4b, 0xb1, 0x98, 0xb6, 0xc7, 0x53, 0xb9, 0x3a, 0x12, 0x6f, 0xb8, 0xdb, - 0x63, 0x58, 0x4c, 0x34, 0x53, 0xd2, 0xa4, 0xd3, 0xb6, 0x5c, 0x86, 0x59, 0xef, 0x11, 0x14, 0x63, - 0x5d, 0x8f, 0x14, 0xf7, 0xd6, 0x75, 0x46, 0x86, 0x2d, 0xfd, 0x18, 0x0a, 0xd1, 0xe6, 0x04, 0xde, - 0x4c, 0x0b, 0x9c, 0x81, 0x85, 0x47, 0x8a, 0x9b, 0x47, 0x2a, 0x6e, 0xc2, 0xc9, 0x2c, 0x65, 0x03, - 0x4d, 0xb7, 0x61, 0x18, 0xf2, 0x1f, 0x87, 0x51, 0x13, 0x59, 0xfd, 0xda, 0x69, 0x51, 0xf3, 0xa2, - 0xba, 0x61, 0xb0, 0xb6, 0x47, 0x79, 0xac, 0xca, 0x1d, 0xb8, 0x6e, 0x4a, 0xfe, 0xa0, 0x2b, 0xe2, - 0xa7, 0xb8, 0x92, 0xbe, 0x76, 0x4e, 0xa6, 0xb0, 0x0d, 0x0b, 0xb1, 0xea, 0x30, 0x4b, 0x31, 0xb6, - 0xae, 0xe6, 0x5d, 0xb9, 0x32, 0x0a, 0x6b, 0xb8, 0xd5, 0xf7, 0x61, 0x3e, 0x52, 0xdd, 0xc3, 0x97, - 0x4e, 0xf1, 0xd8, 0x68, 0x35, 0x6c, 0x98, 0xda, 0xda, 0x50, 0x8c, 0xd5, 0x82, 0xd2, 0xbc, 0x55, - 0x53, 0x68, 0x4b, 0x11, 0x40, 0x5b, 0x5a, 0x22, 0x53, 0xb8, 0x01, 0xc5, 0x3d, 0xca, 0x4f, 0xca, - 0x13, 0xf8, 0xed, 0xf4, 0xe2, 0x50, 0xb4, 0xe8, 0x53, 0xb9, 0x34, 0x94, 0x2f, 0xdc, 0xa3, 0x06, - 0x79, 0xf5, 0xd2, 0xc7, 0x24, 0x65, 0x52, 0xa4, 0x0c, 0x52, 0xf9, 0xf2, 0xa9, 0x3c, 0xe1, 0xa2, - 0x06, 0xe4, 0xd5, 0x3b, 0x2d, 0x65, 0xd1, 0xd8, 0xf3, 0xb7, 0x72, 0x3a, 0x8f, 0x7c, 0xe8, 0x91, - 0x29, 0x5c, 0x85, 0x69, 0xf9, 0x40, 0xc3, 0xfa, 0xc0, 0x8c, 0x3e, 0xde, 0x86, 0x59, 0xf0, 0x7d, - 0x28, 0xec, 0x51, 0xbe, 0x6b, 0xdd, 0x6e, 0x9b, 0xae, 0x4b, 0x1d, 0x5c, 0xd1, 0xb2, 0xdf, 0xe9, - 0x74, 0xf9, 0x71, 0x8a, 0xc4, 0xf1, 0xff, 0xc5, 0x90, 0x29, 0xfc, 0x1c, 0x41, 0x59, 0x04, 0x93, - 0xf6, 0xed, 0xf6, 0xb5, 0x17, 0x48, 0xc7, 0x03, 0x09, 0xb6, 0x5f, 0x64, 0x4a, 0x88, 0x82, 0xc3, - 0xf2, 0x1e, 0xe5, 0x03, 0x69, 0xfc, 0xb5, 0xd1, 0x92, 0xc0, 0x60, 0xeb, 0xeb, 0x23, 0x72, 0xf7, - 0x77, 0xdd, 0x6e, 0x41, 0x61, 0xdf, 0xf7, 0x9e, 0x1e, 0xf7, 0x73, 0xad, 0x1f, 0x40, 0x21, 0x9a, - 0x44, 0x9e, 0xaa, 0xde, 0xcb, 0x29, 0x07, 0xda, 0x60, 0x0e, 0x4a, 0xa6, 0x76, 0x76, 0x7e, 0x74, - 0xb3, 0x65, 0xf3, 0x76, 0xaf, 0x21, 0xd6, 0xd8, 0x7a, 0x66, 0x3b, 0x8e, 0xfd, 0x8c, 0xd3, 0x66, - 0x7b, 0x4b, 0x4d, 0xbb, 0x6e, 0xd9, 0x8c, 0xfb, 0x76, 0xa3, 0xc7, 0xa9, 0xb5, 0x65, 0xbb, 0x9c, - 0xfa, 0xae, 0xe9, 0x6c, 0xc9, 0x85, 0x03, 0x8e, 0x6e, 0xa3, 0x91, 0x97, 0xe3, 0x77, 0xfe, 0x1f, - 0x00, 0x00, 0xff, 0xff, 0x0d, 0xe8, 0xd6, 0x03, 0x3a, 0x27, 0x00, 0x00, + 0x19, 0xcf, 0xd8, 0x8e, 0x93, 0x3c, 0x59, 0x27, 0xce, 0xe4, 0xcd, 0xf5, 0xb5, 0x5c, 0xba, 0x70, + 0xd7, 0xf4, 0x35, 0x90, 0xe3, 0x55, 0x08, 0xa9, 0x4d, 0xd3, 0x4b, 0xad, 0xf6, 0xda, 0xdc, 0x3a, + 0x1c, 0x94, 0x53, 0x65, 0xd6, 0xde, 0xa9, 0xbd, 0xdc, 0x7a, 0xd7, 0xec, 0x8c, 0x93, 0xa6, 0x9f, + 0x10, 0x45, 0x20, 0x71, 0x27, 0xe0, 0x13, 0x12, 0x5f, 0x91, 0xf8, 0x8a, 0xe0, 0x40, 0xfc, 0x07, + 0x48, 0x48, 0xfc, 0x1d, 0x7c, 0x3a, 0xf1, 0x27, 0x20, 0xa1, 0x99, 0x59, 0xaf, 0x77, 0xd7, 0xb3, + 0xb6, 0x5b, 0xdf, 0x35, 0xee, 0x37, 0xcf, 0xb3, 0xcf, 0xcc, 0xfc, 0x9e, 0xb7, 0x99, 0x67, 0x9e, + 0xc7, 0xa0, 0xb5, 0x6d, 0xe7, 0xb8, 0x4b, 0x6f, 0x74, 0x7c, 0x8f, 0x79, 0x78, 0x35, 0x3a, 0xba, + 0x21, 0x07, 0x65, 0xad, 0xe1, 0xb5, 0xdb, 0x9e, 0x2b, 0x89, 0x65, 0x8d, 0x36, 0x5a, 0xa4, 0x6d, + 0xca, 0x91, 0xfe, 0x27, 0x04, 0x9b, 0xb7, 0x7d, 0x62, 0x32, 0x72, 0xdb, 0x73, 0x1c, 0xd2, 0x60, + 0xb6, 0xe7, 0x1a, 0xe4, 0xa7, 0x5d, 0x42, 0x19, 0xfe, 0x2a, 0xe4, 0xea, 0x26, 0x25, 0x25, 0xb4, + 0x85, 0xb6, 0x17, 0x77, 0xcf, 0xdf, 0x88, 0xad, 0x1d, 0xac, 0xf9, 0x1e, 0x6d, 0xee, 0x99, 0x94, + 0x18, 0x82, 0x13, 0x6f, 0xc2, 0x9c, 0x55, 0xaf, 0xb9, 0x66, 0x9b, 0x94, 0x32, 0x5b, 0x68, 0x7b, + 0xc1, 0xc8, 0x5b, 0xf5, 0x07, 0x66, 0x9b, 0xe0, 0x4b, 0xb0, 0xdc, 0x08, 0xd7, 0x97, 0x0c, 0x59, + 0xc1, 0xb0, 0xd4, 0x27, 0x0b, 0xc6, 0x0d, 0xc8, 0x4b, 0x7c, 0xa5, 0xdc, 0x16, 0xda, 0xd6, 0x8c, + 0x60, 0xa4, 0x7f, 0x8c, 0x60, 0x7d, 0xdf, 0xf7, 0x3a, 0x53, 0x81, 0x52, 0xff, 0x35, 0x82, 0xb5, + 0xbb, 0x26, 0x9d, 0x0e, 0x30, 0x8f, 0x40, 0xdb, 0xf3, 0x3c, 0xc7, 0x20, 0xb4, 0xe3, 0xb9, 0x94, + 0xe0, 0x77, 0x20, 0x4f, 0x99, 0xc9, 0xba, 0x34, 0x40, 0xf1, 0x86, 0x12, 0x45, 0x55, 0xb0, 0x18, + 0x01, 0x2b, 0x5e, 0x83, 0xd9, 0x63, 0xd3, 0xe9, 0x4a, 0x10, 0xf3, 0x86, 0x1c, 0xe8, 0x1f, 0xc2, + 0x52, 0x95, 0xf9, 0xb6, 0xdb, 0xfc, 0x1c, 0x17, 0x5f, 0xe8, 0x2d, 0xfe, 0x5b, 0x04, 0xe7, 0xf6, + 0x09, 0x6d, 0xf8, 0x76, 0x7d, 0x3a, 0x9c, 0x4f, 0xff, 0x3b, 0x82, 0xb2, 0x0a, 0xd1, 0x24, 0xb2, + 0x7f, 0x2f, 0x74, 0xe8, 0x8c, 0x98, 0xf4, 0x56, 0x7c, 0x52, 0x10, 0x8c, 0xfd, 0xdd, 0xaa, 0x82, + 0xd0, 0xf3, 0x7b, 0xac, 0x83, 0xd6, 0x07, 0x59, 0xd9, 0x17, 0xc0, 0xb3, 0x46, 0x8c, 0x26, 0x62, + 0xe3, 0xbe, 0x67, 0x5a, 0xd3, 0xa1, 0xc4, 0xdf, 0x20, 0x28, 0x19, 0xc4, 0x21, 0x26, 0x9d, 0x12, + 0xab, 0x7e, 0x82, 0x60, 0x23, 0xa2, 0x5f, 0x66, 0x32, 0x7a, 0x96, 0x70, 0x7e, 0xc5, 0x4f, 0xdc, + 0x24, 0x9c, 0x49, 0x3c, 0xec, 0x5b, 0x30, 0xcb, 0x7f, 0xd1, 0x52, 0x66, 0x2b, 0xbb, 0xbd, 0xb8, + 0x7b, 0x51, 0x39, 0xe7, 0x1e, 0x39, 0xfd, 0x80, 0x47, 0xdd, 0xa1, 0x69, 0xfb, 0x86, 0xe4, 0xd7, + 0xeb, 0xb0, 0x5e, 0x6d, 0x79, 0x27, 0x5f, 0xa4, 0x95, 0xf4, 0xa7, 0xb0, 0x91, 0xdc, 0x63, 0x12, + 0x59, 0x2f, 0x43, 0x31, 0xa1, 0x65, 0x29, 0xf6, 0x82, 0xb1, 0x1c, 0x57, 0x33, 0xd5, 0xff, 0xc6, + 0xcd, 0x2e, 0x6e, 0xb6, 0x43, 0xd3, 0x67, 0xf6, 0x59, 0x5f, 0x6c, 0x6f, 0xc1, 0x52, 0xa7, 0x87, + 0x43, 0xf2, 0xe5, 0x04, 0x5f, 0x21, 0xa4, 0x0a, 0x7d, 0xfd, 0x15, 0xc1, 0x1a, 0xbf, 0xe7, 0x5e, + 0x27, 0xcc, 0x7f, 0x41, 0xb0, 0x7a, 0xd7, 0xa4, 0xaf, 0x13, 0xe4, 0x4f, 0x11, 0xac, 0xf2, 0x23, + 0x53, 0x62, 0x3e, 0x5b, 0xc8, 0x97, 0x60, 0x39, 0x0e, 0x99, 0x96, 0x72, 0xc2, 0xa5, 0x97, 0x62, + 0x98, 0xa9, 0xfe, 0x0f, 0x04, 0x9b, 0xc1, 0xc9, 0x3a, 0x15, 0xba, 0x1e, 0x1b, 0xf8, 0xa7, 0x08, + 0xd6, 0x43, 0xc4, 0x67, 0x7d, 0x00, 0x8f, 0xeb, 0x22, 0xbf, 0x44, 0xb0, 0x91, 0x04, 0x7d, 0x26, + 0xc7, 0xf4, 0x9f, 0x11, 0xac, 0xf1, 0x33, 0x74, 0x2a, 0x6c, 0x9e, 0xcc, 0x47, 0x72, 0x8a, 0x7c, + 0xe4, 0x0f, 0x48, 0x5e, 0x2c, 0x11, 0xc0, 0x93, 0x28, 0x4e, 0xe1, 0x66, 0x19, 0x95, 0x9b, 0x71, + 0x6c, 0x21, 0xa5, 0xb2, 0x4f, 0x4b, 0xd9, 0xad, 0x2c, 0xc7, 0x16, 0xa5, 0x89, 0x64, 0xa0, 0x97, + 0xe2, 0x55, 0x49, 0xb3, 0x4d, 0x5c, 0xf6, 0xf2, 0xea, 0x4c, 0x2a, 0x23, 0x33, 0xa8, 0x0c, 0x7c, + 0x1e, 0x16, 0xa8, 0xdc, 0x27, 0xcc, 0xde, 0xfa, 0x04, 0xfd, 0xe7, 0x08, 0x36, 0x07, 0xe0, 0x4c, + 0xa2, 0xac, 0x12, 0xcc, 0xd9, 0xae, 0x45, 0x9e, 0x86, 0x68, 0x7a, 0x43, 0xfe, 0xa5, 0xde, 0xb5, + 0x1d, 0x2b, 0x84, 0xd1, 0x1b, 0x72, 0x9d, 0x60, 0x6e, 0xaf, 0x57, 0xa2, 0x8f, 0x2d, 0x58, 0x8c, + 0x18, 0x24, 0x80, 0x12, 0x25, 0xe9, 0x3f, 0x81, 0xd5, 0x18, 0x9a, 0x49, 0xd4, 0xf1, 0x25, 0x80, + 0x50, 0xd9, 0xd2, 0x6d, 0xb2, 0x46, 0x84, 0xa2, 0xff, 0x17, 0x01, 0x96, 0x49, 0x42, 0x85, 0xab, + 0xe9, 0x2c, 0x23, 0xeb, 0x02, 0xc0, 0x13, 0x9b, 0x38, 0x56, 0xf4, 0x48, 0x5a, 0x10, 0x14, 0xf1, + 0x79, 0x1f, 0x34, 0xf2, 0x94, 0xf9, 0x66, 0xad, 0x63, 0xfa, 0x66, 0x9b, 0x96, 0x66, 0xc7, 0x3d, + 0x45, 0x16, 0xc5, 0xb4, 0x43, 0x31, 0x4b, 0xff, 0x17, 0x4f, 0x2f, 0x02, 0x7f, 0x9b, 0x76, 0x89, + 0x2f, 0x00, 0x08, 0xdf, 0x95, 0x9f, 0x67, 0xe5, 0x67, 0x41, 0xe9, 0x9d, 0xcf, 0x45, 0x21, 0x82, + 0x94, 0xa7, 0xc3, 0x97, 0x4d, 0xcc, 0x41, 0x89, 0x39, 0x43, 0xa2, 0xe3, 0x3b, 0x90, 0x0f, 0x14, + 0x9b, 0x1d, 0x57, 0xb1, 0xc1, 0x04, 0xfd, 0x8f, 0x08, 0xd6, 0x13, 0x3a, 0x9d, 0xc4, 0x65, 0x8f, + 0x00, 0x4b, 0x11, 0xac, 0xbe, 0x5c, 0xbd, 0x4b, 0x23, 0xf1, 0x78, 0x0c, 0x06, 0x49, 0x2d, 0x18, + 0x2b, 0x76, 0x82, 0x42, 0xf5, 0x7f, 0x22, 0x58, 0x11, 0x7c, 0x7c, 0x37, 0xf2, 0xfa, 0x5a, 0xfd, + 0x67, 0x08, 0x70, 0x54, 0x8e, 0x49, 0x34, 0xfd, 0x0d, 0x79, 0x23, 0x4b, 0x49, 0x96, 0x76, 0xdf, + 0x54, 0xce, 0x89, 0x6c, 0x26, 0xb9, 0xf5, 0xff, 0x21, 0x28, 0x54, 0x5c, 0x4a, 0x7c, 0x36, 0xfd, + 0x59, 0x0c, 0xfe, 0x3a, 0xcc, 0xfb, 0xde, 0x49, 0xcd, 0x32, 0x99, 0x19, 0x1c, 0x19, 0xe7, 0x94, + 0xf0, 0xf6, 0x1c, 0xaf, 0x6e, 0xcc, 0xf9, 0xde, 0xc9, 0xbe, 0xc9, 0x4c, 0xfc, 0x06, 0x2c, 0xb4, + 0x4c, 0xda, 0xaa, 0x7d, 0x44, 0x4e, 0x69, 0x29, 0xbf, 0x95, 0xdd, 0x2e, 0x18, 0xf3, 0x9c, 0x70, + 0x8f, 0x9c, 0x52, 0xfd, 0x39, 0x82, 0xa5, 0x9e, 0xfc, 0x93, 0xa8, 0xff, 0x4d, 0x58, 0xf4, 0xbd, + 0x93, 0xca, 0x7e, 0xad, 0x4e, 0x9a, 0xb6, 0x1b, 0x04, 0x24, 0x08, 0xd2, 0x1e, 0xa7, 0x70, 0x14, + 0x92, 0x81, 0xb8, 0x56, 0x70, 0x51, 0xcc, 0x0b, 0xc2, 0x1d, 0xd7, 0xd2, 0x8f, 0xa1, 0x78, 0xe8, + 0x98, 0x0d, 0xd2, 0xf2, 0x1c, 0x8b, 0xf8, 0x22, 0x2a, 0x71, 0x11, 0xb2, 0xcc, 0x6c, 0x06, 0x61, + 0xcf, 0x7f, 0xe2, 0x6f, 0x43, 0x8e, 0x9d, 0x76, 0x7a, 0x16, 0xfe, 0x8a, 0x32, 0x7c, 0x22, 0xcb, + 0x1c, 0x9d, 0x76, 0x88, 0x21, 0x66, 0xe0, 0x0d, 0xc8, 0x8b, 0x32, 0x95, 0x3c, 0x10, 0x34, 0x23, + 0x18, 0xe9, 0x8f, 0x63, 0xfb, 0x1e, 0xf8, 0x5e, 0xb7, 0x83, 0x2b, 0xa0, 0x75, 0xfa, 0x34, 0xae, + 0x84, 0xf4, 0x60, 0x4d, 0x82, 0x36, 0x62, 0x53, 0xf5, 0xcf, 0x10, 0x14, 0xaa, 0xc4, 0xf4, 0x1b, + 0xad, 0xd7, 0x21, 0xb3, 0xe7, 0x1a, 0xb7, 0xa8, 0x13, 0x84, 0x29, 0xff, 0x89, 0xaf, 0xc2, 0x4a, + 0x44, 0xa0, 0x5a, 0x93, 0x2b, 0xa8, 0x94, 0x17, 0xb5, 0xdc, 0x62, 0x27, 0xa1, 0x38, 0xfd, 0x1e, + 0xe4, 0xee, 0xda, 0x4c, 0x2c, 0xc3, 0xef, 0x67, 0x24, 0xee, 0x67, 0xfe, 0x13, 0x9f, 0x8b, 0xf8, + 0x6d, 0x46, 0x18, 0x20, 0x74, 0x4e, 0x51, 0x22, 0xf6, 0xfc, 0xc0, 0x32, 0x19, 0x23, 0x18, 0xe9, + 0x3f, 0xec, 0x6b, 0x8e, 0x76, 0x1d, 0x46, 0x5f, 0xce, 0x2b, 0x31, 0xe4, 0x5a, 0x76, 0x90, 0xa5, + 0x6b, 0x86, 0xf8, 0xad, 0xff, 0x02, 0x81, 0xf6, 0xae, 0xd3, 0xa5, 0x5f, 0x84, 0x4d, 0x54, 0x15, + 0x8d, 0xac, 0xba, 0xa2, 0xf1, 0xef, 0x0c, 0xac, 0x1f, 0x12, 0x9f, 0xda, 0x94, 0x11, 0x97, 0x05, + 0xf9, 0x51, 0xc5, 0x7d, 0xe2, 0xc5, 0x93, 0x4c, 0x94, 0x48, 0x32, 0x3f, 0x9f, 0xb4, 0x8c, 0x47, + 0xa3, 0xd7, 0x21, 0x6e, 0x8d, 0xd9, 0xc1, 0x59, 0x93, 0x33, 0xe6, 0x39, 0xe1, 0xc8, 0x6e, 0x13, + 0x1e, 0xcb, 0x94, 0x98, 0x0e, 0xb1, 0xe4, 0xe7, 0x59, 0xf1, 0x19, 0x24, 0x49, 0x30, 0x5c, 0x04, + 0xed, 0x09, 0xd7, 0x60, 0x8f, 0x23, 0x2f, 0x38, 0x16, 0x03, 0x9a, 0x60, 0x39, 0x07, 0xf3, 0x6e, + 0xb7, 0x5d, 0xf3, 0xbd, 0x13, 0x5a, 0x9a, 0x93, 0xb7, 0xb3, 0xdb, 0x6d, 0x1b, 0xde, 0x89, 0xf0, + 0x86, 0x36, 0x69, 0xd7, 0xa8, 0xfd, 0x8c, 0x94, 0xe6, 0xe5, 0xa7, 0x36, 0x69, 0x57, 0xed, 0x67, + 0xa4, 0xf7, 0xac, 0x22, 0xa5, 0x05, 0x11, 0xe2, 0xea, 0x7b, 0x3b, 0xd0, 0x55, 0xec, 0x18, 0xff, + 0x1d, 0x82, 0xf3, 0x4a, 0x6d, 0xbe, 0xbc, 0x91, 0x37, 0x20, 0xb0, 0x6a, 0xc2, 0xc6, 0x6f, 0x43, + 0x22, 0xc0, 0x52, 0x4a, 0x83, 0xbf, 0x47, 0x70, 0x21, 0x05, 0xd2, 0x24, 0x07, 0xed, 0x4d, 0x98, + 0xb5, 0xdd, 0x27, 0x5e, 0x2f, 0x89, 0xb8, 0xa2, 0x3e, 0x97, 0x94, 0xfb, 0xca, 0x89, 0xfa, 0x7f, + 0x10, 0x14, 0xdf, 0xef, 0x12, 0xff, 0xf4, 0x55, 0x3b, 0x5d, 0xd4, 0xf0, 0xb9, 0xb8, 0xe1, 0xa3, + 0xee, 0x32, 0x1b, 0x77, 0x97, 0x78, 0x0e, 0x91, 0x1f, 0x92, 0x05, 0xce, 0xc5, 0xb2, 0x40, 0xfd, + 0x63, 0x04, 0x9b, 0x49, 0x39, 0xcf, 0xce, 0x1d, 0x3e, 0x41, 0x50, 0x1a, 0x44, 0x33, 0x89, 0x27, + 0x7c, 0x37, 0xee, 0x09, 0xea, 0x1b, 0x6a, 0x60, 0xcb, 0xc0, 0x09, 0x9e, 0x23, 0x58, 0x33, 0x48, + 0x93, 0x3b, 0x89, 0x7f, 0xdf, 0x76, 0x3f, 0x0a, 0xa1, 0x7c, 0x13, 0xe6, 0x4c, 0xcb, 0xf2, 0x09, + 0xa5, 0x43, 0x95, 0x73, 0x4b, 0xf2, 0x18, 0x3d, 0xe6, 0x88, 0x08, 0x99, 0xb1, 0x45, 0xb8, 0x72, + 0x13, 0x96, 0x13, 0x17, 0x36, 0x9e, 0x87, 0xdc, 0x83, 0x87, 0x0f, 0xee, 0x14, 0x67, 0xf0, 0x0a, + 0x14, 0x3e, 0xb8, 0x73, 0xfb, 0xe8, 0xa1, 0x51, 0xdb, 0xab, 0x3c, 0xb8, 0x65, 0x3c, 0x2a, 0x5a, + 0xb8, 0x08, 0x5a, 0x40, 0x7a, 0xf7, 0xfe, 0xc3, 0x5b, 0x47, 0x45, 0xb2, 0xfb, 0x19, 0x86, 0xc2, + 0x7b, 0x62, 0xa3, 0x2a, 0xf1, 0x8f, 0xed, 0x06, 0xc1, 0x35, 0x28, 0x26, 0x7b, 0xa0, 0xf8, 0x9a, + 0x52, 0x37, 0x29, 0xad, 0xd2, 0xf2, 0x30, 0xe8, 0xfa, 0x0c, 0xfe, 0x10, 0x96, 0xe2, 0xcd, 0x4b, + 0xac, 0x0e, 0x42, 0x65, 0x87, 0x73, 0xd4, 0xe2, 0x35, 0x28, 0xc4, 0x7a, 0x91, 0xf8, 0xb2, 0x72, + 0x6d, 0x55, 0xbf, 0xb2, 0x7c, 0x51, 0xc9, 0x1a, 0x6d, 0x27, 0x4a, 0xf4, 0xf1, 0xf6, 0x52, 0x0a, + 0x7a, 0x65, 0x0f, 0x6a, 0x14, 0x7a, 0x13, 0x56, 0x06, 0xba, 0x45, 0xf8, 0xba, 0x72, 0xfd, 0xb4, + 0xae, 0xd2, 0xa8, 0x2d, 0x4e, 0x00, 0x0f, 0x76, 0xf5, 0xf0, 0x0d, 0xb5, 0x05, 0xd2, 0x1a, 0x92, + 0xe5, 0x9d, 0xb1, 0xf9, 0x43, 0xc5, 0x1d, 0xc3, 0xe6, 0x01, 0x61, 0xf1, 0x66, 0x8f, 0x4d, 0x99, + 0xdd, 0xa0, 0xf8, 0xaa, 0xda, 0xbd, 0x94, 0x6d, 0xaa, 0xf2, 0xb5, 0xf1, 0x98, 0xc3, 0x7d, 0x1d, + 0x58, 0x8e, 0x37, 0x5d, 0x68, 0x8a, 0xc5, 0x94, 0xed, 0x9f, 0xf2, 0xd5, 0xb1, 0x78, 0xc3, 0xdd, + 0x1e, 0xc3, 0x72, 0xa2, 0xcf, 0x92, 0x26, 0x9d, 0xb2, 0x1b, 0x33, 0xca, 0x7a, 0x8f, 0xa0, 0x10, + 0x6b, 0x88, 0xa4, 0xb8, 0xb7, 0xaa, 0x69, 0x32, 0x6a, 0xe9, 0xc7, 0xa0, 0x45, 0xfb, 0x16, 0x78, + 0x3b, 0x2d, 0x70, 0x06, 0x16, 0x1e, 0x2b, 0x6e, 0x1e, 0xc9, 0xb8, 0x09, 0x27, 0xd3, 0x94, 0x0d, + 0x14, 0x8d, 0x88, 0x51, 0xc8, 0x7f, 0x1c, 0x46, 0x4d, 0x64, 0xf5, 0x6b, 0xc3, 0xa2, 0xe6, 0x45, + 0x75, 0x43, 0x61, 0xe3, 0x80, 0xb0, 0x58, 0x01, 0x3c, 0x70, 0xdd, 0x94, 0xfc, 0x41, 0x55, 0xdf, + 0x4f, 0x71, 0x25, 0x75, 0x59, 0x5d, 0x9f, 0xc1, 0x36, 0x2c, 0xc5, 0x0a, 0xc7, 0x34, 0xc5, 0xd8, + 0xaa, 0x72, 0x78, 0xf9, 0xca, 0x38, 0xac, 0xe1, 0x56, 0xdf, 0x87, 0xc5, 0x48, 0xe1, 0x0f, 0x5f, + 0x1a, 0xe2, 0xb1, 0xd1, 0x42, 0xd9, 0x28, 0xb5, 0xb5, 0xa0, 0x10, 0xab, 0x05, 0xa5, 0x79, 0xab, + 0xa2, 0x06, 0x97, 0x22, 0x80, 0xb2, 0xb4, 0xa4, 0xcf, 0xe0, 0x3a, 0x14, 0x0e, 0x08, 0xeb, 0x97, + 0x27, 0xf0, 0xdb, 0xe9, 0xc5, 0xa1, 0x68, 0xd1, 0xa7, 0x7c, 0x69, 0x24, 0x5f, 0xb8, 0x47, 0x15, + 0xf2, 0xf2, 0xa5, 0x8f, 0xf5, 0x94, 0x49, 0x91, 0x32, 0x48, 0xf9, 0xcb, 0x43, 0x79, 0xc2, 0x45, + 0x0d, 0xc8, 0xcb, 0x77, 0x5a, 0xca, 0xa2, 0xb1, 0xe7, 0x6f, 0x79, 0x38, 0x8f, 0x78, 0xe8, 0xe9, + 0x33, 0xb8, 0x02, 0xb3, 0xe2, 0x81, 0x86, 0xd5, 0x81, 0x19, 0x7d, 0xbc, 0x8d, 0xb2, 0xe0, 0xfb, + 0xa0, 0x1d, 0x10, 0xb6, 0x6f, 0xdd, 0x6e, 0x99, 0xae, 0x4b, 0x1c, 0x5c, 0x56, 0xb2, 0xdf, 0x69, + 0x77, 0xd8, 0x69, 0x8a, 0xc4, 0xf1, 0xbf, 0xcc, 0xe8, 0x33, 0xf8, 0x39, 0x82, 0x12, 0x0f, 0x26, + 0xe5, 0xdb, 0xed, 0x6b, 0x2f, 0x90, 0x8e, 0x07, 0x12, 0xec, 0xbe, 0xc8, 0x94, 0x10, 0x05, 0x83, + 0xd5, 0x03, 0xc2, 0x06, 0xd2, 0xf8, 0x6b, 0xe3, 0x25, 0x81, 0xc1, 0xd6, 0xd7, 0xc7, 0xe4, 0xee, + 0xed, 0xba, 0xdb, 0x04, 0xed, 0xd0, 0xf7, 0x9e, 0x9e, 0xf6, 0x72, 0xad, 0x1f, 0x80, 0x16, 0x4d, + 0x22, 0x87, 0xaa, 0xf7, 0x72, 0xca, 0x81, 0x36, 0x98, 0x83, 0xea, 0x33, 0x7b, 0x7b, 0x3f, 0xba, + 0xd9, 0xb4, 0x59, 0xab, 0x5b, 0xe7, 0x6b, 0xec, 0x3c, 0xb3, 0x1d, 0xc7, 0x7e, 0xc6, 0x48, 0xa3, + 0xb5, 0x23, 0xa7, 0x5d, 0xb7, 0x6c, 0xca, 0x7c, 0xbb, 0xde, 0x65, 0xc4, 0xda, 0xb1, 0x5d, 0x46, + 0x7c, 0xd7, 0x74, 0x76, 0xc4, 0xc2, 0x01, 0x47, 0xa7, 0x5e, 0xcf, 0x8b, 0xf1, 0x3b, 0xff, 0x0f, + 0x00, 0x00, 0xff, 0xff, 0x1b, 0x5d, 0xdb, 0x5d, 0x55, 0x27, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/internal/proxynode/impl.go b/internal/proxynode/impl.go index de9bfac828..c57bd0da27 100644 --- a/internal/proxynode/impl.go +++ b/internal/proxynode/impl.go @@ -545,10 +545,10 @@ func (node *NodeImpl) GetIndexState(request *milvuspb.IndexStateRequest) (*milvu ctx, cancel := context.WithTimeout(context.Background(), reqTimeoutInterval) defer cancel() dipt := &GetIndexStateTask{ - Condition: NewTaskCondition(ctx), - IndexStateRequest: request, - indexServiceClient: node.indexServiceClient, - masterClientInterface: node.masterClient, + Condition: NewTaskCondition(ctx), + IndexStateRequest: request, + indexServiceClient: node.indexServiceClient, + masterClient: node.masterClient, } err := node.sched.DdQueue.Enqueue(dipt) diff --git a/internal/proxynode/paramtable.go b/internal/proxynode/paramtable.go index 3eefa5ad3b..a3ca31df19 100644 --- a/internal/proxynode/paramtable.go +++ b/internal/proxynode/paramtable.go @@ -51,6 +51,7 @@ type ParamTable struct { MaxFieldNum int64 MaxDimension int64 DefaultPartitionTag string + DefaultIndexName string } var Params ParamTable @@ -108,95 +109,6 @@ func (pt *ParamTable) LoadConfigFromInitParams(initParams *internalpb2.InitParam } pt.initParams() - // - //pulsarPort := config.GetString(PulsarPort) - //pulsarHost := config.GetString(PulsarHost) - //pt.PulsarAddress = pulsarHost + ":" + pulsarPort - // - // - //queryNodeIDList := config.GetString(QueryNodeIDList) - //pt.QueryNodeIDList = nil - //queryNodeIDs := strings.Split(queryNodeIDList, ",") - //for _, queryNodeID := range queryNodeIDs { - // v, err := strconv.Atoi(queryNodeID) - // if err != nil { - // return err - // } - // pt.QueryNodeIDList = append(pt.QueryNodeIDList, typeutil.UniqueID(v)) - //} - //pt.QueryNodeNum = len(pt.QueryNodeIDList) - // - //timeTickInterval := config.GetString(TimeTickInterval) - //interval, err := strconv.Atoi(timeTickInterval) - //if err != nil { - // return err - //} - //pt.TimeTickInterval = time.Duration(interval) * time.Millisecond - // - //subName := config.GetString(SubName) - //pt.ProxySubName = subName - // - //timeTickChannelNames := config.GetString(TimeTickChannelNames) - //pt.ProxyTimeTickChannelNames = []string{timeTickChannelNames} - // - //msgStreamInsertBufSizeStr := config.GetString(MsgStreamInsertBufSize) - //msgStreamInsertBufSize, err := strconv.Atoi(msgStreamInsertBufSizeStr) - //if err != nil { - // return err - //} - //pt.MsgStreamInsertBufSize = int64(msgStreamInsertBufSize) - // - //msgStreamSearchBufSizeStr := config.GetString(MsgStreamSearchBufSize) - //msgStreamSearchBufSize, err := strconv.Atoi(msgStreamSearchBufSizeStr) - //if err != nil { - // return err - //} - //pt.MsgStreamSearchBufSize = int64(msgStreamSearchBufSize) - // - //msgStreamSearchResultBufSizeStr := config.GetString(MsgStreamSearchResultBufSize) - //msgStreamSearchResultBufSize, err := strconv.Atoi(msgStreamSearchResultBufSizeStr) - //if err != nil { - // return err - //} - //pt.MsgStreamSearchResultBufSize = int64(msgStreamSearchResultBufSize) - // - //msgStreamSearchResultPulsarBufSizeStr := config.GetString(MsgStreamSearchResultPulsarBufSize) - //msgStreamSearchResultPulsarBufSize, err := strconv.Atoi(msgStreamSearchResultPulsarBufSizeStr) - //if err != nil { - // return err - //} - //pt.MsgStreamSearchResultPulsarBufSize = int64(msgStreamSearchResultPulsarBufSize) - // - //msgStreamTimeTickBufSizeStr := config.GetString(MsgStreamTimeTickBufSize) - //msgStreamTimeTickBufSize, err := strconv.Atoi(msgStreamTimeTickBufSizeStr) - //if err != nil { - // return err - //} - //pt.MsgStreamTimeTickBufSize = int64(msgStreamTimeTickBufSize) - // - //maxNameLengthStr := config.GetString(MaxNameLength) - //maxNameLength, err := strconv.Atoi(maxNameLengthStr) - //if err != nil { - // return err - //} - //pt.MaxNameLength = int64(maxNameLength) - // - //maxFieldNumStr := config.GetString(MaxFieldNum) - //maxFieldNum, err := strconv.Atoi(maxFieldNumStr) - //if err != nil { - // return err - //} - //pt.MaxFieldNum = int64(maxFieldNum) - // - //maxDimensionStr := config.GetString(MaxDimension) - //maxDimension, err := strconv.Atoi(maxDimensionStr) - //if err != nil { - // return err - //} - //pt.MaxDimension = int64(maxDimension) - // - //defaultPartitionTag := config.GetString(DefaultPartitionTag) - //pt.DefaultPartitionTag = defaultPartitionTag return nil } @@ -235,6 +147,8 @@ func (pt *ParamTable) initParams() { pt.initMaxFieldNum() pt.initMaxDimension() pt.initDefaultPartitionTag() + pt.initDefaultIndexName() + } func (pt *ParamTable) initPulsarAddress() { @@ -475,3 +389,11 @@ func (pt *ParamTable) initDefaultPartitionTag() { } pt.DefaultPartitionTag = tag } + +func (pt *ParamTable) initDefaultIndexName() { + name, err := pt.Load("common.defaultIndexName") + if err != nil { + panic(err) + } + pt.DefaultIndexName = name +} diff --git a/internal/proxynode/task.go b/internal/proxynode/task.go index 7b85eb0307..fe43782b23 100644 --- a/internal/proxynode/task.go +++ b/internal/proxynode/task.go @@ -3,6 +3,7 @@ package proxynode import ( "context" "errors" + "fmt" "log" "math" "strconv" @@ -1346,9 +1347,9 @@ func (dit *DescribeIndexTask) PostExecute() error { type GetIndexStateTask struct { Condition *milvuspb.IndexStateRequest - indexServiceClient IndexServiceClient - masterClientInterface MasterClient - result *milvuspb.IndexStateResponse + indexServiceClient IndexServiceClient + masterClient MasterClient + result *milvuspb.IndexStateResponse } func (dipt *GetIndexStateTask) OnEnqueue() error { @@ -1415,11 +1416,46 @@ func (dipt *GetIndexStateTask) Execute() error { CollectionName: collectionName, CollectionID: collectionID, } - partitions, err := dipt.masterClientInterface.ShowPartitions(showPartitionRequest) + partitions, err := dipt.masterClient.ShowPartitions(showPartitionRequest) if err != nil { return err } + if dipt.IndexName == "" { + dipt.IndexName = Params.DefaultIndexName + } + + describeIndexReq := milvuspb.DescribeIndexRequest{ + Base: &commonpb.MsgBase{ + MsgType: commonpb.MsgType_kDescribeIndex, + MsgID: dipt.Base.MsgID, + Timestamp: dipt.Base.Timestamp, + SourceID: Params.ProxyID, + }, + DbName: dipt.DbName, + CollectionName: dipt.CollectionName, + FieldName: dipt.FieldName, + IndexName: dipt.IndexName, + } + + indexDescriptionResp, err2 := dipt.masterClient.DescribeIndex(&describeIndexReq) + if err2 != nil { + return err2 + } + + matchIndexID := int64(-1) + foundIndexID := false + for _, desc := range indexDescriptionResp.IndexDescriptions { + if desc.IndexName == dipt.IndexName { + matchIndexID = desc.IndexID + foundIndexID = true + break + } + } + if !foundIndexID { + return errors.New(fmt.Sprint("Can't found IndexID for indexName", dipt.IndexName)) + } + for _, partitionID := range partitions.PartitionIDs { showSegmentsRequest := &milvuspb.ShowSegmentRequest{ Base: &commonpb.MsgBase{ @@ -1431,7 +1467,7 @@ func (dipt *GetIndexStateTask) Execute() error { CollectionID: collectionID, PartitionID: partitionID, } - segments, err := dipt.masterClientInterface.ShowSegments(showSegmentsRequest) + segments, err := dipt.masterClient.ShowSegments(showSegmentsRequest) if err != nil { return err } @@ -1450,12 +1486,13 @@ func (dipt *GetIndexStateTask) Execute() error { CollectionID: collectionID, SegmentID: segmentID, } - segmentDesc, err := dipt.masterClientInterface.DescribeSegment(describeSegmentRequest) + segmentDesc, err := dipt.masterClient.DescribeSegment(describeSegmentRequest) if err != nil { return err } - - getIndexStatesRequest.IndexBuildIDs = append(getIndexStatesRequest.IndexBuildIDs, segmentDesc.BuildID) + if segmentDesc.IndexID == matchIndexID { + getIndexStatesRequest.IndexBuildIDs = append(getIndexStatesRequest.IndexBuildIDs, segmentDesc.BuildID) + } } states, err := dipt.indexServiceClient.GetIndexStates(getIndexStatesRequest) diff --git a/tests/python/requirements.txt b/tests/python/requirements.txt index 590f020389..4e31798f94 100644 --- a/tests/python/requirements.txt +++ b/tests/python/requirements.txt @@ -2,7 +2,7 @@ grpcio==1.26.0 grpcio-tools==1.26.0 numpy==1.18.1 pytest-cov==2.8.1 -pymilvus-distributed==0.0.22 +pymilvus-distributed==0.0.23 sklearn==0.0 pytest==4.5.0 pytest-timeout==1.3.3