Add BatchDescribeCollections/DescribeReplicas interfaces

Signed-off-by: yhmo <yihua.mo@zilliz.com>

Author: yhmo

scripts/build.sh

@@ -171,6 +171,7 @@ if [[ "${BUILD_FROM_CONAN}" == "ON" ]]; then
     -s:b build_type=${BUILD_TYPE} \
     -s:b compiler.cppstd=${BUILD_CPPSTD} \
     -o "&:with_tests=${CONAN_WITH_TESTS}" \
+    -c tools.build:jobs=${JOBS} \
     --build=missing || exit 1
 
   TOOLCHAIN_FILE="${PWD}/build/${BUILD_TYPE}/generators/conan_toolchain.cmake"

src/impl/MilvusClientV2Impl.cpp

@@ -34,6 +34,35 @@
 #include "utils/TypeUtils.h"
 
 namespace milvus {
+namespace {
+
+Status
+ConvertDescribeCollectionResponse(const proto::milvus::DescribeCollectionResponse& rpc_response,
+                                  CollectionDesc& collection_desc) {
+    CollectionSchema schema;
+    ConvertCollectionSchema(rpc_response.schema(), schema);
+    schema.SetShardsNum(rpc_response.shards_num());
+
+    collection_desc.SetSchema(std::move(schema));
+    collection_desc.SetID(rpc_response.collectionid());
+    collection_desc.SetCreatedTime(rpc_response.created_timestamp());
+
+    std::vector<std::string> aliases;
+    aliases.reserve(rpc_response.aliases_size());
+    aliases.insert(aliases.end(), rpc_response.aliases().begin(), rpc_response.aliases().end());
+    collection_desc.SetAlias(std::move(aliases));
+
+    std::unordered_map<std::string, std::string> properties;
+    for (int i = 0; i < rpc_response.properties_size(); i++) {
+        const auto& prop = rpc_response.properties(i);
+        properties[prop.key()] = prop.value();
+    }
+    collection_desc.SetProperties(std::move(properties));
+
+    return Status::OK();
+}
+
+}  // namespace
 
 std::shared_ptr<MilvusClientV2>
 MilvusClientV2::Create() {
@@ -339,26 +368,11 @@ MilvusClientV2Impl::DescribeCollection(const DescribeCollectionRequest& request,
     };
 
     auto post = [&response](const proto::milvus::DescribeCollectionResponse& rpc_response) {
-        CollectionSchema schema;
-        ConvertCollectionSchema(rpc_response.schema(), schema);
-        schema.SetShardsNum(rpc_response.shards_num());
-
         CollectionDesc collection_desc;
-        collection_desc.SetSchema(std::move(schema));
-        collection_desc.SetID(rpc_response.collectionid());
-        collection_desc.SetCreatedTime(rpc_response.created_timestamp());
-
-        std::vector<std::string> aliases;
-        aliases.reserve(rpc_response.aliases_size());
-        aliases.insert(aliases.end(), rpc_response.aliases().begin(), rpc_response.aliases().end());
-        collection_desc.SetAlias(std::move(aliases));
-
-        std::unordered_map<std::string, std::string> properties;
-        for (int i = 0; i < rpc_response.properties_size(); i++) {
-            const auto& prop = rpc_response.properties(i);
-            properties[prop.key()] = prop.value();
+        auto status = ConvertDescribeCollectionResponse(rpc_response, collection_desc);
+        if (!status.IsOk()) {
+            return status;
         }
-        collection_desc.SetProperties(std::move(properties));
 
         response.SetDesc(std::move(collection_desc));
         return Status::OK();
@@ -368,6 +382,106 @@ MilvusClientV2Impl::DescribeCollection(const DescribeCollectionRequest& request,
         pre, &MilvusConnection::DescribeCollection, post);
 }
 
+Status
+MilvusClientV2Impl::BatchDescribeCollections(const BatchDescribeCollectionsRequest& request,
+                                            BatchDescribeCollectionsResponse& response) {
+    auto pre = [&request](proto::milvus::BatchDescribeCollectionRequest& rpc_request) {
+        rpc_request.set_db_name(request.DatabaseName());
+        for (const auto& collection_name : request.CollectionNames()) {
+            rpc_request.add_collection_name(collection_name);
+        }
+        for (auto collection_id : request.CollectionIDs()) {
+            rpc_request.add_collectionid(collection_id);
+        }
+        return Status::OK();
+    };
+
+    auto post = [&response](const proto::milvus::BatchDescribeCollectionResponse& rpc_response) {
+        std::vector<CollectionDesc> descs;
+        descs.reserve(rpc_response.responses_size());
+        for (const auto& rpc_desc : rpc_response.responses()) {
+            CollectionDesc desc;
+            auto status = ConvertDescribeCollectionResponse(rpc_desc, desc);
+            if (!status.IsOk()) {
+                return status;
+            }
+            descs.emplace_back(std::move(desc));
+        }
+
+        response.SetDescs(std::move(descs));
+        return Status::OK();
+    };
+
+    return connection_.Invoke<proto::milvus::BatchDescribeCollectionRequest,
+                              proto::milvus::BatchDescribeCollectionResponse>(
+        pre, &MilvusConnection::BatchDescribeCollection, post);
+}
+
+Status
+MilvusClientV2Impl::DescribeReplicas(const DescribeReplicasRequest& request, DescribeReplicasResponse& response) {
+    if (request.CollectionName().empty()) {
+        return {StatusCode::INVALID_ARGUMENT, "Invalid collection name"};
+    }
+
+    auto pre = [&request](proto::milvus::GetReplicasRequest& rpc_request) {
+        rpc_request.set_db_name(request.DatabaseName());
+        rpc_request.set_collection_name(request.CollectionName());
+        rpc_request.set_with_shard_nodes(true);
+        return Status::OK();
+    };
+
+    auto post = [&response](const proto::milvus::GetReplicasResponse& rpc_response) {
+        std::vector<ReplicaInfo> replicas;
+        replicas.reserve(rpc_response.replicas_size());
+        for (const auto& rpc_replica : rpc_response.replicas()) {
+            ReplicaInfo replica;
+            replica.SetReplicaID(rpc_replica.replicaid());
+            replica.SetCollectionID(rpc_replica.collectionid());
+
+            std::vector<int64_t> partition_ids;
+            partition_ids.reserve(rpc_replica.partition_ids_size());
+            partition_ids.insert(partition_ids.end(), rpc_replica.partition_ids().begin(), rpc_replica.partition_ids().end());
+            replica.SetPartitionIDs(std::move(partition_ids));
+
+            std::vector<int64_t> node_ids;
+            node_ids.reserve(rpc_replica.node_ids_size());
+            node_ids.insert(node_ids.end(), rpc_replica.node_ids().begin(), rpc_replica.node_ids().end());
+            replica.SetNodeIDs(std::move(node_ids));
+
+            replica.SetResourceGroupName(rpc_replica.resource_group_name());
+
+            std::unordered_map<std::string, int32_t> num_outbound_node;
+            num_outbound_node.insert(rpc_replica.num_outbound_node().begin(), rpc_replica.num_outbound_node().end());
+            replica.SetNumOutboundNode(std::move(num_outbound_node));
+
+            std::vector<ShardReplica> shard_replicas;
+            shard_replicas.reserve(rpc_replica.shard_replicas_size());
+            for (const auto& rpc_shard : rpc_replica.shard_replicas()) {
+                ShardReplica shard_replica;
+                shard_replica.SetLeaderID(rpc_shard.leaderid());
+                shard_replica.SetLeaderAddress(rpc_shard.leader_addr());
+                shard_replica.SetChannelName(rpc_shard.dm_channel_name());
+
+                std::vector<int64_t> shard_node_ids;
+                shard_node_ids.reserve(rpc_shard.node_ids_size());
+                shard_node_ids.insert(shard_node_ids.end(), rpc_shard.node_ids().begin(), rpc_shard.node_ids().end());
+                shard_replica.SetNodeIDs(std::move(shard_node_ids));
+
+                shard_replicas.emplace_back(std::move(shard_replica));
+            }
+            replica.SetShardReplicas(std::move(shard_replicas));
+
+            replicas.emplace_back(std::move(replica));
+        }
+
+        response.SetReplicas(std::move(replicas));
+        return Status::OK();
+    };
+
+    return connection_.Invoke<proto::milvus::GetReplicasRequest, proto::milvus::GetReplicasResponse>(
+        pre, &MilvusConnection::GetReplicas, post);
+}
+
 Status
 MilvusClientV2Impl::RenameCollection(const RenameCollectionRequest& request) {
     auto pre = [&request](proto::milvus::RenameCollectionRequest& rpc_request) {

src/impl/MilvusClientV2Impl.h

@@ -75,6 +75,12 @@ class MilvusClientV2Impl : public MilvusClientV2 {
     Status
     DescribeCollection(const DescribeCollectionRequest& request, DescribeCollectionResponse& response) final;
 
+    Status
+    BatchDescribeCollections(const BatchDescribeCollectionsRequest& request, BatchDescribeCollectionsResponse& response) final;
+
+    Status
+    DescribeReplicas(const DescribeReplicasRequest& request, DescribeReplicasResponse& response) final;
+
     Status
     RenameCollection(const RenameCollectionRequest& request) final;
 

src/impl/MilvusConnection.cpp

@@ -277,6 +277,19 @@ MilvusConnection::DescribeCollection(const proto::milvus::DescribeCollectionRequ
     return grpcCall("DescribeCollection", &Stub::DescribeCollection, request, response, options);
 }
 
+Status
+MilvusConnection::BatchDescribeCollection(const proto::milvus::BatchDescribeCollectionRequest& request,
+                                          proto::milvus::BatchDescribeCollectionResponse& response,
+                                          const GrpcContextOptions& options) {
+    return grpcCall("BatchDescribeCollection", &Stub::BatchDescribeCollection, request, response, options);
+}
+
+Status
+MilvusConnection::GetReplicas(const proto::milvus::GetReplicasRequest& request,
+                              proto::milvus::GetReplicasResponse& response, const GrpcContextOptions& options) {
+    return grpcCall("GetReplicas", &Stub::GetReplicas, request, response, options);
+}
+
 Status
 MilvusConnection::RenameCollection(const proto::milvus::RenameCollectionRequest& request,
                                    proto::common::Status& response, const GrpcContextOptions& options) {

src/impl/MilvusConnection.h

@@ -121,6 +121,15 @@ class MilvusConnection {
     DescribeCollection(const proto::milvus::DescribeCollectionRequest& request,
                        proto::milvus::DescribeCollectionResponse& response, const GrpcContextOptions& options);
 
+    Status
+    BatchDescribeCollection(const proto::milvus::BatchDescribeCollectionRequest& request,
+                            proto::milvus::BatchDescribeCollectionResponse& response,
+                            const GrpcContextOptions& options);
+
+    Status
+    GetReplicas(const proto::milvus::GetReplicasRequest& request, proto::milvus::GetReplicasResponse& response,
+                const GrpcContextOptions& options);
+
     Status
     RenameCollection(const proto::milvus::RenameCollectionRequest& request, proto::common::Status& response,
                      const GrpcContextOptions& options);

src/impl/request/collection/BatchDescribeCollectionsRequest.cpp

@@ -0,0 +1,83 @@
+// Licensed to the LF AI & Data foundation under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "milvus/request/collection/BatchDescribeCollectionsRequest.h"
+
+#include <utility>
+
+namespace milvus {
+
+const std::string&
+BatchDescribeCollectionsRequest::DatabaseName() const {
+    return db_name_;
+}
+
+void
+BatchDescribeCollectionsRequest::SetDatabaseName(const std::string& db_name) {
+    db_name_ = db_name;
+}
+
+BatchDescribeCollectionsRequest&
+BatchDescribeCollectionsRequest::WithDatabaseName(const std::string& db_name) {
+    SetDatabaseName(db_name);
+    return *this;
+}
+
+const std::vector<std::string>&
+BatchDescribeCollectionsRequest::CollectionNames() const {
+    return collection_names_;
+}
+
+void
+BatchDescribeCollectionsRequest::SetCollectionNames(std::vector<std::string>&& collection_names) {
+    collection_names_ = std::move(collection_names);
+}
+
+BatchDescribeCollectionsRequest&
+BatchDescribeCollectionsRequest::WithCollectionNames(std::vector<std::string>&& collection_names) {
+    SetCollectionNames(std::move(collection_names));
+    return *this;
+}
+
+BatchDescribeCollectionsRequest&
+BatchDescribeCollectionsRequest::AddCollectionName(const std::string& collection_name) {
+    collection_names_.push_back(collection_name);
+    return *this;
+}
+
+const std::vector<int64_t>&
+BatchDescribeCollectionsRequest::CollectionIDs() const {
+    return collection_ids_;
+}
+
+void
+BatchDescribeCollectionsRequest::SetCollectionIDs(std::vector<int64_t>&& collection_ids) {
+    collection_ids_ = std::move(collection_ids);
+}
+
+BatchDescribeCollectionsRequest&
+BatchDescribeCollectionsRequest::WithCollectionIDs(std::vector<int64_t>&& collection_ids) {
+    SetCollectionIDs(std::move(collection_ids));
+    return *this;
+}
+
+BatchDescribeCollectionsRequest&
+BatchDescribeCollectionsRequest::AddCollectionID(int64_t collection_id) {
+    collection_ids_.push_back(collection_id);
+    return *this;
+}
+
+}  // namespace milvus

src/impl/response/collection/BatchDescribeCollectionsResponse.cpp

@@ -0,0 +1,33 @@
+// Licensed to the LF AI & Data foundation under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "milvus/response/collection/BatchDescribeCollectionsResponse.h"
+
+#include <utility>
+
+namespace milvus {
+
+const std::vector<CollectionDesc>&
+BatchDescribeCollectionsResponse::Descs() const {
+    return descs_;
+}
+
+void
+BatchDescribeCollectionsResponse::SetDescs(std::vector<CollectionDesc>&& descs) {
+    descs_ = std::move(descs);
+}
+
+}  // namespace milvus

src/impl/response/collection/DescribeReplicasResponse.cpp

@@ -0,0 +1,33 @@
+// Licensed to the LF AI & Data foundation under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "milvus/response/collection/DescribeReplicasResponse.h"
+
+#include <utility>
+
+namespace milvus {
+
+const std::vector<ReplicaInfo>&
+DescribeReplicasResponse::Replicas() const {
+    return replicas_;
+}
+
+void
+DescribeReplicasResponse::SetReplicas(std::vector<ReplicaInfo>&& replicas) {
+    replicas_ = std::move(replicas);
+}
+
+}  // namespace milvus