From b1e5a25d4b417232c0cbd06a24633c5178872a53 Mon Sep 17 00:00:00 2001 From: PowderLi Date: Mon, 11 Dec 2023 15:51:15 +0800 Subject: [PATCH] upgrade proto to use partition related privileges Signed-off-by: PowderLi --- go.mod | 2 +- go.sum | 2 + internal/core/src/pb/common.pb.cc | 371 +++++++++++++-------- internal/core/src/pb/common.pb.h | 117 ++++++- internal/core/src/pb/schema.pb.cc | 241 ++++++++----- internal/core/src/pb/schema.pb.h | 223 ++++++++++++- internal/distributed/proxy/service.go | 10 + internal/distributed/proxy/service_test.go | 8 + internal/mocks/mock_proxy.go | 10 + internal/proxy/impl.go | 10 + pkg/go.mod | 2 +- pkg/go.sum | 2 + pkg/util/constant.go | 6 + pkg/util/funcutil/policy_test.go | 2 +- 14 files changed, 770 insertions(+), 236 deletions(-) diff --git a/go.mod b/go.mod index 11132743a0c29..1c8d7e320fa7e 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 github.com/klauspost/compress v1.16.5 github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d - github.com/milvus-io/milvus-proto/go-api/v2 v2.3.4-0.20231114080011-9a495865219e + github.com/milvus-io/milvus-proto/go-api/v2 v2.3.4-0.20231208092431-02cbad30332f github.com/milvus-io/milvus/pkg v0.0.1 github.com/minio/minio-go/v7 v7.0.56 github.com/prometheus/client_golang v1.14.0 diff --git a/go.sum b/go.sum index 1a6a8e393eb7a..1ea1458a10928 100644 --- a/go.sum +++ b/go.sum @@ -586,6 +586,8 @@ github.com/milvus-io/gorocksdb v0.0.0-20220624081344-8c5f4212846b h1:TfeY0NxYxZz github.com/milvus-io/gorocksdb v0.0.0-20220624081344-8c5f4212846b/go.mod h1:iwW+9cWfIzzDseEBCCeDSN5SD16Tidvy8cwQ7ZY8Qj4= github.com/milvus-io/milvus-proto/go-api/v2 v2.3.4-0.20231114080011-9a495865219e h1:IH1WAXwEF8vbwahPdupi4zzRNWViT4B7fZzIjtRLpG4= github.com/milvus-io/milvus-proto/go-api/v2 v2.3.4-0.20231114080011-9a495865219e/go.mod h1:1OIl0v5PQeNxIJhCvY+K55CBUOYDZevw9g9380u1Wek= +github.com/milvus-io/milvus-proto/go-api/v2 v2.3.4-0.20231208092431-02cbad30332f h1:0cAMN9OsgBxlEUY8i1e1ocrBZ/cpu/Kdguz4JWz9fUc= +github.com/milvus-io/milvus-proto/go-api/v2 v2.3.4-0.20231208092431-02cbad30332f/go.mod h1:1OIl0v5PQeNxIJhCvY+K55CBUOYDZevw9g9380u1Wek= github.com/milvus-io/pulsar-client-go v0.6.10 h1:eqpJjU+/QX0iIhEo3nhOqMNXL+TyInAs1IAHZCrCM/A= github.com/milvus-io/pulsar-client-go v0.6.10/go.mod h1:lQqCkgwDF8YFYjKA+zOheTk1tev2B+bKj5j7+nm8M1w= github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 h1:AMFGa4R4MiIpspGNG7Z948v4n35fFGB3RR3G/ry4FWs= diff --git a/internal/core/src/pb/common.pb.cc b/internal/core/src/pb/common.pb.cc index e994af71fbcfd..5579697fa742f 100644 --- a/internal/core/src/pb/common.pb.cc +++ b/internal/core/src/pb/common.pb.cc @@ -26,8 +26,10 @@ namespace common { PROTOBUF_CONSTEXPR Status::Status( ::_pbi::ConstantInitialized): _impl_{ /*decltype(_impl_.reason_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}} + , /*decltype(_impl_.detail_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}} , /*decltype(_impl_.error_code_)*/0 , /*decltype(_impl_.code_)*/0 + , /*decltype(_impl_.retriable_)*/false , /*decltype(_impl_._cached_size_)*/{}} {} struct StatusDefaultTypeInternal { PROTOBUF_CONSTEXPR StatusDefaultTypeInternal() @@ -297,6 +299,8 @@ const uint32_t TableStruct_common_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(p PROTOBUF_FIELD_OFFSET(::milvus::proto::common::Status, _impl_.error_code_), PROTOBUF_FIELD_OFFSET(::milvus::proto::common::Status, _impl_.reason_), PROTOBUF_FIELD_OFFSET(::milvus::proto::common::Status, _impl_.code_), + PROTOBUF_FIELD_OFFSET(::milvus::proto::common::Status, _impl_.retriable_), + PROTOBUF_FIELD_OFFSET(::milvus::proto::common::Status, _impl_.detail_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::milvus::proto::common::KeyValuePair, _internal_metadata_), ~0u, // no _extensions_ @@ -455,23 +459,23 @@ const uint32_t TableStruct_common_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(p }; static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { { 0, -1, -1, sizeof(::milvus::proto::common::Status)}, - { 9, -1, -1, sizeof(::milvus::proto::common::KeyValuePair)}, - { 17, -1, -1, sizeof(::milvus::proto::common::KeyDataPair)}, - { 25, -1, -1, sizeof(::milvus::proto::common::Blob)}, - { 32, -1, -1, sizeof(::milvus::proto::common::PlaceholderValue)}, - { 41, -1, -1, sizeof(::milvus::proto::common::PlaceholderGroup)}, - { 48, -1, -1, sizeof(::milvus::proto::common::Address)}, - { 56, 64, -1, sizeof(::milvus::proto::common::MsgBase_PropertiesEntry_DoNotUse)}, - { 66, -1, -1, sizeof(::milvus::proto::common::MsgBase)}, - { 79, -1, -1, sizeof(::milvus::proto::common::ReplicateInfo)}, - { 87, -1, -1, sizeof(::milvus::proto::common::MsgHeader)}, - { 94, -1, -1, sizeof(::milvus::proto::common::DMLMsgHeader)}, - { 102, -1, -1, sizeof(::milvus::proto::common::PrivilegeExt)}, - { 112, -1, -1, sizeof(::milvus::proto::common::SegmentStats)}, - { 120, 128, -1, sizeof(::milvus::proto::common::ClientInfo_ReservedEntry_DoNotUse)}, - { 130, -1, -1, sizeof(::milvus::proto::common::ClientInfo)}, - { 142, 150, -1, sizeof(::milvus::proto::common::ServerInfo_ReservedEntry_DoNotUse)}, - { 152, -1, -1, sizeof(::milvus::proto::common::ServerInfo)}, + { 11, -1, -1, sizeof(::milvus::proto::common::KeyValuePair)}, + { 19, -1, -1, sizeof(::milvus::proto::common::KeyDataPair)}, + { 27, -1, -1, sizeof(::milvus::proto::common::Blob)}, + { 34, -1, -1, sizeof(::milvus::proto::common::PlaceholderValue)}, + { 43, -1, -1, sizeof(::milvus::proto::common::PlaceholderGroup)}, + { 50, -1, -1, sizeof(::milvus::proto::common::Address)}, + { 58, 66, -1, sizeof(::milvus::proto::common::MsgBase_PropertiesEntry_DoNotUse)}, + { 68, -1, -1, sizeof(::milvus::proto::common::MsgBase)}, + { 81, -1, -1, sizeof(::milvus::proto::common::ReplicateInfo)}, + { 89, -1, -1, sizeof(::milvus::proto::common::MsgHeader)}, + { 96, -1, -1, sizeof(::milvus::proto::common::DMLMsgHeader)}, + { 104, -1, -1, sizeof(::milvus::proto::common::PrivilegeExt)}, + { 114, -1, -1, sizeof(::milvus::proto::common::SegmentStats)}, + { 122, 130, -1, sizeof(::milvus::proto::common::ClientInfo_ReservedEntry_DoNotUse)}, + { 132, -1, -1, sizeof(::milvus::proto::common::ClientInfo)}, + { 144, 152, -1, sizeof(::milvus::proto::common::ServerInfo_ReservedEntry_DoNotUse)}, + { 154, -1, -1, sizeof(::milvus::proto::common::ServerInfo)}, }; static const ::_pb::Message* const file_default_instances[] = { @@ -497,10 +501,11 @@ static const ::_pb::Message* const file_default_instances[] = { const char descriptor_table_protodef_common_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = "\n\014common.proto\022\023milvus.proto.common\032 goo" - "gle/protobuf/descriptor.proto\"Z\n\006Status\022" - "2\n\nerror_code\030\001 \001(\0162\036.milvus.proto.commo" - "n.ErrorCode\022\016\n\006reason\030\002 \001(\t\022\014\n\004code\030\003 \001(" - "\005\"*\n\014KeyValuePair\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030" + "gle/protobuf/descriptor.proto\"\201\001\n\006Status" + "\0226\n\nerror_code\030\001 \001(\0162\036.milvus.proto.comm" + "on.ErrorCodeB\002\030\001\022\016\n\006reason\030\002 \001(\t\022\014\n\004code" + "\030\003 \001(\005\022\021\n\tretriable\030\004 \001(\010\022\016\n\006detail\030\005 \001(" + "\t\"*\n\014KeyValuePair\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030" "\002 \001(\t\"(\n\013KeyDataPair\022\013\n\003key\030\001 \001(\t\022\014\n\004dat" "a\030\002 \001(\014\"\025\n\004Blob\022\r\n\005value\030\001 \001(\014\"c\n\020Placeh" "olderValue\022\013\n\003tag\030\001 \001(\t\0222\n\004type\030\002 \001(\0162$." @@ -538,7 +543,7 @@ const char descriptor_table_protodef_common_2eproto[] PROTOBUF_SECTION_VARIABLE( "\005 \001(\t\022\?\n\010reserved\030\006 \003(\0132-.milvus.proto.c" "ommon.ServerInfo.ReservedEntry\032/\n\rReserv" "edEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001*" - "\303\n\n\tErrorCode\022\013\n\007Success\020\000\022\023\n\017Unexpected" + "\307\n\n\tErrorCode\022\013\n\007Success\020\000\022\023\n\017Unexpected" "Error\020\001\022\021\n\rConnectFailed\020\002\022\024\n\020Permission" "Denied\020\003\022\027\n\023CollectionNotExists\020\004\022\023\n\017Ill" "egalArgument\020\005\022\024\n\020IllegalDimension\020\007\022\024\n\020" @@ -571,122 +576,126 @@ const char descriptor_table_protodef_common_2eproto[] PROTOBUF_SECTION_VARIABLE( "yQuotaExhausted\0205\022\026\n\022DiskQuotaExhausted\020" "6\022\025\n\021TimeTickLongDelay\0207\022\021\n\rNotReadyServ" "e\0208\022\033\n\027NotReadyCoordActivating\0209\022\017\n\013Data" - "CoordNA\020d\022\022\n\rDDRequestRace\020\350\007*c\n\nIndexSt" - "ate\022\022\n\016IndexStateNone\020\000\022\014\n\010Unissued\020\001\022\016\n" - "\nInProgress\020\002\022\014\n\010Finished\020\003\022\n\n\006Failed\020\004\022" - "\t\n\005Retry\020\005*\202\001\n\014SegmentState\022\024\n\020SegmentSt" - "ateNone\020\000\022\014\n\010NotExist\020\001\022\013\n\007Growing\020\002\022\n\n\006" - "Sealed\020\003\022\013\n\007Flushed\020\004\022\014\n\010Flushing\020\005\022\013\n\007D" - "ropped\020\006\022\r\n\tImporting\020\007*i\n\017PlaceholderTy" - "pe\022\010\n\004None\020\000\022\020\n\014BinaryVector\020d\022\017\n\013FloatV" - "ector\020e\022\021\n\rFloat16Vector\020f\022\t\n\005Int64\020\005\022\013\n" - "\007VarChar\020\025*\264\020\n\007MsgType\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\017ShowCollections\020h\022\024\n\020GetSystemConf" - "igs\020i\022\022\n\016LoadCollection\020j\022\025\n\021ReleaseColl" - "ection\020k\022\017\n\013CreateAlias\020l\022\r\n\tDropAlias\020m" - "\022\016\n\nAlterAlias\020n\022\023\n\017AlterCollection\020o\022\024\n" - "\020RenameCollection\020p\022\021\n\rDescribeAlias\020q\022\017" - "\n\013ListAliases\020r\022\024\n\017CreatePartition\020\310\001\022\022\n" - "\rDropPartition\020\311\001\022\021\n\014HasPartition\020\312\001\022\026\n\021" - "DescribePartition\020\313\001\022\023\n\016ShowPartitions\020\314" - "\001\022\023\n\016LoadPartitions\020\315\001\022\026\n\021ReleasePartiti" - "ons\020\316\001\022\021\n\014ShowSegments\020\372\001\022\024\n\017DescribeSeg" - "ment\020\373\001\022\021\n\014LoadSegments\020\374\001\022\024\n\017ReleaseSeg" - "ments\020\375\001\022\024\n\017HandoffSegments\020\376\001\022\030\n\023LoadBa" - "lanceSegments\020\377\001\022\025\n\020DescribeSegments\020\200\002\022" - "\034\n\027FederListIndexedSegment\020\201\002\022\"\n\035FederDe" - "scribeSegmentIndexData\020\202\002\022\020\n\013CreateIndex" - "\020\254\002\022\022\n\rDescribeIndex\020\255\002\022\016\n\tDropIndex\020\256\002\022" - "\027\n\022GetIndexStatistics\020\257\002\022\013\n\006Insert\020\220\003\022\013\n" - "\006Delete\020\221\003\022\n\n\005Flush\020\222\003\022\027\n\022ResendSegmentS" - "tats\020\223\003\022\013\n\006Upsert\020\224\003\022\013\n\006Search\020\364\003\022\021\n\014Sea" - "rchResult\020\365\003\022\022\n\rGetIndexState\020\366\003\022\032\n\025GetI" - "ndexBuildProgress\020\367\003\022\034\n\027GetCollectionSta" - "tistics\020\370\003\022\033\n\026GetPartitionStatistics\020\371\003\022" - "\r\n\010Retrieve\020\372\003\022\023\n\016RetrieveResult\020\373\003\022\024\n\017W" - "atchDmChannels\020\374\003\022\025\n\020RemoveDmChannels\020\375\003" - "\022\027\n\022WatchQueryChannels\020\376\003\022\030\n\023RemoveQuery" - "Channels\020\377\003\022\035\n\030SealedSegmentsChangeInfo\020" - "\200\004\022\027\n\022WatchDeltaChannels\020\201\004\022\024\n\017GetShardL" - "eaders\020\202\004\022\020\n\013GetReplicas\020\203\004\022\023\n\016UnsubDmCh" - "annel\020\204\004\022\024\n\017GetDistribution\020\205\004\022\025\n\020SyncDi" - "stribution\020\206\004\022\020\n\013SegmentInfo\020\330\004\022\017\n\nSyste" - "mInfo\020\331\004\022\024\n\017GetRecoveryInfo\020\332\004\022\024\n\017GetSeg" - "mentState\020\333\004\022\r\n\010TimeTick\020\260\t\022\023\n\016QueryNode" - "Stats\020\261\t\022\016\n\tLoadIndex\020\262\t\022\016\n\tRequestID\020\263\t" - "\022\017\n\nRequestTSO\020\264\t\022\024\n\017AllocateSegment\020\265\t\022" - "\026\n\021SegmentStatistics\020\266\t\022\025\n\020SegmentFlushD" - "one\020\267\t\022\017\n\nDataNodeTt\020\270\t\022\014\n\007Connect\020\271\t\022\024\n" - "\017ListClientInfos\020\272\t\022\023\n\016AllocTimestamp\020\273\t" - "\022\025\n\020CreateCredential\020\334\013\022\022\n\rGetCredential" - "\020\335\013\022\025\n\020DeleteCredential\020\336\013\022\025\n\020UpdateCred" - "ential\020\337\013\022\026\n\021ListCredUsernames\020\340\013\022\017\n\nCre" - "ateRole\020\300\014\022\r\n\010DropRole\020\301\014\022\024\n\017OperateUser" - "Role\020\302\014\022\017\n\nSelectRole\020\303\014\022\017\n\nSelectUser\020\304" - "\014\022\023\n\016SelectResource\020\305\014\022\025\n\020OperatePrivile" - "ge\020\306\014\022\020\n\013SelectGrant\020\307\014\022\033\n\026RefreshPolicy" - "InfoCache\020\310\014\022\017\n\nListPolicy\020\311\014\022\030\n\023CreateR" - "esourceGroup\020\244\r\022\026\n\021DropResourceGroup\020\245\r\022" - "\027\n\022ListResourceGroups\020\246\r\022\032\n\025DescribeReso" - "urceGroup\020\247\r\022\021\n\014TransferNode\020\250\r\022\024\n\017Trans" - "ferReplica\020\251\r\022\023\n\016CreateDatabase\020\211\016\022\021\n\014Dr" - "opDatabase\020\212\016\022\022\n\rListDatabases\020\213\016*\"\n\007Dsl" - "Type\022\007\n\003Dsl\020\000\022\016\n\nBoolExprV1\020\001*B\n\017Compact" - "ionState\022\021\n\rUndefiedState\020\000\022\r\n\tExecuting" - "\020\001\022\r\n\tCompleted\020\002*X\n\020ConsistencyLevel\022\n\n" - "\006Strong\020\000\022\013\n\007Session\020\001\022\013\n\007Bounded\020\002\022\016\n\nE" - "ventually\020\003\022\016\n\nCustomized\020\004*\236\001\n\013ImportSt" - "ate\022\021\n\rImportPending\020\000\022\020\n\014ImportFailed\020\001" - "\022\021\n\rImportStarted\020\002\022\023\n\017ImportPersisted\020\005" - "\022\021\n\rImportFlushed\020\010\022\023\n\017ImportCompleted\020\006" - "\022\032\n\026ImportFailedAndCleaned\020\007*2\n\nObjectTy" - "pe\022\016\n\nCollection\020\000\022\n\n\006Global\020\001\022\010\n\004User\020\002" - "*\241\010\n\017ObjectPrivilege\022\020\n\014PrivilegeAll\020\000\022\035" - "\n\031PrivilegeCreateCollection\020\001\022\033\n\027Privile" - "geDropCollection\020\002\022\037\n\033PrivilegeDescribeC" - "ollection\020\003\022\034\n\030PrivilegeShowCollections\020" - "\004\022\021\n\rPrivilegeLoad\020\005\022\024\n\020PrivilegeRelease" - "\020\006\022\027\n\023PrivilegeCompaction\020\007\022\023\n\017Privilege" - "Insert\020\010\022\023\n\017PrivilegeDelete\020\t\022\032\n\026Privile" - "geGetStatistics\020\n\022\030\n\024PrivilegeCreateInde" - "x\020\013\022\030\n\024PrivilegeIndexDetail\020\014\022\026\n\022Privile" - "geDropIndex\020\r\022\023\n\017PrivilegeSearch\020\016\022\022\n\016Pr" - "ivilegeFlush\020\017\022\022\n\016PrivilegeQuery\020\020\022\030\n\024Pr" - "ivilegeLoadBalance\020\021\022\023\n\017PrivilegeImport\020" - "\022\022\034\n\030PrivilegeCreateOwnership\020\023\022\027\n\023Privi" - "legeUpdateUser\020\024\022\032\n\026PrivilegeDropOwnersh" - "ip\020\025\022\034\n\030PrivilegeSelectOwnership\020\026\022\034\n\030Pr" - "ivilegeManageOwnership\020\027\022\027\n\023PrivilegeSel" - "ectUser\020\030\022\023\n\017PrivilegeUpsert\020\031\022 \n\034Privil" - "egeCreateResourceGroup\020\032\022\036\n\032PrivilegeDro" - "pResourceGroup\020\033\022\"\n\036PrivilegeDescribeRes" - "ourceGroup\020\034\022\037\n\033PrivilegeListResourceGro" - "ups\020\035\022\031\n\025PrivilegeTransferNode\020\036\022\034\n\030Priv" - "ilegeTransferReplica\020\037\022\037\n\033PrivilegeGetLo" - "adingProgress\020 \022\031\n\025PrivilegeGetLoadState" - "\020!\022\035\n\031PrivilegeRenameCollection\020\"\022\033\n\027Pri" - "vilegeCreateDatabase\020#\022\031\n\025PrivilegeDropD" - "atabase\020$\022\032\n\026PrivilegeListDatabases\020%\022\025\n" - "\021PrivilegeFlushAll\020&*S\n\tStateCode\022\020\n\014Ini" - "tializing\020\000\022\013\n\007Healthy\020\001\022\014\n\010Abnormal\020\002\022\013" - "\n\007StandBy\020\003\022\014\n\010Stopping\020\004*c\n\tLoadState\022\025" - "\n\021LoadStateNotExist\020\000\022\024\n\020LoadStateNotLoa" - "d\020\001\022\024\n\020LoadStateLoading\020\002\022\023\n\017LoadStateLo" - "aded\020\003:^\n\021privilege_ext_obj\022\037.google.pro" - "tobuf.MessageOptions\030\351\007 \001(\0132!.milvus.pro" - "to.common.PrivilegeExtBm\n\016io.milvus.grpc" - "B\013CommonProtoP\001Z4github.com/milvus-io/mi" - "lvus-proto/go-api/v2/commonpb\240\001\001\252\002\022Milvu" - "s.Client.Grpcb\006proto3" + "CoordNA\020d\022\022\n\rDDRequestRace\020\350\007\032\002\030\001*c\n\nInd" + "exState\022\022\n\016IndexStateNone\020\000\022\014\n\010Unissued\020" + "\001\022\016\n\nInProgress\020\002\022\014\n\010Finished\020\003\022\n\n\006Faile" + "d\020\004\022\t\n\005Retry\020\005*\202\001\n\014SegmentState\022\024\n\020Segme" + "ntStateNone\020\000\022\014\n\010NotExist\020\001\022\013\n\007Growing\020\002" + "\022\n\n\006Sealed\020\003\022\013\n\007Flushed\020\004\022\014\n\010Flushing\020\005\022" + "\013\n\007Dropped\020\006\022\r\n\tImporting\020\007*}\n\017Placehold" + "erType\022\010\n\004None\020\000\022\020\n\014BinaryVector\020d\022\017\n\013Fl" + "oatVector\020e\022\021\n\rFloat16Vector\020f\022\022\n\016BFloat" + "16Vector\020g\022\t\n\005Int64\020\005\022\013\n\007VarChar\020\025*\264\020\n\007M" + "sgType\022\r\n\tUndefined\020\000\022\024\n\020CreateCollectio" + "n\020d\022\022\n\016DropCollection\020e\022\021\n\rHasCollection" + "\020f\022\026\n\022DescribeCollection\020g\022\023\n\017ShowCollec" + "tions\020h\022\024\n\020GetSystemConfigs\020i\022\022\n\016LoadCol" + "lection\020j\022\025\n\021ReleaseCollection\020k\022\017\n\013Crea" + "teAlias\020l\022\r\n\tDropAlias\020m\022\016\n\nAlterAlias\020n" + "\022\023\n\017AlterCollection\020o\022\024\n\020RenameCollectio" + "n\020p\022\021\n\rDescribeAlias\020q\022\017\n\013ListAliases\020r\022" + "\024\n\017CreatePartition\020\310\001\022\022\n\rDropPartition\020\311" + "\001\022\021\n\014HasPartition\020\312\001\022\026\n\021DescribePartitio" + "n\020\313\001\022\023\n\016ShowPartitions\020\314\001\022\023\n\016LoadPartiti" + "ons\020\315\001\022\026\n\021ReleasePartitions\020\316\001\022\021\n\014ShowSe" + "gments\020\372\001\022\024\n\017DescribeSegment\020\373\001\022\021\n\014LoadS" + "egments\020\374\001\022\024\n\017ReleaseSegments\020\375\001\022\024\n\017Hand" + "offSegments\020\376\001\022\030\n\023LoadBalanceSegments\020\377\001" + "\022\025\n\020DescribeSegments\020\200\002\022\034\n\027FederListInde" + "xedSegment\020\201\002\022\"\n\035FederDescribeSegmentInd" + "exData\020\202\002\022\020\n\013CreateIndex\020\254\002\022\022\n\rDescribeI" + "ndex\020\255\002\022\016\n\tDropIndex\020\256\002\022\027\n\022GetIndexStati" + "stics\020\257\002\022\013\n\006Insert\020\220\003\022\013\n\006Delete\020\221\003\022\n\n\005Fl" + "ush\020\222\003\022\027\n\022ResendSegmentStats\020\223\003\022\013\n\006Upser" + "t\020\224\003\022\013\n\006Search\020\364\003\022\021\n\014SearchResult\020\365\003\022\022\n\r" + "GetIndexState\020\366\003\022\032\n\025GetIndexBuildProgres" + "s\020\367\003\022\034\n\027GetCollectionStatistics\020\370\003\022\033\n\026Ge" + "tPartitionStatistics\020\371\003\022\r\n\010Retrieve\020\372\003\022\023" + "\n\016RetrieveResult\020\373\003\022\024\n\017WatchDmChannels\020\374" + "\003\022\025\n\020RemoveDmChannels\020\375\003\022\027\n\022WatchQueryCh" + "annels\020\376\003\022\030\n\023RemoveQueryChannels\020\377\003\022\035\n\030S" + "ealedSegmentsChangeInfo\020\200\004\022\027\n\022WatchDelta" + "Channels\020\201\004\022\024\n\017GetShardLeaders\020\202\004\022\020\n\013Get" + "Replicas\020\203\004\022\023\n\016UnsubDmChannel\020\204\004\022\024\n\017GetD" + "istribution\020\205\004\022\025\n\020SyncDistribution\020\206\004\022\020\n" + "\013SegmentInfo\020\330\004\022\017\n\nSystemInfo\020\331\004\022\024\n\017GetR" + "ecoveryInfo\020\332\004\022\024\n\017GetSegmentState\020\333\004\022\r\n\010" + "TimeTick\020\260\t\022\023\n\016QueryNodeStats\020\261\t\022\016\n\tLoad" + "Index\020\262\t\022\016\n\tRequestID\020\263\t\022\017\n\nRequestTSO\020\264" + "\t\022\024\n\017AllocateSegment\020\265\t\022\026\n\021SegmentStatis" + "tics\020\266\t\022\025\n\020SegmentFlushDone\020\267\t\022\017\n\nDataNo" + "deTt\020\270\t\022\014\n\007Connect\020\271\t\022\024\n\017ListClientInfos" + "\020\272\t\022\023\n\016AllocTimestamp\020\273\t\022\025\n\020CreateCreden" + "tial\020\334\013\022\022\n\rGetCredential\020\335\013\022\025\n\020DeleteCre" + "dential\020\336\013\022\025\n\020UpdateCredential\020\337\013\022\026\n\021Lis" + "tCredUsernames\020\340\013\022\017\n\nCreateRole\020\300\014\022\r\n\010Dr" + "opRole\020\301\014\022\024\n\017OperateUserRole\020\302\014\022\017\n\nSelec" + "tRole\020\303\014\022\017\n\nSelectUser\020\304\014\022\023\n\016SelectResou" + "rce\020\305\014\022\025\n\020OperatePrivilege\020\306\014\022\020\n\013SelectG" + "rant\020\307\014\022\033\n\026RefreshPolicyInfoCache\020\310\014\022\017\n\n" + "ListPolicy\020\311\014\022\030\n\023CreateResourceGroup\020\244\r\022" + "\026\n\021DropResourceGroup\020\245\r\022\027\n\022ListResourceG" + "roups\020\246\r\022\032\n\025DescribeResourceGroup\020\247\r\022\021\n\014" + "TransferNode\020\250\r\022\024\n\017TransferReplica\020\251\r\022\023\n" + "\016CreateDatabase\020\211\016\022\021\n\014DropDatabase\020\212\016\022\022\n" + "\rListDatabases\020\213\016*\"\n\007DslType\022\007\n\003Dsl\020\000\022\016\n" + "\nBoolExprV1\020\001*B\n\017CompactionState\022\021\n\rUnde" + "fiedState\020\000\022\r\n\tExecuting\020\001\022\r\n\tCompleted\020" + "\002*X\n\020ConsistencyLevel\022\n\n\006Strong\020\000\022\013\n\007Ses" + "sion\020\001\022\013\n\007Bounded\020\002\022\016\n\nEventually\020\003\022\016\n\nC" + "ustomized\020\004*\236\001\n\013ImportState\022\021\n\rImportPen" + "ding\020\000\022\020\n\014ImportFailed\020\001\022\021\n\rImportStarte" + "d\020\002\022\023\n\017ImportPersisted\020\005\022\021\n\rImportFlushe" + "d\020\010\022\023\n\017ImportCompleted\020\006\022\032\n\026ImportFailed" + "AndCleaned\020\007*2\n\nObjectType\022\016\n\nCollection" + "\020\000\022\n\n\006Global\020\001\022\010\n\004User\020\002*\257\t\n\017ObjectPrivi" + "lege\022\020\n\014PrivilegeAll\020\000\022\035\n\031PrivilegeCreat" + "eCollection\020\001\022\033\n\027PrivilegeDropCollection" + "\020\002\022\037\n\033PrivilegeDescribeCollection\020\003\022\034\n\030P" + "rivilegeShowCollections\020\004\022\021\n\rPrivilegeLo" + "ad\020\005\022\024\n\020PrivilegeRelease\020\006\022\027\n\023PrivilegeC" + "ompaction\020\007\022\023\n\017PrivilegeInsert\020\010\022\023\n\017Priv" + "ilegeDelete\020\t\022\032\n\026PrivilegeGetStatistics\020" + "\n\022\030\n\024PrivilegeCreateIndex\020\013\022\030\n\024Privilege" + "IndexDetail\020\014\022\026\n\022PrivilegeDropIndex\020\r\022\023\n" + "\017PrivilegeSearch\020\016\022\022\n\016PrivilegeFlush\020\017\022\022" + "\n\016PrivilegeQuery\020\020\022\030\n\024PrivilegeLoadBalan" + "ce\020\021\022\023\n\017PrivilegeImport\020\022\022\034\n\030PrivilegeCr" + "eateOwnership\020\023\022\027\n\023PrivilegeUpdateUser\020\024" + "\022\032\n\026PrivilegeDropOwnership\020\025\022\034\n\030Privileg" + "eSelectOwnership\020\026\022\034\n\030PrivilegeManageOwn" + "ership\020\027\022\027\n\023PrivilegeSelectUser\020\030\022\023\n\017Pri" + "vilegeUpsert\020\031\022 \n\034PrivilegeCreateResourc" + "eGroup\020\032\022\036\n\032PrivilegeDropResourceGroup\020\033" + "\022\"\n\036PrivilegeDescribeResourceGroup\020\034\022\037\n\033" + "PrivilegeListResourceGroups\020\035\022\031\n\025Privile" + "geTransferNode\020\036\022\034\n\030PrivilegeTransferRep" + "lica\020\037\022\037\n\033PrivilegeGetLoadingProgress\020 \022" + "\031\n\025PrivilegeGetLoadState\020!\022\035\n\031PrivilegeR" + "enameCollection\020\"\022\033\n\027PrivilegeCreateData" + "base\020#\022\031\n\025PrivilegeDropDatabase\020$\022\032\n\026Pri" + "vilegeListDatabases\020%\022\025\n\021PrivilegeFlushA" + "ll\020&\022\034\n\030PrivilegeCreatePartition\020\'\022\032\n\026Pr" + "ivilegeDropPartition\020(\022\033\n\027PrivilegeShowP" + "artitions\020)\022\031\n\025PrivilegeHasPartition\020*\022\032" + "\n\026PrivilegeGetFlushState\020+*S\n\tStateCode\022" + "\020\n\014Initializing\020\000\022\013\n\007Healthy\020\001\022\014\n\010Abnorm" + "al\020\002\022\013\n\007StandBy\020\003\022\014\n\010Stopping\020\004*c\n\tLoadS" + "tate\022\025\n\021LoadStateNotExist\020\000\022\024\n\020LoadState" + "NotLoad\020\001\022\024\n\020LoadStateLoading\020\002\022\023\n\017LoadS" + "tateLoaded\020\003:^\n\021privilege_ext_obj\022\037.goog" + "le.protobuf.MessageOptions\030\351\007 \001(\0132!.milv" + "us.proto.common.PrivilegeExtBm\n\016io.milvu" + "s.grpcB\013CommonProtoP\001Z4github.com/milvus" + "-io/milvus-proto/go-api/v2/commonpb\240\001\001\252\002" + "\022Milvus.Client.Grpcb\006proto3" ; static const ::_pbi::DescriptorTable* const descriptor_table_common_2eproto_deps[1] = { &::descriptor_table_google_2fprotobuf_2fdescriptor_2eproto, }; static ::_pbi::once_flag descriptor_table_common_2eproto_once; const ::_pbi::DescriptorTable descriptor_table_common_2eproto = { - false, false, 7341, descriptor_table_protodef_common_2eproto, + false, false, 7547, descriptor_table_protodef_common_2eproto, "common.proto", &descriptor_table_common_2eproto_once, descriptor_table_common_2eproto_deps, 1, 18, schemas, file_default_instances, TableStruct_common_2eproto::offsets, @@ -823,6 +832,7 @@ bool PlaceholderType_IsValid(int value) { case 100: case 101: case 102: + case 103: return true; default: return false; @@ -1066,6 +1076,11 @@ bool ObjectPrivilege_IsValid(int value) { case 36: case 37: case 38: + case 39: + case 40: + case 41: + case 42: + case 43: return true; default: return false; @@ -1123,8 +1138,10 @@ Status::Status(const Status& from) Status* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.reason_){} + , decltype(_impl_.detail_){} , decltype(_impl_.error_code_){} , decltype(_impl_.code_){} + , decltype(_impl_.retriable_){} , /*decltype(_impl_._cached_size_)*/{}}; _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); @@ -1136,9 +1153,17 @@ Status::Status(const Status& from) _this->_impl_.reason_.Set(from._internal_reason(), _this->GetArenaForAllocation()); } + _impl_.detail_.InitDefault(); + #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + _impl_.detail_.Set("", GetArenaForAllocation()); + #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (!from._internal_detail().empty()) { + _this->_impl_.detail_.Set(from._internal_detail(), + _this->GetArenaForAllocation()); + } ::memcpy(&_impl_.error_code_, &from._impl_.error_code_, - static_cast(reinterpret_cast(&_impl_.code_) - - reinterpret_cast(&_impl_.error_code_)) + sizeof(_impl_.code_)); + static_cast(reinterpret_cast(&_impl_.retriable_) - + reinterpret_cast(&_impl_.error_code_)) + sizeof(_impl_.retriable_)); // @@protoc_insertion_point(copy_constructor:milvus.proto.common.Status) } @@ -1148,14 +1173,20 @@ inline void Status::SharedCtor( (void)is_message_owned; new (&_impl_) Impl_{ decltype(_impl_.reason_){} + , decltype(_impl_.detail_){} , decltype(_impl_.error_code_){0} , decltype(_impl_.code_){0} + , decltype(_impl_.retriable_){false} , /*decltype(_impl_._cached_size_)*/{} }; _impl_.reason_.InitDefault(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING _impl_.reason_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + _impl_.detail_.InitDefault(); + #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + _impl_.detail_.Set("", GetArenaForAllocation()); + #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING } Status::~Status() { @@ -1170,6 +1201,7 @@ Status::~Status() { inline void Status::SharedDtor() { GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); _impl_.reason_.Destroy(); + _impl_.detail_.Destroy(); } void Status::SetCachedSize(int size) const { @@ -1183,9 +1215,10 @@ void Status::Clear() { (void) cached_has_bits; _impl_.reason_.ClearToEmpty(); + _impl_.detail_.ClearToEmpty(); ::memset(&_impl_.error_code_, 0, static_cast( - reinterpret_cast(&_impl_.code_) - - reinterpret_cast(&_impl_.error_code_)) + sizeof(_impl_.code_)); + reinterpret_cast(&_impl_.retriable_) - + reinterpret_cast(&_impl_.error_code_)) + sizeof(_impl_.retriable_)); _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } @@ -1195,7 +1228,7 @@ const char* Status::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { uint32_t tag; ptr = ::_pbi::ReadTag(ptr, &tag); switch (tag >> 3) { - // .milvus.proto.common.ErrorCode error_code = 1; + // .milvus.proto.common.ErrorCode error_code = 1 [deprecated = true]; case 1: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); @@ -1222,6 +1255,24 @@ const char* Status::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { } else goto handle_unusual; continue; + // bool retriable = 4; + case 4: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 32)) { + _impl_.retriable_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + CHK_(ptr); + } else + goto handle_unusual; + continue; + // string detail = 5; + case 5: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 42)) { + auto str = _internal_mutable_detail(); + ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); + CHK_(ptr); + CHK_(::_pbi::VerifyUTF8(str, "milvus.proto.common.Status.detail")); + } else + goto handle_unusual; + continue; default: goto handle_unusual; } // switch @@ -1251,7 +1302,7 @@ uint8_t* Status::_InternalSerialize( uint32_t cached_has_bits = 0; (void) cached_has_bits; - // .milvus.proto.common.ErrorCode error_code = 1; + // .milvus.proto.common.ErrorCode error_code = 1 [deprecated = true]; if (this->_internal_error_code() != 0) { target = stream->EnsureSpace(target); target = ::_pbi::WireFormatLite::WriteEnumToArray( @@ -1274,6 +1325,22 @@ uint8_t* Status::_InternalSerialize( target = ::_pbi::WireFormatLite::WriteInt32ToArray(3, this->_internal_code(), target); } + // bool retriable = 4; + if (this->_internal_retriable() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteBoolToArray(4, this->_internal_retriable(), target); + } + + // string detail = 5; + if (!this->_internal_detail().empty()) { + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->_internal_detail().data(), static_cast(this->_internal_detail().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, + "milvus.proto.common.Status.detail"); + target = stream->WriteStringMaybeAliased( + 5, this->_internal_detail(), target); + } + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); @@ -1297,7 +1364,14 @@ size_t Status::ByteSizeLong() const { this->_internal_reason()); } - // .milvus.proto.common.ErrorCode error_code = 1; + // string detail = 5; + if (!this->_internal_detail().empty()) { + total_size += 1 + + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + this->_internal_detail()); + } + + // .milvus.proto.common.ErrorCode error_code = 1 [deprecated = true]; if (this->_internal_error_code() != 0) { total_size += 1 + ::_pbi::WireFormatLite::EnumSize(this->_internal_error_code()); @@ -1308,6 +1382,11 @@ size_t Status::ByteSizeLong() const { total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_code()); } + // bool retriable = 4; + if (this->_internal_retriable() != 0) { + total_size += 1 + 1; + } + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } @@ -1329,12 +1408,18 @@ void Status::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBU if (!from._internal_reason().empty()) { _this->_internal_set_reason(from._internal_reason()); } + if (!from._internal_detail().empty()) { + _this->_internal_set_detail(from._internal_detail()); + } if (from._internal_error_code() != 0) { _this->_internal_set_error_code(from._internal_error_code()); } if (from._internal_code() != 0) { _this->_internal_set_code(from._internal_code()); } + if (from._internal_retriable() != 0) { + _this->_internal_set_retriable(from._internal_retriable()); + } _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } @@ -1358,9 +1443,13 @@ void Status::InternalSwap(Status* other) { &_impl_.reason_, lhs_arena, &other->_impl_.reason_, rhs_arena ); + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap( + &_impl_.detail_, lhs_arena, + &other->_impl_.detail_, rhs_arena + ); ::PROTOBUF_NAMESPACE_ID::internal::memswap< - PROTOBUF_FIELD_OFFSET(Status, _impl_.code_) - + sizeof(Status::_impl_.code_) + PROTOBUF_FIELD_OFFSET(Status, _impl_.retriable_) + + sizeof(Status::_impl_.retriable_) - PROTOBUF_FIELD_OFFSET(Status, _impl_.error_code_)>( reinterpret_cast(&_impl_.error_code_), reinterpret_cast(&other->_impl_.error_code_)); diff --git a/internal/core/src/pb/common.pb.h b/internal/core/src/pb/common.pb.h index 690bcf51a8afd..d08be127e94bb 100644 --- a/internal/core/src/pb/common.pb.h +++ b/internal/core/src/pb/common.pb.h @@ -280,6 +280,7 @@ enum PlaceholderType : int { BinaryVector = 100, FloatVector = 101, Float16Vector = 102, + BFloat16Vector = 103, Int64 = 5, VarChar = 21, PlaceholderType_INT_MIN_SENTINEL_DO_NOT_USE_ = std::numeric_limits::min(), @@ -287,7 +288,7 @@ enum PlaceholderType : int { }; bool PlaceholderType_IsValid(int value); constexpr PlaceholderType PlaceholderType_MIN = None; -constexpr PlaceholderType PlaceholderType_MAX = Float16Vector; +constexpr PlaceholderType PlaceholderType_MAX = BFloat16Vector; constexpr int PlaceholderType_ARRAYSIZE = PlaceholderType_MAX + 1; const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* PlaceholderType_descriptor(); @@ -602,12 +603,17 @@ enum ObjectPrivilege : int { PrivilegeDropDatabase = 36, PrivilegeListDatabases = 37, PrivilegeFlushAll = 38, + PrivilegeCreatePartition = 39, + PrivilegeDropPartition = 40, + PrivilegeShowPartitions = 41, + PrivilegeHasPartition = 42, + PrivilegeGetFlushState = 43, ObjectPrivilege_INT_MIN_SENTINEL_DO_NOT_USE_ = std::numeric_limits::min(), ObjectPrivilege_INT_MAX_SENTINEL_DO_NOT_USE_ = std::numeric_limits::max() }; bool ObjectPrivilege_IsValid(int value); constexpr ObjectPrivilege ObjectPrivilege_MIN = PrivilegeAll; -constexpr ObjectPrivilege ObjectPrivilege_MAX = PrivilegeFlushAll; +constexpr ObjectPrivilege ObjectPrivilege_MAX = PrivilegeGetFlushState; constexpr int ObjectPrivilege_ARRAYSIZE = ObjectPrivilege_MAX + 1; const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* ObjectPrivilege_descriptor(); @@ -803,8 +809,10 @@ class Status final : enum : int { kReasonFieldNumber = 2, + kDetailFieldNumber = 5, kErrorCodeFieldNumber = 1, kCodeFieldNumber = 3, + kRetriableFieldNumber = 4, }; // string reason = 2; void clear_reason(); @@ -820,10 +828,24 @@ class Status final : std::string* _internal_mutable_reason(); public: - // .milvus.proto.common.ErrorCode error_code = 1; - void clear_error_code(); - ::milvus::proto::common::ErrorCode error_code() const; - void set_error_code(::milvus::proto::common::ErrorCode value); + // string detail = 5; + void clear_detail(); + const std::string& detail() const; + template + void set_detail(ArgT0&& arg0, ArgT... args); + std::string* mutable_detail(); + PROTOBUF_NODISCARD std::string* release_detail(); + void set_allocated_detail(std::string* detail); + private: + const std::string& _internal_detail() const; + inline PROTOBUF_ALWAYS_INLINE void _internal_set_detail(const std::string& value); + std::string* _internal_mutable_detail(); + public: + + // .milvus.proto.common.ErrorCode error_code = 1 [deprecated = true]; + PROTOBUF_DEPRECATED void clear_error_code(); + PROTOBUF_DEPRECATED ::milvus::proto::common::ErrorCode error_code() const; + PROTOBUF_DEPRECATED void set_error_code(::milvus::proto::common::ErrorCode value); private: ::milvus::proto::common::ErrorCode _internal_error_code() const; void _internal_set_error_code(::milvus::proto::common::ErrorCode value); @@ -838,6 +860,15 @@ class Status final : void _internal_set_code(int32_t value); public: + // bool retriable = 4; + void clear_retriable(); + bool retriable() const; + void set_retriable(bool value); + private: + bool _internal_retriable() const; + void _internal_set_retriable(bool value); + public: + // @@protoc_insertion_point(class_scope:milvus.proto.common.Status) private: class _Internal; @@ -847,8 +878,10 @@ class Status final : typedef void DestructorSkippable_; struct Impl_ { ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr reason_; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr detail_; int error_code_; int32_t code_; + bool retriable_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; }; union { Impl_ _impl_; }; @@ -3508,7 +3541,7 @@ extern ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier< ::PROTOBUF_NAMESP #endif // __GNUC__ // Status -// .milvus.proto.common.ErrorCode error_code = 1; +// .milvus.proto.common.ErrorCode error_code = 1 [deprecated = true]; inline void Status::clear_error_code() { _impl_.error_code_ = 0; } @@ -3598,6 +3631,76 @@ inline void Status::set_code(int32_t value) { // @@protoc_insertion_point(field_set:milvus.proto.common.Status.code) } +// bool retriable = 4; +inline void Status::clear_retriable() { + _impl_.retriable_ = false; +} +inline bool Status::_internal_retriable() const { + return _impl_.retriable_; +} +inline bool Status::retriable() const { + // @@protoc_insertion_point(field_get:milvus.proto.common.Status.retriable) + return _internal_retriable(); +} +inline void Status::_internal_set_retriable(bool value) { + + _impl_.retriable_ = value; +} +inline void Status::set_retriable(bool value) { + _internal_set_retriable(value); + // @@protoc_insertion_point(field_set:milvus.proto.common.Status.retriable) +} + +// string detail = 5; +inline void Status::clear_detail() { + _impl_.detail_.ClearToEmpty(); +} +inline const std::string& Status::detail() const { + // @@protoc_insertion_point(field_get:milvus.proto.common.Status.detail) + return _internal_detail(); +} +template +inline PROTOBUF_ALWAYS_INLINE +void Status::set_detail(ArgT0&& arg0, ArgT... args) { + + _impl_.detail_.Set(static_cast(arg0), args..., GetArenaForAllocation()); + // @@protoc_insertion_point(field_set:milvus.proto.common.Status.detail) +} +inline std::string* Status::mutable_detail() { + std::string* _s = _internal_mutable_detail(); + // @@protoc_insertion_point(field_mutable:milvus.proto.common.Status.detail) + return _s; +} +inline const std::string& Status::_internal_detail() const { + return _impl_.detail_.Get(); +} +inline void Status::_internal_set_detail(const std::string& value) { + + _impl_.detail_.Set(value, GetArenaForAllocation()); +} +inline std::string* Status::_internal_mutable_detail() { + + return _impl_.detail_.Mutable(GetArenaForAllocation()); +} +inline std::string* Status::release_detail() { + // @@protoc_insertion_point(field_release:milvus.proto.common.Status.detail) + return _impl_.detail_.Release(); +} +inline void Status::set_allocated_detail(std::string* detail) { + if (detail != nullptr) { + + } else { + + } + _impl_.detail_.SetAllocated(detail, GetArenaForAllocation()); +#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (_impl_.detail_.IsDefault()) { + _impl_.detail_.Set("", GetArenaForAllocation()); + } +#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + // @@protoc_insertion_point(field_set_allocated:milvus.proto.common.Status.detail) +} + // ------------------------------------------------------------------- // KeyValuePair diff --git a/internal/core/src/pb/schema.pb.cc b/internal/core/src/pb/schema.pb.cc index 3811d6188bcee..72e9df6dd26f4 100644 --- a/internal/core/src/pb/schema.pb.cc +++ b/internal/core/src/pb/schema.pb.cc @@ -268,6 +268,7 @@ PROTOBUF_CONSTEXPR SearchResultData::SearchResultData( , /*decltype(_impl_._topks_cached_byte_size_)*/{0} , /*decltype(_impl_.output_fields_)*/{} , /*decltype(_impl_.ids_)*/nullptr + , /*decltype(_impl_.group_by_field_value_)*/nullptr , /*decltype(_impl_.num_queries_)*/int64_t{0} , /*decltype(_impl_.top_k_)*/int64_t{0} , /*decltype(_impl_._cached_size_)*/{}} {} @@ -422,6 +423,7 @@ const uint32_t TableStruct_schema_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(p ::_pbi::kInvalidFieldOffsetTag, ::_pbi::kInvalidFieldOffsetTag, ::_pbi::kInvalidFieldOffsetTag, + ::_pbi::kInvalidFieldOffsetTag, PROTOBUF_FIELD_OFFSET(::milvus::proto::schema::VectorField, _impl_.data_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::milvus::proto::schema::FieldData, _internal_metadata_), @@ -458,6 +460,7 @@ const uint32_t TableStruct_schema_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(p PROTOBUF_FIELD_OFFSET(::milvus::proto::schema::SearchResultData, _impl_.ids_), PROTOBUF_FIELD_OFFSET(::milvus::proto::schema::SearchResultData, _impl_.topks_), PROTOBUF_FIELD_OFFSET(::milvus::proto::schema::SearchResultData, _impl_.output_fields_), + PROTOBUF_FIELD_OFFSET(::milvus::proto::schema::SearchResultData, _impl_.group_by_field_value_), }; static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { { 0, -1, -1, sizeof(::milvus::proto::schema::FieldSchema)}, @@ -474,9 +477,9 @@ static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protode { 94, -1, -1, sizeof(::milvus::proto::schema::ValueField)}, { 108, -1, -1, sizeof(::milvus::proto::schema::ScalarField)}, { 124, -1, -1, sizeof(::milvus::proto::schema::VectorField)}, - { 135, -1, -1, sizeof(::milvus::proto::schema::FieldData)}, - { 148, -1, -1, sizeof(::milvus::proto::schema::IDs)}, - { 157, -1, -1, sizeof(::milvus::proto::schema::SearchResultData)}, + { 136, -1, -1, sizeof(::milvus::proto::schema::FieldData)}, + { 149, -1, -1, sizeof(::milvus::proto::schema::IDs)}, + { 158, -1, -1, sizeof(::milvus::proto::schema::SearchResultData)}, }; static const ::_pb::Message* const file_default_instances[] = { @@ -501,85 +504,89 @@ static const ::_pb::Message* const file_default_instances[] = { const char descriptor_table_protodef_schema_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = "\n\014schema.proto\022\023milvus.proto.schema\032\014com" - "mon.proto\"\327\003\n\013FieldSchema\022\017\n\007fieldID\030\001 \001" - "(\003\022\014\n\004name\030\002 \001(\t\022\026\n\016is_primary_key\030\003 \001(\010" - "\022\023\n\013description\030\004 \001(\t\0220\n\tdata_type\030\005 \001(\016" - "2\035.milvus.proto.schema.DataType\0226\n\013type_" - "params\030\006 \003(\0132!.milvus.proto.common.KeyVa" - "luePair\0227\n\014index_params\030\007 \003(\0132!.milvus.p" - "roto.common.KeyValuePair\022\016\n\006autoID\030\010 \001(\010" - "\022.\n\005state\030\t \001(\0162\037.milvus.proto.schema.Fi" - "eldState\0223\n\014element_type\030\n \001(\0162\035.milvus." - "proto.schema.DataType\0226\n\rdefault_value\030\013" - " \001(\0132\037.milvus.proto.schema.ValueField\022\022\n" - "\nis_dynamic\030\014 \001(\010\022\030\n\020is_partition_key\030\r " - "\001(\010\"\225\001\n\020CollectionSchema\022\014\n\004name\030\001 \001(\t\022\023" - "\n\013description\030\002 \001(\t\022\016\n\006autoID\030\003 \001(\010\0220\n\006f" - "ields\030\004 \003(\0132 .milvus.proto.schema.FieldS" - "chema\022\034\n\024enable_dynamic_field\030\005 \001(\010\"\031\n\tB" - "oolArray\022\014\n\004data\030\001 \003(\010\"\030\n\010IntArray\022\014\n\004da" - "ta\030\001 \003(\005\"\031\n\tLongArray\022\014\n\004data\030\001 \003(\003\"\032\n\nF" - "loatArray\022\014\n\004data\030\001 \003(\002\"\033\n\013DoubleArray\022\014" - "\n\004data\030\001 \003(\001\"\032\n\nBytesArray\022\014\n\004data\030\001 \003(\014" - "\"\033\n\013StringArray\022\014\n\004data\030\001 \003(\t\"q\n\nArrayAr" - "ray\022.\n\004data\030\001 \003(\0132 .milvus.proto.schema." - "ScalarField\0223\n\014element_type\030\002 \001(\0162\035.milv" - "us.proto.schema.DataType\"\031\n\tJSONArray\022\014\n" - "\004data\030\001 \003(\014\"\254\001\n\nValueField\022\023\n\tbool_data\030" - "\001 \001(\010H\000\022\022\n\010int_data\030\002 \001(\005H\000\022\023\n\tlong_data" - "\030\003 \001(\003H\000\022\024\n\nfloat_data\030\004 \001(\002H\000\022\025\n\013double" - "_data\030\005 \001(\001H\000\022\025\n\013string_data\030\006 \001(\tH\000\022\024\n\n" - "bytes_data\030\007 \001(\014H\000B\006\n\004data\"\376\003\n\013ScalarFie" - "ld\0223\n\tbool_data\030\001 \001(\0132\036.milvus.proto.sch" - "ema.BoolArrayH\000\0221\n\010int_data\030\002 \001(\0132\035.milv" - "us.proto.schema.IntArrayH\000\0223\n\tlong_data\030" - "\003 \001(\0132\036.milvus.proto.schema.LongArrayH\000\022" - "5\n\nfloat_data\030\004 \001(\0132\037.milvus.proto.schem" - "a.FloatArrayH\000\0227\n\013double_data\030\005 \001(\0132 .mi" - "lvus.proto.schema.DoubleArrayH\000\0227\n\013strin" - "g_data\030\006 \001(\0132 .milvus.proto.schema.Strin" - "gArrayH\000\0225\n\nbytes_data\030\007 \001(\0132\037.milvus.pr" - "oto.schema.BytesArrayH\000\0225\n\narray_data\030\010 " - "\001(\0132\037.milvus.proto.schema.ArrayArrayH\000\0223" - "\n\tjson_data\030\t \001(\0132\036.milvus.proto.schema." - "JSONArrayH\000B\006\n\004data\"\216\001\n\013VectorField\022\013\n\003d" - "im\030\001 \001(\003\0227\n\014float_vector\030\002 \001(\0132\037.milvus." - "proto.schema.FloatArrayH\000\022\027\n\rbinary_vect" - "or\030\003 \001(\014H\000\022\030\n\016float16_vector\030\004 \001(\014H\000B\006\n\004" - "data\"\345\001\n\tFieldData\022+\n\004type\030\001 \001(\0162\035.milvu" - "s.proto.schema.DataType\022\022\n\nfield_name\030\002 " - "\001(\t\0223\n\007scalars\030\003 \001(\0132 .milvus.proto.sche" - "ma.ScalarFieldH\000\0223\n\007vectors\030\004 \001(\0132 .milv" - "us.proto.schema.VectorFieldH\000\022\020\n\010field_i" - "d\030\005 \001(\003\022\022\n\nis_dynamic\030\006 \001(\010B\007\n\005field\"w\n\003" - "IDs\0220\n\006int_id\030\001 \001(\0132\036.milvus.proto.schem" - "a.LongArrayH\000\0222\n\006str_id\030\002 \001(\0132 .milvus.p" - "roto.schema.StringArrayH\000B\n\n\010id_field\"\310\001" - "\n\020SearchResultData\022\023\n\013num_queries\030\001 \001(\003\022" - "\r\n\005top_k\030\002 \001(\003\0223\n\013fields_data\030\003 \003(\0132\036.mi" - "lvus.proto.schema.FieldData\022\016\n\006scores\030\004 " - "\003(\002\022%\n\003ids\030\005 \001(\0132\030.milvus.proto.schema.I" - "Ds\022\r\n\005topks\030\006 \003(\003\022\025\n\routput_fields\030\007 \003(\t" - "*\304\001\n\010DataType\022\010\n\004None\020\000\022\010\n\004Bool\020\001\022\010\n\004Int" - "8\020\002\022\t\n\005Int16\020\003\022\t\n\005Int32\020\004\022\t\n\005Int64\020\005\022\t\n\005" - "Float\020\n\022\n\n\006Double\020\013\022\n\n\006String\020\024\022\013\n\007VarCh" - "ar\020\025\022\t\n\005Array\020\026\022\010\n\004JSON\020\027\022\020\n\014BinaryVecto" - "r\020d\022\017\n\013FloatVector\020e\022\021\n\rFloat16Vector\020f*" - "V\n\nFieldState\022\020\n\014FieldCreated\020\000\022\021\n\rField" - "Creating\020\001\022\021\n\rFieldDropping\020\002\022\020\n\014FieldDr" - "opped\020\003Bm\n\016io.milvus.grpcB\013SchemaProtoP\001" - "Z4github.com/milvus-io/milvus-proto/go-a" - "pi/v2/schemapb\240\001\001\252\002\022Milvus.Client.Grpcb\006" - "proto3" + "mon.proto\032 google/protobuf/descriptor.pr" + "oto\"\327\003\n\013FieldSchema\022\017\n\007fieldID\030\001 \001(\003\022\014\n\004" + "name\030\002 \001(\t\022\026\n\016is_primary_key\030\003 \001(\010\022\023\n\013de" + "scription\030\004 \001(\t\0220\n\tdata_type\030\005 \001(\0162\035.mil" + "vus.proto.schema.DataType\0226\n\013type_params" + "\030\006 \003(\0132!.milvus.proto.common.KeyValuePai" + "r\0227\n\014index_params\030\007 \003(\0132!.milvus.proto.c" + "ommon.KeyValuePair\022\016\n\006autoID\030\010 \001(\010\022.\n\005st" + "ate\030\t \001(\0162\037.milvus.proto.schema.FieldSta" + "te\0223\n\014element_type\030\n \001(\0162\035.milvus.proto." + "schema.DataType\0226\n\rdefault_value\030\013 \001(\0132\037" + ".milvus.proto.schema.ValueField\022\022\n\nis_dy" + "namic\030\014 \001(\010\022\030\n\020is_partition_key\030\r \001(\010\"\231\001" + "\n\020CollectionSchema\022\014\n\004name\030\001 \001(\t\022\023\n\013desc" + "ription\030\002 \001(\t\022\022\n\006autoID\030\003 \001(\010B\002\030\001\0220\n\006fie" + "lds\030\004 \003(\0132 .milvus.proto.schema.FieldSch" + "ema\022\034\n\024enable_dynamic_field\030\005 \001(\010\"\031\n\tBoo" + "lArray\022\014\n\004data\030\001 \003(\010\"\030\n\010IntArray\022\014\n\004data" + "\030\001 \003(\005\"\031\n\tLongArray\022\014\n\004data\030\001 \003(\003\"\032\n\nFlo" + "atArray\022\014\n\004data\030\001 \003(\002\"\033\n\013DoubleArray\022\014\n\004" + "data\030\001 \003(\001\"\032\n\nBytesArray\022\014\n\004data\030\001 \003(\014\"\033" + "\n\013StringArray\022\014\n\004data\030\001 \003(\t\"q\n\nArrayArra" + "y\022.\n\004data\030\001 \003(\0132 .milvus.proto.schema.Sc" + "alarField\0223\n\014element_type\030\002 \001(\0162\035.milvus" + ".proto.schema.DataType\"\031\n\tJSONArray\022\014\n\004d" + "ata\030\001 \003(\014\"\254\001\n\nValueField\022\023\n\tbool_data\030\001 " + "\001(\010H\000\022\022\n\010int_data\030\002 \001(\005H\000\022\023\n\tlong_data\030\003" + " \001(\003H\000\022\024\n\nfloat_data\030\004 \001(\002H\000\022\025\n\013double_d" + "ata\030\005 \001(\001H\000\022\025\n\013string_data\030\006 \001(\tH\000\022\024\n\nby" + "tes_data\030\007 \001(\014H\000B\006\n\004data\"\376\003\n\013ScalarField" + "\0223\n\tbool_data\030\001 \001(\0132\036.milvus.proto.schem" + "a.BoolArrayH\000\0221\n\010int_data\030\002 \001(\0132\035.milvus" + ".proto.schema.IntArrayH\000\0223\n\tlong_data\030\003 " + "\001(\0132\036.milvus.proto.schema.LongArrayH\000\0225\n" + "\nfloat_data\030\004 \001(\0132\037.milvus.proto.schema." + "FloatArrayH\000\0227\n\013double_data\030\005 \001(\0132 .milv" + "us.proto.schema.DoubleArrayH\000\0227\n\013string_" + "data\030\006 \001(\0132 .milvus.proto.schema.StringA" + "rrayH\000\0225\n\nbytes_data\030\007 \001(\0132\037.milvus.prot" + "o.schema.BytesArrayH\000\0225\n\narray_data\030\010 \001(" + "\0132\037.milvus.proto.schema.ArrayArrayH\000\0223\n\t" + "json_data\030\t \001(\0132\036.milvus.proto.schema.JS" + "ONArrayH\000B\006\n\004data\"\251\001\n\013VectorField\022\013\n\003dim" + "\030\001 \001(\003\0227\n\014float_vector\030\002 \001(\0132\037.milvus.pr" + "oto.schema.FloatArrayH\000\022\027\n\rbinary_vector" + "\030\003 \001(\014H\000\022\030\n\016float16_vector\030\004 \001(\014H\000\022\031\n\017bf" + "loat16_vector\030\005 \001(\014H\000B\006\n\004data\"\345\001\n\tFieldD" + "ata\022+\n\004type\030\001 \001(\0162\035.milvus.proto.schema." + "DataType\022\022\n\nfield_name\030\002 \001(\t\0223\n\007scalars\030" + "\003 \001(\0132 .milvus.proto.schema.ScalarFieldH" + "\000\0223\n\007vectors\030\004 \001(\0132 .milvus.proto.schema" + ".VectorFieldH\000\022\020\n\010field_id\030\005 \001(\003\022\022\n\nis_d" + "ynamic\030\006 \001(\010B\007\n\005field\"w\n\003IDs\0220\n\006int_id\030\001" + " \001(\0132\036.milvus.proto.schema.LongArrayH\000\0222" + "\n\006str_id\030\002 \001(\0132 .milvus.proto.schema.Str" + "ingArrayH\000B\n\n\010id_field\"\206\002\n\020SearchResultD" + "ata\022\023\n\013num_queries\030\001 \001(\003\022\r\n\005top_k\030\002 \001(\003\022" + "3\n\013fields_data\030\003 \003(\0132\036.milvus.proto.sche" + "ma.FieldData\022\016\n\006scores\030\004 \003(\002\022%\n\003ids\030\005 \001(" + "\0132\030.milvus.proto.schema.IDs\022\r\n\005topks\030\006 \003" + "(\003\022\025\n\routput_fields\030\007 \003(\t\022<\n\024group_by_fi" + "eld_value\030\010 \001(\0132\036.milvus.proto.schema.Fi" + "eldData*\330\001\n\010DataType\022\010\n\004None\020\000\022\010\n\004Bool\020\001" + "\022\010\n\004Int8\020\002\022\t\n\005Int16\020\003\022\t\n\005Int32\020\004\022\t\n\005Int6" + "4\020\005\022\t\n\005Float\020\n\022\n\n\006Double\020\013\022\n\n\006String\020\024\022\013" + "\n\007VarChar\020\025\022\t\n\005Array\020\026\022\010\n\004JSON\020\027\022\020\n\014Bina" + "ryVector\020d\022\017\n\013FloatVector\020e\022\021\n\rFloat16Ve" + "ctor\020f\022\022\n\016BFloat16Vector\020g*V\n\nFieldState" + "\022\020\n\014FieldCreated\020\000\022\021\n\rFieldCreating\020\001\022\021\n" + "\rFieldDropping\020\002\022\020\n\014FieldDropped\020\003Bm\n\016io" + ".milvus.grpcB\013SchemaProtoP\001Z4github.com/" + "milvus-io/milvus-proto/go-api/v2/schemap" + "b\240\001\001\252\002\022Milvus.Client.Grpcb\006proto3" ; -static const ::_pbi::DescriptorTable* const descriptor_table_schema_2eproto_deps[1] = { +static const ::_pbi::DescriptorTable* const descriptor_table_schema_2eproto_deps[2] = { &::descriptor_table_common_2eproto, + &::descriptor_table_google_2fprotobuf_2fdescriptor_2eproto, }; static ::_pbi::once_flag descriptor_table_schema_2eproto_once; const ::_pbi::DescriptorTable descriptor_table_schema_2eproto = { - false, false, 2806, descriptor_table_protodef_schema_2eproto, + false, false, 2953, descriptor_table_protodef_schema_2eproto, "schema.proto", - &descriptor_table_schema_2eproto_once, descriptor_table_schema_2eproto_deps, 1, 17, + &descriptor_table_schema_2eproto_once, descriptor_table_schema_2eproto_deps, 2, 17, schemas, file_default_instances, TableStruct_schema_2eproto::offsets, file_level_metadata_schema_2eproto, file_level_enum_descriptors_schema_2eproto, file_level_service_descriptors_schema_2eproto, @@ -614,6 +621,7 @@ bool DataType_IsValid(int value) { case 100: case 101: case 102: + case 103: return true; default: return false; @@ -1347,7 +1355,7 @@ const char* CollectionSchema::_InternalParse(const char* ptr, ::_pbi::ParseConte } else goto handle_unusual; continue; - // bool autoID = 3; + // bool autoID = 3 [deprecated = true]; case 3: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { _impl_.autoid_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); @@ -1425,7 +1433,7 @@ uint8_t* CollectionSchema::_InternalSerialize( 2, this->_internal_description(), target); } - // bool autoID = 3; + // bool autoID = 3 [deprecated = true]; if (this->_internal_autoid() != 0) { target = stream->EnsureSpace(target); target = ::_pbi::WireFormatLite::WriteBoolToArray(3, this->_internal_autoid(), target); @@ -1482,7 +1490,7 @@ size_t CollectionSchema::ByteSizeLong() const { this->_internal_description()); } - // bool autoID = 3; + // bool autoID = 3 [deprecated = true]; if (this->_internal_autoid() != 0) { total_size += 1 + 1; } @@ -4464,6 +4472,10 @@ VectorField::VectorField(const VectorField& from) _this->_internal_set_float16_vector(from._internal_float16_vector()); break; } + case kBfloat16Vector: { + _this->_internal_set_bfloat16_vector(from._internal_bfloat16_vector()); + break; + } case DATA_NOT_SET: { break; } @@ -4521,6 +4533,10 @@ void VectorField::clear_data() { _impl_.data_.float16_vector_.Destroy(); break; } + case kBfloat16Vector: { + _impl_.data_.bfloat16_vector_.Destroy(); + break; + } case DATA_NOT_SET: { break; } @@ -4580,6 +4596,15 @@ const char* VectorField::_InternalParse(const char* ptr, ::_pbi::ParseContext* c } else goto handle_unusual; continue; + // bytes bfloat16_vector = 5; + case 5: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 42)) { + auto str = _internal_mutable_bfloat16_vector(); + ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); + CHK_(ptr); + } else + goto handle_unusual; + continue; default: goto handle_unusual; } // switch @@ -4634,6 +4659,12 @@ uint8_t* VectorField::_InternalSerialize( 4, this->_internal_float16_vector(), target); } + // bytes bfloat16_vector = 5; + if (_internal_has_bfloat16_vector()) { + target = stream->WriteBytesMaybeAliased( + 5, this->_internal_bfloat16_vector(), target); + } + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); @@ -4677,6 +4708,13 @@ size_t VectorField::ByteSizeLong() const { this->_internal_float16_vector()); break; } + // bytes bfloat16_vector = 5; + case kBfloat16Vector: { + total_size += 1 + + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::BytesSize( + this->_internal_bfloat16_vector()); + break; + } case DATA_NOT_SET: { break; } @@ -4716,6 +4754,10 @@ void VectorField::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PR _this->_internal_set_float16_vector(from._internal_float16_vector()); break; } + case kBfloat16Vector: { + _this->_internal_set_bfloat16_vector(from._internal_bfloat16_vector()); + break; + } case DATA_NOT_SET: { break; } @@ -5502,12 +5544,17 @@ ::PROTOBUF_NAMESPACE_ID::Metadata IDs::GetMetadata() const { class SearchResultData::_Internal { public: static const ::milvus::proto::schema::IDs& ids(const SearchResultData* msg); + static const ::milvus::proto::schema::FieldData& group_by_field_value(const SearchResultData* msg); }; const ::milvus::proto::schema::IDs& SearchResultData::_Internal::ids(const SearchResultData* msg) { return *msg->_impl_.ids_; } +const ::milvus::proto::schema::FieldData& +SearchResultData::_Internal::group_by_field_value(const SearchResultData* msg) { + return *msg->_impl_.group_by_field_value_; +} SearchResultData::SearchResultData(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { @@ -5524,6 +5571,7 @@ SearchResultData::SearchResultData(const SearchResultData& from) , /*decltype(_impl_._topks_cached_byte_size_)*/{0} , decltype(_impl_.output_fields_){from._impl_.output_fields_} , decltype(_impl_.ids_){nullptr} + , decltype(_impl_.group_by_field_value_){nullptr} , decltype(_impl_.num_queries_){} , decltype(_impl_.top_k_){} , /*decltype(_impl_._cached_size_)*/{}}; @@ -5532,6 +5580,9 @@ SearchResultData::SearchResultData(const SearchResultData& from) if (from._internal_has_ids()) { _this->_impl_.ids_ = new ::milvus::proto::schema::IDs(*from._impl_.ids_); } + if (from._internal_has_group_by_field_value()) { + _this->_impl_.group_by_field_value_ = new ::milvus::proto::schema::FieldData(*from._impl_.group_by_field_value_); + } ::memcpy(&_impl_.num_queries_, &from._impl_.num_queries_, static_cast(reinterpret_cast(&_impl_.top_k_) - reinterpret_cast(&_impl_.num_queries_)) + sizeof(_impl_.top_k_)); @@ -5549,6 +5600,7 @@ inline void SearchResultData::SharedCtor( , /*decltype(_impl_._topks_cached_byte_size_)*/{0} , decltype(_impl_.output_fields_){arena} , decltype(_impl_.ids_){nullptr} + , decltype(_impl_.group_by_field_value_){nullptr} , decltype(_impl_.num_queries_){int64_t{0}} , decltype(_impl_.top_k_){int64_t{0}} , /*decltype(_impl_._cached_size_)*/{} @@ -5571,6 +5623,7 @@ inline void SearchResultData::SharedDtor() { _impl_.topks_.~RepeatedField(); _impl_.output_fields_.~RepeatedPtrField(); if (this != internal_default_instance()) delete _impl_.ids_; + if (this != internal_default_instance()) delete _impl_.group_by_field_value_; } void SearchResultData::SetCachedSize(int size) const { @@ -5591,6 +5644,10 @@ void SearchResultData::Clear() { delete _impl_.ids_; } _impl_.ids_ = nullptr; + if (GetArenaForAllocation() == nullptr && _impl_.group_by_field_value_ != nullptr) { + delete _impl_.group_by_field_value_; + } + _impl_.group_by_field_value_ = nullptr; ::memset(&_impl_.num_queries_, 0, static_cast( reinterpret_cast(&_impl_.top_k_) - reinterpret_cast(&_impl_.num_queries_)) + sizeof(_impl_.top_k_)); @@ -5677,6 +5734,14 @@ const char* SearchResultData::_InternalParse(const char* ptr, ::_pbi::ParseConte } else goto handle_unusual; continue; + // .milvus.proto.schema.FieldData group_by_field_value = 8; + case 8: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 66)) { + ptr = ctx->ParseMessage(_internal_mutable_group_by_field_value(), ptr); + CHK_(ptr); + } else + goto handle_unusual; + continue; default: goto handle_unusual; } // switch @@ -5757,6 +5822,13 @@ uint8_t* SearchResultData::_InternalSerialize( target = stream->WriteString(7, s, target); } + // .milvus.proto.schema.FieldData group_by_field_value = 8; + if (this->_internal_has_group_by_field_value()) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + InternalWriteMessage(8, _Internal::group_by_field_value(this), + _Internal::group_by_field_value(this).GetCachedSize(), target, stream); + } + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); @@ -5820,6 +5892,13 @@ size_t SearchResultData::ByteSizeLong() const { *_impl_.ids_); } + // .milvus.proto.schema.FieldData group_by_field_value = 8; + if (this->_internal_has_group_by_field_value()) { + total_size += 1 + + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + *_impl_.group_by_field_value_); + } + // int64 num_queries = 1; if (this->_internal_num_queries() != 0) { total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_num_queries()); @@ -5856,6 +5935,10 @@ void SearchResultData::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const _this->_internal_mutable_ids()->::milvus::proto::schema::IDs::MergeFrom( from._internal_ids()); } + if (from._internal_has_group_by_field_value()) { + _this->_internal_mutable_group_by_field_value()->::milvus::proto::schema::FieldData::MergeFrom( + from._internal_group_by_field_value()); + } if (from._internal_num_queries() != 0) { _this->_internal_set_num_queries(from._internal_num_queries()); } diff --git a/internal/core/src/pb/schema.pb.h b/internal/core/src/pb/schema.pb.h index 8b2338f1180f0..a1506d926376e 100644 --- a/internal/core/src/pb/schema.pb.h +++ b/internal/core/src/pb/schema.pb.h @@ -32,6 +32,7 @@ #include #include #include "common.pb.h" +#include // @@protoc_insertion_point(includes) #include #define PROTOBUF_INTERNAL_EXPORT_schema_2eproto @@ -142,12 +143,13 @@ enum DataType : int { BinaryVector = 100, FloatVector = 101, Float16Vector = 102, + BFloat16Vector = 103, DataType_INT_MIN_SENTINEL_DO_NOT_USE_ = std::numeric_limits::min(), DataType_INT_MAX_SENTINEL_DO_NOT_USE_ = std::numeric_limits::max() }; bool DataType_IsValid(int value); constexpr DataType DataType_MIN = None; -constexpr DataType DataType_MAX = Float16Vector; +constexpr DataType DataType_MAX = BFloat16Vector; constexpr int DataType_ARRAYSIZE = DataType_MAX + 1; const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* DataType_descriptor(); @@ -683,10 +685,10 @@ class CollectionSchema final : std::string* _internal_mutable_description(); public: - // bool autoID = 3; - void clear_autoid(); - bool autoid() const; - void set_autoid(bool value); + // bool autoID = 3 [deprecated = true]; + PROTOBUF_DEPRECATED void clear_autoid(); + PROTOBUF_DEPRECATED bool autoid() const; + PROTOBUF_DEPRECATED void set_autoid(bool value); private: bool _internal_autoid() const; void _internal_set_autoid(bool value); @@ -2863,6 +2865,7 @@ class VectorField final : kFloatVector = 2, kBinaryVector = 3, kFloat16Vector = 4, + kBfloat16Vector = 5, DATA_NOT_SET = 0, }; @@ -2948,6 +2951,7 @@ class VectorField final : kFloatVectorFieldNumber = 2, kBinaryVectorFieldNumber = 3, kFloat16VectorFieldNumber = 4, + kBfloat16VectorFieldNumber = 5, }; // int64 dim = 1; void clear_dim(); @@ -3012,6 +3016,24 @@ class VectorField final : std::string* _internal_mutable_float16_vector(); public: + // bytes bfloat16_vector = 5; + bool has_bfloat16_vector() const; + private: + bool _internal_has_bfloat16_vector() const; + public: + void clear_bfloat16_vector(); + const std::string& bfloat16_vector() const; + template + void set_bfloat16_vector(ArgT0&& arg0, ArgT... args); + std::string* mutable_bfloat16_vector(); + PROTOBUF_NODISCARD std::string* release_bfloat16_vector(); + void set_allocated_bfloat16_vector(std::string* bfloat16_vector); + private: + const std::string& _internal_bfloat16_vector() const; + inline PROTOBUF_ALWAYS_INLINE void _internal_set_bfloat16_vector(const std::string& value); + std::string* _internal_mutable_bfloat16_vector(); + public: + void clear_data(); DataCase data_case() const; // @@protoc_insertion_point(class_scope:milvus.proto.schema.VectorField) @@ -3020,6 +3042,7 @@ class VectorField final : void set_has_float_vector(); void set_has_binary_vector(); void set_has_float16_vector(); + void set_has_bfloat16_vector(); inline bool has_data() const; inline void clear_has_data(); @@ -3035,6 +3058,7 @@ class VectorField final : ::milvus::proto::schema::FloatArray* float_vector_; ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr binary_vector_; ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr float16_vector_; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr bfloat16_vector_; } data_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; uint32_t _oneof_case_[1]; @@ -3612,6 +3636,7 @@ class SearchResultData final : kTopksFieldNumber = 6, kOutputFieldsFieldNumber = 7, kIdsFieldNumber = 5, + kGroupByFieldValueFieldNumber = 8, kNumQueriesFieldNumber = 1, kTopKFieldNumber = 2, }; @@ -3719,6 +3744,24 @@ class SearchResultData final : ::milvus::proto::schema::IDs* ids); ::milvus::proto::schema::IDs* unsafe_arena_release_ids(); + // .milvus.proto.schema.FieldData group_by_field_value = 8; + bool has_group_by_field_value() const; + private: + bool _internal_has_group_by_field_value() const; + public: + void clear_group_by_field_value(); + const ::milvus::proto::schema::FieldData& group_by_field_value() const; + PROTOBUF_NODISCARD ::milvus::proto::schema::FieldData* release_group_by_field_value(); + ::milvus::proto::schema::FieldData* mutable_group_by_field_value(); + void set_allocated_group_by_field_value(::milvus::proto::schema::FieldData* group_by_field_value); + private: + const ::milvus::proto::schema::FieldData& _internal_group_by_field_value() const; + ::milvus::proto::schema::FieldData* _internal_mutable_group_by_field_value(); + public: + void unsafe_arena_set_allocated_group_by_field_value( + ::milvus::proto::schema::FieldData* group_by_field_value); + ::milvus::proto::schema::FieldData* unsafe_arena_release_group_by_field_value(); + // int64 num_queries = 1; void clear_num_queries(); int64_t num_queries() const; @@ -3751,6 +3794,7 @@ class SearchResultData final : mutable std::atomic _topks_cached_byte_size_; ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField output_fields_; ::milvus::proto::schema::IDs* ids_; + ::milvus::proto::schema::FieldData* group_by_field_value_; int64_t num_queries_; int64_t top_k_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; @@ -4297,7 +4341,7 @@ inline void CollectionSchema::set_allocated_description(std::string* description // @@protoc_insertion_point(field_set_allocated:milvus.proto.schema.CollectionSchema.description) } -// bool autoID = 3; +// bool autoID = 3 [deprecated = true]; inline void CollectionSchema::clear_autoid() { _impl_.autoid_ = false; } @@ -6221,6 +6265,83 @@ inline void VectorField::set_allocated_float16_vector(std::string* float16_vecto // @@protoc_insertion_point(field_set_allocated:milvus.proto.schema.VectorField.float16_vector) } +// bytes bfloat16_vector = 5; +inline bool VectorField::_internal_has_bfloat16_vector() const { + return data_case() == kBfloat16Vector; +} +inline bool VectorField::has_bfloat16_vector() const { + return _internal_has_bfloat16_vector(); +} +inline void VectorField::set_has_bfloat16_vector() { + _impl_._oneof_case_[0] = kBfloat16Vector; +} +inline void VectorField::clear_bfloat16_vector() { + if (_internal_has_bfloat16_vector()) { + _impl_.data_.bfloat16_vector_.Destroy(); + clear_has_data(); + } +} +inline const std::string& VectorField::bfloat16_vector() const { + // @@protoc_insertion_point(field_get:milvus.proto.schema.VectorField.bfloat16_vector) + return _internal_bfloat16_vector(); +} +template +inline void VectorField::set_bfloat16_vector(ArgT0&& arg0, ArgT... args) { + if (!_internal_has_bfloat16_vector()) { + clear_data(); + set_has_bfloat16_vector(); + _impl_.data_.bfloat16_vector_.InitDefault(); + } + _impl_.data_.bfloat16_vector_.SetBytes( static_cast(arg0), args..., GetArenaForAllocation()); + // @@protoc_insertion_point(field_set:milvus.proto.schema.VectorField.bfloat16_vector) +} +inline std::string* VectorField::mutable_bfloat16_vector() { + std::string* _s = _internal_mutable_bfloat16_vector(); + // @@protoc_insertion_point(field_mutable:milvus.proto.schema.VectorField.bfloat16_vector) + return _s; +} +inline const std::string& VectorField::_internal_bfloat16_vector() const { + if (_internal_has_bfloat16_vector()) { + return _impl_.data_.bfloat16_vector_.Get(); + } + return ::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(); +} +inline void VectorField::_internal_set_bfloat16_vector(const std::string& value) { + if (!_internal_has_bfloat16_vector()) { + clear_data(); + set_has_bfloat16_vector(); + _impl_.data_.bfloat16_vector_.InitDefault(); + } + _impl_.data_.bfloat16_vector_.Set(value, GetArenaForAllocation()); +} +inline std::string* VectorField::_internal_mutable_bfloat16_vector() { + if (!_internal_has_bfloat16_vector()) { + clear_data(); + set_has_bfloat16_vector(); + _impl_.data_.bfloat16_vector_.InitDefault(); + } + return _impl_.data_.bfloat16_vector_.Mutable( GetArenaForAllocation()); +} +inline std::string* VectorField::release_bfloat16_vector() { + // @@protoc_insertion_point(field_release:milvus.proto.schema.VectorField.bfloat16_vector) + if (_internal_has_bfloat16_vector()) { + clear_has_data(); + return _impl_.data_.bfloat16_vector_.Release(); + } else { + return nullptr; + } +} +inline void VectorField::set_allocated_bfloat16_vector(std::string* bfloat16_vector) { + if (has_data()) { + clear_data(); + } + if (bfloat16_vector != nullptr) { + set_has_bfloat16_vector(); + _impl_.data_.bfloat16_vector_.InitAllocated(bfloat16_vector, GetArenaForAllocation()); + } + // @@protoc_insertion_point(field_set_allocated:milvus.proto.schema.VectorField.bfloat16_vector) +} + inline bool VectorField::has_data() const { return data_case() != DATA_NOT_SET; } @@ -7005,6 +7126,96 @@ SearchResultData::mutable_output_fields() { return &_impl_.output_fields_; } +// .milvus.proto.schema.FieldData group_by_field_value = 8; +inline bool SearchResultData::_internal_has_group_by_field_value() const { + return this != internal_default_instance() && _impl_.group_by_field_value_ != nullptr; +} +inline bool SearchResultData::has_group_by_field_value() const { + return _internal_has_group_by_field_value(); +} +inline void SearchResultData::clear_group_by_field_value() { + if (GetArenaForAllocation() == nullptr && _impl_.group_by_field_value_ != nullptr) { + delete _impl_.group_by_field_value_; + } + _impl_.group_by_field_value_ = nullptr; +} +inline const ::milvus::proto::schema::FieldData& SearchResultData::_internal_group_by_field_value() const { + const ::milvus::proto::schema::FieldData* p = _impl_.group_by_field_value_; + return p != nullptr ? *p : reinterpret_cast( + ::milvus::proto::schema::_FieldData_default_instance_); +} +inline const ::milvus::proto::schema::FieldData& SearchResultData::group_by_field_value() const { + // @@protoc_insertion_point(field_get:milvus.proto.schema.SearchResultData.group_by_field_value) + return _internal_group_by_field_value(); +} +inline void SearchResultData::unsafe_arena_set_allocated_group_by_field_value( + ::milvus::proto::schema::FieldData* group_by_field_value) { + if (GetArenaForAllocation() == nullptr) { + delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.group_by_field_value_); + } + _impl_.group_by_field_value_ = group_by_field_value; + if (group_by_field_value) { + + } else { + + } + // @@protoc_insertion_point(field_unsafe_arena_set_allocated:milvus.proto.schema.SearchResultData.group_by_field_value) +} +inline ::milvus::proto::schema::FieldData* SearchResultData::release_group_by_field_value() { + + ::milvus::proto::schema::FieldData* temp = _impl_.group_by_field_value_; + _impl_.group_by_field_value_ = nullptr; +#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE + auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp); + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + if (GetArenaForAllocation() == nullptr) { delete old; } +#else // PROTOBUF_FORCE_COPY_IN_RELEASE + if (GetArenaForAllocation() != nullptr) { + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + } +#endif // !PROTOBUF_FORCE_COPY_IN_RELEASE + return temp; +} +inline ::milvus::proto::schema::FieldData* SearchResultData::unsafe_arena_release_group_by_field_value() { + // @@protoc_insertion_point(field_release:milvus.proto.schema.SearchResultData.group_by_field_value) + + ::milvus::proto::schema::FieldData* temp = _impl_.group_by_field_value_; + _impl_.group_by_field_value_ = nullptr; + return temp; +} +inline ::milvus::proto::schema::FieldData* SearchResultData::_internal_mutable_group_by_field_value() { + + if (_impl_.group_by_field_value_ == nullptr) { + auto* p = CreateMaybeMessage<::milvus::proto::schema::FieldData>(GetArenaForAllocation()); + _impl_.group_by_field_value_ = p; + } + return _impl_.group_by_field_value_; +} +inline ::milvus::proto::schema::FieldData* SearchResultData::mutable_group_by_field_value() { + ::milvus::proto::schema::FieldData* _msg = _internal_mutable_group_by_field_value(); + // @@protoc_insertion_point(field_mutable:milvus.proto.schema.SearchResultData.group_by_field_value) + return _msg; +} +inline void SearchResultData::set_allocated_group_by_field_value(::milvus::proto::schema::FieldData* group_by_field_value) { + ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); + if (message_arena == nullptr) { + delete _impl_.group_by_field_value_; + } + if (group_by_field_value) { + ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = + ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(group_by_field_value); + if (message_arena != submessage_arena) { + group_by_field_value = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( + message_arena, group_by_field_value, submessage_arena); + } + + } else { + + } + _impl_.group_by_field_value_ = group_by_field_value; + // @@protoc_insertion_point(field_set_allocated:milvus.proto.schema.SearchResultData.group_by_field_value) +} + #ifdef __GNUC__ #pragma GCC diagnostic pop #endif // __GNUC__ diff --git a/internal/distributed/proxy/service.go b/internal/distributed/proxy/service.go index 8fc899222c639..7a3a768f5815c 100644 --- a/internal/distributed/proxy/service.go +++ b/internal/distributed/proxy/service.go @@ -820,6 +820,11 @@ func (s *Server) CreateIndex(ctx context.Context, request *milvuspb.CreateIndexR return s.proxy.CreateIndex(ctx, request) } +func (s *Server) AlterIndex(ctx context.Context, request *milvuspb.AlterIndexRequest) (*commonpb.Status, error) { + // Todo + return nil, nil +} + // DropIndex notifies Proxy to drop index func (s *Server) DropIndex(ctx context.Context, request *milvuspb.DropIndexRequest) (*commonpb.Status, error) { return s.proxy.DropIndex(ctx, request) @@ -864,6 +869,11 @@ func (s *Server) Search(ctx context.Context, request *milvuspb.SearchRequest) (* return s.proxy.Search(ctx, request) } +func (s *Server) SearchV2(ctx context.Context, request *milvuspb.SearchRequestV2) (*milvuspb.SearchResults, error) { + // Todo + return nil, nil +} + func (s *Server) Flush(ctx context.Context, request *milvuspb.FlushRequest) (*milvuspb.FlushResponse, error) { return s.proxy.Flush(ctx, request) } diff --git a/internal/distributed/proxy/service_test.go b/internal/distributed/proxy/service_test.go index 993340fa5822f..5aa11425d5569 100644 --- a/internal/distributed/proxy/service_test.go +++ b/internal/distributed/proxy/service_test.go @@ -263,6 +263,10 @@ func (m *MockProxy) CreateIndex(ctx context.Context, request *milvuspb.CreateInd return nil, nil } +func (m *MockProxy) AlterIndex(ctx context.Context, request *milvuspb.AlterIndexRequest) (*commonpb.Status, error) { + return nil, nil +} + func (m *MockProxy) DropIndex(ctx context.Context, request *milvuspb.DropIndexRequest) (*commonpb.Status, error) { return nil, nil } @@ -299,6 +303,10 @@ func (m *MockProxy) Search(ctx context.Context, request *milvuspb.SearchRequest) return nil, nil } +func (m *MockProxy) SearchV2(ctx context.Context, request *milvuspb.SearchRequestV2) (*milvuspb.SearchResults, error) { + return nil, nil +} + func (m *MockProxy) Flush(ctx context.Context, request *milvuspb.FlushRequest) (*milvuspb.FlushResponse, error) { return nil, nil } diff --git a/internal/mocks/mock_proxy.go b/internal/mocks/mock_proxy.go index 22715c2f1c4c7..ce1e9e1353f36 100644 --- a/internal/mocks/mock_proxy.go +++ b/internal/mocks/mock_proxy.go @@ -639,6 +639,11 @@ func (_c *MockProxy_CreateIndex_Call) RunAndReturn(run func(context.Context, *mi return _c } +func (_m *MockProxy) AlterIndex(_a0 context.Context, _a1 *milvuspb.AlterIndexRequest) (*commonpb.Status, error) { + // Todo + return nil, nil +} + // CreatePartition provides a mock function with given fields: _a0, _a1 func (_m *MockProxy) CreatePartition(_a0 context.Context, _a1 *milvuspb.CreatePartitionRequest) (*commonpb.Status, error) { ret := _m.Called(_a0, _a1) @@ -4555,6 +4560,11 @@ func (_c *MockProxy_Search_Call) RunAndReturn(run func(context.Context, *milvusp return _c } +func (_m *MockProxy) SearchV2(_a0 context.Context, _a1 *milvuspb.SearchRequestV2) (*milvuspb.SearchResults, error) { + // Todo + return nil, nil +} + // SelectGrant provides a mock function with given fields: _a0, _a1 func (_m *MockProxy) SelectGrant(_a0 context.Context, _a1 *milvuspb.SelectGrantRequest) (*milvuspb.SelectGrantResponse, error) { ret := _m.Called(_a0, _a1) diff --git a/internal/proxy/impl.go b/internal/proxy/impl.go index 3a38d70c843be..8219c70f48b54 100644 --- a/internal/proxy/impl.go +++ b/internal/proxy/impl.go @@ -1813,6 +1813,11 @@ func (node *Proxy) CreateIndex(ctx context.Context, request *milvuspb.CreateInde return cit.result, nil } +func (node *Proxy) AlterIndex(ctx context.Context, request *milvuspb.AlterIndexRequest) (*commonpb.Status, error) { + // Todo + return nil, nil +} + // DescribeIndex get the meta information of index, such as index state, index id and etc. func (node *Proxy) DescribeIndex(ctx context.Context, request *milvuspb.DescribeIndexRequest) (*milvuspb.DescribeIndexResponse, error) { if err := merr.CheckHealthy(node.GetStateCode()); err != nil { @@ -2649,6 +2654,11 @@ func (node *Proxy) Search(ctx context.Context, request *milvuspb.SearchRequest) return qt.result, nil } +func (node *Proxy) SearchV2(ctx context.Context, request *milvuspb.SearchRequestV2) (*milvuspb.SearchResults, error) { + // Todo + return nil, nil +} + func (node *Proxy) getVectorPlaceholderGroupForSearchByPks(ctx context.Context, request *milvuspb.SearchRequest) ([]byte, error) { placeholderGroup := &commonpb.PlaceholderGroup{} err := proto.Unmarshal(request.PlaceholderGroup, placeholderGroup) diff --git a/pkg/go.mod b/pkg/go.mod index 3ce82bd001490..d67b5844c6bdd 100644 --- a/pkg/go.mod +++ b/pkg/go.mod @@ -13,7 +13,7 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 github.com/klauspost/compress v1.16.5 github.com/lingdor/stackerror v0.0.0-20191119040541-976d8885ed76 - github.com/milvus-io/milvus-proto/go-api/v2 v2.3.4-0.20231114080011-9a495865219e + github.com/milvus-io/milvus-proto/go-api/v2 v2.3.4-0.20231208092431-02cbad30332f github.com/nats-io/nats-server/v2 v2.9.17 github.com/nats-io/nats.go v1.24.0 github.com/panjf2000/ants/v2 v2.7.2 diff --git a/pkg/go.sum b/pkg/go.sum index d0c99e30c2238..5a607c4cdd0bd 100644 --- a/pkg/go.sum +++ b/pkg/go.sum @@ -479,6 +479,8 @@ github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/le github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/milvus-io/milvus-proto/go-api/v2 v2.3.4-0.20231114080011-9a495865219e h1:IH1WAXwEF8vbwahPdupi4zzRNWViT4B7fZzIjtRLpG4= github.com/milvus-io/milvus-proto/go-api/v2 v2.3.4-0.20231114080011-9a495865219e/go.mod h1:1OIl0v5PQeNxIJhCvY+K55CBUOYDZevw9g9380u1Wek= +github.com/milvus-io/milvus-proto/go-api/v2 v2.3.4-0.20231208092431-02cbad30332f h1:0cAMN9OsgBxlEUY8i1e1ocrBZ/cpu/Kdguz4JWz9fUc= +github.com/milvus-io/milvus-proto/go-api/v2 v2.3.4-0.20231208092431-02cbad30332f/go.mod h1:1OIl0v5PQeNxIJhCvY+K55CBUOYDZevw9g9380u1Wek= github.com/milvus-io/pulsar-client-go v0.6.10 h1:eqpJjU+/QX0iIhEo3nhOqMNXL+TyInAs1IAHZCrCM/A= github.com/milvus-io/pulsar-client-go v0.6.10/go.mod h1:lQqCkgwDF8YFYjKA+zOheTk1tev2B+bKj5j7+nm8M1w= github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g= diff --git a/pkg/util/constant.go b/pkg/util/constant.go index 9c3ac5ef33c5c..28fa62e6ac201 100644 --- a/pkg/util/constant.go +++ b/pkg/util/constant.go @@ -125,6 +125,12 @@ var ( MetaStore2API(commonpb.ObjectPrivilege_PrivilegeCreateDatabase.String()), MetaStore2API(commonpb.ObjectPrivilege_PrivilegeDropDatabase.String()), MetaStore2API(commonpb.ObjectPrivilege_PrivilegeListDatabases.String()), + + MetaStore2API(commonpb.ObjectPrivilege_PrivilegeCreatePartition.String()), + MetaStore2API(commonpb.ObjectPrivilege_PrivilegeDropPartition.String()), + MetaStore2API(commonpb.ObjectPrivilege_PrivilegeShowPartitions.String()), + MetaStore2API(commonpb.ObjectPrivilege_PrivilegeHasPartition.String()), + MetaStore2API(commonpb.ObjectPrivilege_PrivilegeGetFlushState.String()), }, commonpb.ObjectType_User.String(): { MetaStore2API(commonpb.ObjectPrivilege_PrivilegeUpdateUser.String()), diff --git a/pkg/util/funcutil/policy_test.go b/pkg/util/funcutil/policy_test.go index 03bf498884f77..93395768accf6 100644 --- a/pkg/util/funcutil/policy_test.go +++ b/pkg/util/funcutil/policy_test.go @@ -20,7 +20,7 @@ func Test_GetPrivilegeExtObj(t *testing.T) { assert.Equal(t, commonpb.ObjectPrivilege_PrivilegeLoad, privilegeExt.ObjectPrivilege) assert.Equal(t, int32(3), privilegeExt.ObjectNameIndex) - request2 := &milvuspb.CreatePartitionRequest{} + request2 := &milvuspb.GetPartitionStatisticsRequest{} _, err = GetPrivilegeExtObj(request2) assert.Error(t, err) }