fix: Revert "enhance: add resource group declarative api (#755)" (#859)

This reverts commit 491fe0d44d843cb556da898007d79a0db5c98b74.
Declarative Resource Group API should not released in 2.4.0.

Signed-off-by: chyezh <chyezh@outlook.com>

examples/main/java/io/milvus/ResourceGroupExample.java

@@ -1,81 +0,0 @@
-package io.milvus;
-
-import com.google.gson.Gson;
-
-import io.milvus.client.MilvusServiceClient;
-import io.milvus.resourcegroup.ResourceGroupManagement;
-import io.milvus.param.ConnectParam;
-
-public class ResourceGroupExample {
-    private static final ResourceGroupManagement manager;
-    private static final String rgName1 = "rg1";
-    private static final String rgName2 = "rg2";
-    private static Gson gson = new Gson();
-
-    static {
-        ConnectParam connectParam = ConnectParam.newBuilder()
-                .withHost("localhost")
-                .withPort(19530)
-                .withAuthorization("root", "Milvus")
-                .build();
-        manager = new ResourceGroupManagement(new MilvusServiceClient(connectParam));
-    }
-
-    private static void printResourceGroupInfo() throws Exception {
-        manager.listResourceGroups().forEach((name, rg) -> {
-            System.out.println(name);
-            System.out.println(gson.toJson(rg));
-        });
-    }
-
-    public static void main(String[] args) throws Exception {
-        // It's a demo to show how to use resource group management.
-        // It create a database-level-resource-group-control (single replica)
-        // management.
-        // Declarative resource group API can also achieve
-        // replica-level-resource-group-control (multi-replica) management.
-
-        printResourceGroupInfo();
-        // Initialize the cluster with 1 resource group
-        // default_rg: 1
-        manager.initializeCluster(1);
-        printResourceGroupInfo();
-
-        // Add one more node to default rg.
-        manager.scaleResourceGroupTo(ResourceGroupManagement.DEFAULT_RG, 2);
-        // add new query node.
-        // default_rg: 2
-        printResourceGroupInfo();
-
-        // Add a new resource group.
-        manager.createResourceGroup(rgName1, 1);
-        // default_rg: 2, rg1: 0
-        // add new query node.
-        // default_rg: 2, rg1: 1
-        printResourceGroupInfo();
-
-        // Add a new resource group.
-        manager.createResourceGroup(rgName2, 2);
-        // default_rg: 2, rg1: 1, rg2: 0
-        // add new query node.
-        // default_rg: 2, rg1: 1, rg2: 1
-        // add new query node.
-        // default_rg: 2, rg1: 1, rg2: 2
-        printResourceGroupInfo();
-
-        // downscale default_rg to 1
-        manager.scaleResourceGroupTo(ResourceGroupManagement.DEFAULT_RG, 1);
-        // default_rg: 1, rg1: 1, rg2: 2, recycle_rg: 1
-        printResourceGroupInfo();
-
-        manager.scaleResourceGroupTo(ResourceGroupManagement.DEFAULT_RG, 5);
-        manager.scaleResourceGroupTo(rgName1, 1);
-        manager.scaleResourceGroupTo(rgName2, 3);
-        // keep 8 query node in cluster.
-        printResourceGroupInfo();
-
-        // if there are replicas in other rg, transfer them to default together.
-        manager.transferDataBaseToResourceGroup("default", ResourceGroupManagement.DEFAULT_RG);
-        printResourceGroupInfo();
-    }
-}

examples/main/java/io/milvus/resourcegroup/NodeInfo.java

@@ -1,46 +0,0 @@
-package io.milvus.resourcegroup;
-
-import lombok.Getter;
-import lombok.NonNull;
-
-@Getter
-public class NodeInfo {
-    private long nodeId;
-    private String address;
-    private String hostname;
-
-    private NodeInfo(Builder builder) {
-        this.nodeId = builder.nodeId;
-        this.address = builder.address;
-        this.hostname = builder.hostname;
-    }
-
-    public static Builder newBuilder() {
-        return new Builder();
-    }
-
-    public static class Builder {
-        private long nodeId;
-        private String address;
-        private String hostname;
-
-        public Builder withNodeId(long nodeId) {
-            this.nodeId = nodeId;
-            return this;
-        }
-
-        public Builder withAddress(@NonNull String address) {
-            this.address = address;
-            return this;
-        }
-
-        public Builder withHostname(@NonNull String hostname) {
-            this.hostname = hostname;
-            return this;
-        }
-
-        public NodeInfo build() {
-            return new NodeInfo(this);
-        }
-    }
-}

examples/main/java/io/milvus/resourcegroup/ResourceGroupInfo.java

@@ -1,103 +0,0 @@
-package io.milvus.resourcegroup;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import io.milvus.common.resourcegroup.ResourceGroupConfig;
-import lombok.Getter;
-import lombok.NonNull;
-
-@Getter
-public class ResourceGroupInfo {
-    private String resourceGroupName;
-    private ResourceGroupConfig resourceGroupConfig;
-    private Set<String> fullDatabases; // databases belong to this resource group completely.
-    private Set<String> partialDatabases; // databases belong to this resource group partially, some collection is in
-                                          // other resource group.
-    private Set<NodeInfo> nodes; // actual query node in this resource group.
-
-    private ResourceGroupInfo(@NonNull Builder builder) {
-        this.resourceGroupName = builder.resourceGroupName;
-        this.resourceGroupConfig = builder.resourceGroupConfig;
-        this.fullDatabases = builder.fullDatabases;
-        if (this.fullDatabases == null) {
-            this.fullDatabases = new HashSet<String>();
-        }
-        this.partialDatabases = builder.partialDatabases;
-        if (this.partialDatabases == null) {
-            this.partialDatabases = new HashSet<String>();
-        }
-        this.nodes = builder.nodes;
-        if (this.nodes == null) {
-            this.nodes = new HashSet<NodeInfo>();
-        }
-    }
-
-    public static Builder newBuilder() {
-        return new Builder();
-    }
-
-    public static final class Builder {
-        private String resourceGroupName;
-        private ResourceGroupConfig resourceGroupConfig;
-        private Set<String> fullDatabases;
-        private Set<String> partialDatabases;
-        private Set<NodeInfo> nodes; // actual query node in this resource group.
-
-        public Builder withResourceGroupName(@NonNull String resourceGroupName) {
-            this.resourceGroupName = resourceGroupName;
-            return this;
-        }
-
-        public Builder addFullDatabases(@NonNull String databaseName) {
-            if (this.fullDatabases == null) {
-                this.fullDatabases = new HashSet<String>();
-            }
-            this.fullDatabases.add(databaseName);
-            return this;
-        }
-
-        public Builder addPartialDatabases(@NonNull String databaseName) {
-            if (this.partialDatabases == null) {
-                this.partialDatabases = new HashSet<String>();
-            }
-            this.partialDatabases.add(databaseName);
-            return this;
-        }
-
-        public Builder addAvailableNode(@NonNull NodeInfo node) {
-            if (this.nodes == null) {
-                this.nodes = new HashSet<NodeInfo>();
-            }
-            this.nodes.add(node);
-            return this;
-        }
-
-        public Builder withConfig(@NonNull ResourceGroupConfig resourceGroupConfig) {
-            this.resourceGroupConfig = resourceGroupConfig;
-            return this;
-        }
-
-        public ResourceGroupInfo build() {
-            return new ResourceGroupInfo(this);
-        }
-    }
-
-    /**
-     * Check if this resource group is the default resource group.
-     * 
-     * @return true if this resource group is the default resource group.
-     */
-    public boolean isDefaultResourceGroup() {
-        return this.resourceGroupName == ResourceGroupManagement.DEFAULT_RG;
-    }
-
-    /**
-     * Check if this resource group is the recycle resource group.
-     * 
-     * @return true if this resource group is the recycle resource group.
-     */
-    public boolean isRecycleResourceGroup() {
-        return this.resourceGroupName == ResourceGroupManagement.RECYCLE_RG;
-    }
-}

examples/main/java/io/milvus/resourcegroup/ResourceGroupManagement.java

@@ -1,282 +0,0 @@
-package io.milvus.resourcegroup;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import io.milvus.client.MilvusClient;
-import io.milvus.param.R;
-import io.milvus.param.RpcStatus;
-import io.milvus.param.collection.GetLoadStateParam;
-import io.milvus.param.collection.ShowCollectionsParam;
-import io.milvus.param.control.GetReplicasParam;
-import io.milvus.param.resourcegroup.CreateResourceGroupParam;
-import io.milvus.param.resourcegroup.DescribeResourceGroupParam;
-import io.milvus.param.resourcegroup.DropResourceGroupParam;
-import io.milvus.param.resourcegroup.ListResourceGroupsParam;
-import io.milvus.param.resourcegroup.TransferReplicaParam;
-import io.milvus.param.resourcegroup.UpdateResourceGroupsParam;
-import io.milvus.common.resourcegroup.ResourceGroupConfig;
-import io.milvus.common.resourcegroup.ResourceGroupLimit;
-import io.milvus.common.resourcegroup.ResourceGroupTransfer;
-import io.milvus.exception.MilvusException;
-import io.milvus.grpc.DescribeResourceGroupResponse;
-import io.milvus.grpc.GetLoadStateResponse;
-import io.milvus.grpc.GetReplicasResponse;
-import io.milvus.grpc.ListDatabasesResponse;
-import io.milvus.grpc.ListResourceGroupsResponse;
-import io.milvus.grpc.LoadState;
-import io.milvus.grpc.ShowCollectionsResponse;
-
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
-
-public class ResourceGroupManagement {
-    public static String RECYCLE_RG = "__recycle_resource_group";
-    public static String DEFAULT_RG = "__default_resource_group";
-    static Integer RECYCLE_RG_REQUEST_NODE_NUM = 0;
-    static Integer RECYCLE_RG_LIMIT_NODE_NUM = 100000;
-
-    protected static final Logger logger = LoggerFactory.getLogger(ResourceGroupManagement.class);
-
-    private MilvusClient client;
-
-    public ResourceGroupManagement(MilvusClient client) {
-        this.client = client;
-    }
-
-    /**
-     * list all resource groups.
-     * 
-     * @return map of resource group name and resource group info.
-     */
-    public Map<String, ResourceGroupInfo> listResourceGroups() throws Exception {
-        // List all resource groups.
-        R<ListResourceGroupsResponse> response = client
-                .listResourceGroups(ListResourceGroupsParam.newBuilder().build());
-        ListResourceGroupsResponse resourceGroups = unwrap(response);
-
-        // Describe all resource groups.
-        Map<String, ResourceGroupInfo.Builder> result = new HashMap<>();
-        for (String resourceGroupName : resourceGroups.getResourceGroupsList()) {
-            R<DescribeResourceGroupResponse> resourceGroupInfoResp = client.describeResourceGroup(
-                    DescribeResourceGroupParam.newBuilder().withGroupName(resourceGroupName).build());
-            DescribeResourceGroupResponse resourceGroupInfo = unwrap(resourceGroupInfoResp);
-
-            ResourceGroupInfo.Builder builder = ResourceGroupInfo.newBuilder()
-                    .withResourceGroupName(resourceGroupName)
-                    .withConfig(new ResourceGroupConfig(resourceGroupInfo.getResourceGroup().getConfig()));
-
-            resourceGroupInfo.getResourceGroup().getNodesList().forEach(node -> {
-                builder.addAvailableNode(NodeInfo.newBuilder()
-                        .withNodeId(node.getNodeId())
-                        .withAddress(node.getAddress())
-                        .withHostname(node.getHostname())
-                        .build());
-            });
-            result.put(resourceGroupName, builder);
-        }
-
-        // Get map info between resource group and database.
-        R<ListDatabasesResponse> listDatabaseGroupsResp = client.listDatabases();
-        ListDatabasesResponse databases = unwrap(listDatabaseGroupsResp);
-        // list all collections.
-        for (String dbName : databases.getDbNamesList()) {
-            R<ShowCollectionsResponse> resp = client.showCollections(ShowCollectionsParam.newBuilder()
-                    .withDatabaseName(dbName)
-                    .build());
-            ShowCollectionsResponse showCollectionResponse = unwrap(resp);
-
-            Set<String> resourceGroupNames = new HashSet<>();
-            for (String collection : showCollectionResponse.getCollectionNamesList()) {
-                String resourceGroupName = getCollectionResourceGroupName(dbName, collection);
-                if (resourceGroupName != null) {
-                    resourceGroupNames.add(resourceGroupName);
-                }
-            }
-
-            if (resourceGroupNames.size() == 0) {
-                logger.info("no loaded collection in database {}", dbName);
-                continue;
-            } else if (resourceGroupNames.size() == 1) {
-                // all loaded collection in one resource group.
-                for (String resourceGroupName : resourceGroupNames) {
-                    result.get(resourceGroupName).addFullDatabases(dbName);
-                }
-            } else {
-                // loaded collection in same db in different resource group.
-                for (String resourceGroupName : resourceGroupNames) {
-                    result.get(resourceGroupName).addPartialDatabases(dbName);
-                }
-            }
-        }
-
-        return result.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().build()));
-    }
-
-    /**
-     * Initialize the cluster with a recycle resource group.
-     * 
-     * @param defaultResourceGroupNodeNum The number of query nodes to initialize
-     *                                    the default resource group.
-     */
-    public void initializeCluster(Integer defaultResourceGroupNodeNum) throws Exception {
-        // Create a recycle resource group to hold all redundant query node.
-        R<RpcStatus> resp = client.createResourceGroup(CreateResourceGroupParam.newBuilder()
-                .withGroupName(RECYCLE_RG)
-                .withConfig(ResourceGroupConfig.newBuilder()
-                        .withRequests(new ResourceGroupLimit(RECYCLE_RG_REQUEST_NODE_NUM))
-                        .withLimits(new ResourceGroupLimit(RECYCLE_RG_LIMIT_NODE_NUM))
-                        .build())
-                .build());
-        unwrap(resp);
-        this.scaleResourceGroupTo(DEFAULT_RG, defaultResourceGroupNodeNum);
-    }
-
-    /**
-     * Create a resource group with given nodeNum.
-     *
-     * @param resourceGroupName
-     * @param requestNodeNum
-     */
-    public void createResourceGroup(String resourceGroupName, Integer requestNodeNum) throws Exception {
-        R<RpcStatus> resp = client.createResourceGroup(CreateResourceGroupParam.newBuilder()
-                .withGroupName(resourceGroupName)
-                .withConfig(ResourceGroupConfig.newBuilder()
-                        .withRequests(new ResourceGroupLimit(requestNodeNum))
-                        .withLimits(new ResourceGroupLimit(requestNodeNum))
-                        .withFrom(Arrays.asList(new ResourceGroupTransfer(RECYCLE_RG)))
-                        .withTo(Arrays.asList(new ResourceGroupTransfer(RECYCLE_RG)))
-                        .build())
-                .build());
-        unwrap(resp);
-    }
-
-    /**
-     * Drop a resource group, before drop resource group, you should scale the
-     * resource group to 0 first.
-     * 
-     * @param resourceGroupName
-     */
-    public void dropResourceGroup(String resourceGroupName) throws Exception {
-        R<RpcStatus> resp = client
-                .dropResourceGroup(DropResourceGroupParam.newBuilder().withGroupName(resourceGroupName).build());
-        unwrap(resp);
-    }
-
-    /**
-     * Scale to the number of nodes in a resource group.
-     * 
-     * @param resourceGroupName
-     * @param requestNodeNum
-     */
-    public void scaleResourceGroupTo(String resourceGroupName, Integer requestNodeNum) throws Exception {
-        if (resourceGroupName == RECYCLE_RG) {
-            throw new IllegalArgumentException("Cannot scale to recycle resource group");
-        }
-        // Update a resource group with given nodeNum.
-        // Set the resource group transfer to recycle resource group by default.
-        R<RpcStatus> resp = client
-                .updateResourceGroups(UpdateResourceGroupsParam.newBuilder()
-                        .putResourceGroup(resourceGroupName, ResourceGroupConfig.newBuilder()
-                                .withRequests(new ResourceGroupLimit(requestNodeNum))
-                                .withLimits(new ResourceGroupLimit(requestNodeNum))
-                                .withFrom(Arrays.asList(new ResourceGroupTransfer(RECYCLE_RG)))
-                                .withTo(Arrays.asList(new ResourceGroupTransfer(RECYCLE_RG)))
-                                .build())
-                        .build());
-        unwrap(resp);
-    }
-
-    /**
-     * Transfer a database to specified resource group.
-     * Only support single replica now.
-     * 
-     * @param dbName            The name of the database to transfer.
-     * @param resourceGroupName The name of the target resource group.
-     */
-    public void transferDataBaseToResourceGroup(String dbName, String resourceGroupName) throws Exception {
-        R<ShowCollectionsResponse> resp = client.showCollections(ShowCollectionsParam.newBuilder()
-                .withDatabaseName(dbName)
-                .build());
-        ShowCollectionsResponse showCollectionResponse = unwrap(resp);
-
-        for (String collection : showCollectionResponse.getCollectionNamesList()) {
-            String currentResourceGroupName = getCollectionResourceGroupName(dbName, collection);
-            // skip if the collection is not loaded or is already added to resourceGroup.
-            if (currentResourceGroupName == null || currentResourceGroupName == resourceGroupName) {
-                continue;
-            }
-            R<RpcStatus> status = client.transferReplica(TransferReplicaParam.newBuilder()
-                    .withDatabaseName(dbName)
-                    .withCollectionName(collection)
-                    .withSourceGroupName(currentResourceGroupName)
-                    .withTargetGroupName(resourceGroupName)
-                    .withReplicaNumber(1L)
-                    .build());
-            unwrap(status);
-        }
-    }
-
-    /**
-     * get the resource group name of the collection.
-     * 
-     * @param dbName
-     * @param collection
-     * @return
-     * @throws Exception
-     */
-    private String getCollectionResourceGroupName(String dbName, String collection) throws Exception {
-        R<GetLoadStateResponse> loaded = client.getLoadState(
-                GetLoadStateParam.newBuilder().withDatabaseName(dbName).withCollectionName(collection).build());
-        GetLoadStateResponse loadedState = unwrap(loaded);
-
-        if (loadedState.getState() != LoadState.LoadStateLoaded) {
-            logger.info("Collection {} @ Database {} is not loaded, state is {}, skip it", collection, dbName,
-                    loaded.getData().getState());
-            return null;
-        }
-
-        // Get the current resource group of the collection.
-        R<GetReplicasResponse> replicaResp = client
-                .getReplicas(
-                        GetReplicasParam.newBuilder().withCollectionName(collection).withDatabaseName(dbName).build());
-        GetReplicasResponse replicas = unwrap(replicaResp);
-
-        if (replicas.getReplicasCount() > 1) {
-            // Multi replica is supported with multiple resource group.
-            // But current example only support single replica, so throw exception here.
-            // You can modify the code to support multi replicas.
-            throw new RuntimeException(String.format(
-                    "Replica number {} is greater than 1, did not support now in current example, you can modify the code to support it.",
-                    replicas.getReplicasCount()));
-        }
-        if (replicas.getReplicasCount() == 0) {
-            logger.warn("Collection {} @ Database {} has no replica, skip it", collection, dbName);
-            return null;
-        }
-
-        return replicas.getReplicasList().get(0).getResourceGroupName();
-    }
-
-    /**
-     * 
-     * @param <T>
-     * @param response
-     * @return
-     */
-    private <T> T unwrap(R<T> response) throws Exception {
-        if (response.getStatus() != 0) {
-            if (response.getException() instanceof MilvusException) {
-                MilvusException e = (MilvusException) response.getException();
-                throw e;
-            }
-            logger.warn("at unwrap", response.getException());
-            throw response.getException();
-        }
-        return response.getData();
-    }
-}

src/main/java/io/milvus/client/AbstractMilvusGrpcClient.java

@@ -1989,15 +1989,22 @@ public abstract class AbstractMilvusGrpcClient implements MilvusClient {
         String title = String.format("GetReplicasRequest collectionName:%s", requestParam.getCollectionName());
 
         try {
+            R<DescribeCollectionResponse> descResp = describeCollection(DescribeCollectionParam.newBuilder()
+                    .withCollectionName(requestParam.getCollectionName())
+                    .build());
+            if (descResp.getStatus() != R.Status.Success.getCode()) {
+                return R.failed(descResp.getException());
+            }
+
             GetReplicasRequest.Builder builder = GetReplicasRequest.newBuilder()
-                    .setCollectionName(requestParam.getCollectionName())
+                    .setCollectionID(descResp.getData().getCollectionID())
                     .setWithShardNodes(requestParam.isWithShardNodes());
 
             if (StringUtils.isNotBlank(requestParam.getDatabaseName())) {
                 builder.setDbName(requestParam.getDatabaseName());
             }
-            GetReplicasRequest getReplicasRequest = builder.build();
-            GetReplicasResponse response = blockingStub().getReplicas(getReplicasRequest);
+
+            GetReplicasResponse response = blockingStub().getReplicas(builder.build());
             handleResponse(title, response.getStatus());
             return R.success(response);
         } catch (StatusRuntimeException e) {
@@ -2753,7 +2760,6 @@ public abstract class AbstractMilvusGrpcClient implements MilvusClient {
         try {
             CreateResourceGroupRequest request = CreateResourceGroupRequest.newBuilder()
                     .setResourceGroup(requestParam.getGroupName())
-                    .setConfig(requestParam.getConfig().toGRPC())
                     .build();
 
             Status response = blockingStub().createResourceGroup(request);
@@ -2907,28 +2913,6 @@ public abstract class AbstractMilvusGrpcClient implements MilvusClient {
         }
     }
 
-    @Override
-    public R<RpcStatus> updateResourceGroups(UpdateResourceGroupsParam requestParam) {
-        if (!clientIsReady()) {
-            return R.failed(new ClientNotConnectedException("Client rpc channel is not ready"));
-        }
-
-        logDebug(requestParam.toString());
-
-        try {
-            UpdateResourceGroupsRequest request = requestParam.toGRPC();
-
-            Status response = blockingStub().updateResourceGroups(request);
-            handleResponse(requestParam.toString(), response);
-            return R.success(new RpcStatus(RpcStatus.SUCCESS_MSG));
-        } catch (StatusRuntimeException e) {
-            logError("{} RPC failed! Exception:{}", requestParam.toString(), e);
-            return R.failed(e);
-        } catch (Exception e) {
-            logError("{} failed! Exception:{}", requestParam.toString(), e);
-            return R.failed(e);
-        }
-    }
 
     ///////////////////// High Level API//////////////////////
     @Override

src/main/java/io/milvus/client/MilvusClient.java

@@ -731,15 +731,6 @@ public interface MilvusClient {
      */
     R<RpcStatus> createResourceGroup(CreateResourceGroupParam requestParam);
 
-
-    /**
-     * Update resource groups.
-     * 
-     * @param requestParam {@link UpdateResourceGroupsParam}
-     * @return {status:result code, data:RpcStatus{msg: result message}}
-     */
-    R<RpcStatus> updateResourceGroups(UpdateResourceGroupsParam requestParam);
-
     /**
      * Drop a resource group.
      *

src/main/java/io/milvus/client/MilvusMultiServiceClient.java

@@ -603,11 +603,6 @@ public class MilvusMultiServiceClient implements MilvusClient {
         return this.clusterFactory.getMaster().getClient().createResourceGroup(requestParam);
     }
 
-    @Override
-    public R<RpcStatus> updateResourceGroups(UpdateResourceGroupsParam requestParam) {
-        return this.clusterFactory.getMaster().getClient().updateResourceGroups(requestParam);
-    }
-
     @Override
     public R<RpcStatus> dropResourceGroup(DropResourceGroupParam requestParam) {
         return this.clusterFactory.getMaster().getClient().dropResourceGroup(requestParam);

src/main/java/io/milvus/client/MilvusServiceClient.java

@@ -730,11 +730,6 @@ public class MilvusServiceClient extends AbstractMilvusGrpcClient {
         return retry(()-> super.transferReplica(requestParam));
     }
 
-    @Override
-    public R<RpcStatus> updateResourceGroups(UpdateResourceGroupsParam requestParam) {
-        return retry(()-> super.updateResourceGroups(requestParam));
-    }
-
     @Override
     public R<RpcStatus> createCollection(CreateSimpleCollectionParam requestParam) {
         return retry(()-> super.createCollection(requestParam));

src/main/java/io/milvus/common/resourcegroup/ResourceGroupConfig.java

@@ -1,105 +0,0 @@
-package io.milvus.common.resourcegroup;
-
-import java.util.stream.Collectors;
-import java.util.List;
-import lombok.NonNull;
-import lombok.Getter;
-
-@Getter
-public class ResourceGroupConfig {
-    private final ResourceGroupLimit requests;
-    private final ResourceGroupLimit limits;
-    private final List<ResourceGroupTransfer> from;
-    private final List<ResourceGroupTransfer> to;
-
-    private ResourceGroupConfig(Builder builder) {
-        this.requests = builder.requests;
-        this.limits = builder.limits;
-
-        if (null == builder.from) {
-            this.from = List.of();
-        } else {
-            this.from = builder.from;
-        }
-
-        if (null == builder.to) {
-            this.to = List.of();
-        } else {
-            this.to = builder.to;
-        }
-    }
-
-    public static Builder newBuilder() {
-        return new Builder();
-    }
-
-    public static final class Builder {
-        private ResourceGroupLimit requests;
-        private ResourceGroupLimit limits;
-        private List<ResourceGroupTransfer> from;
-        private List<ResourceGroupTransfer> to;
-
-        private Builder() {
-        }
-
-        public Builder withRequests(@NonNull ResourceGroupLimit requests) {
-            this.requests = requests;
-            return this;
-        }
-
-        public Builder withLimits(@NonNull ResourceGroupLimit limits) {
-            this.limits = limits;
-            return this;
-        }
-
-        /**
-         * Set the transfer from list.
-         * 
-         * @param from
-         * @return
-         */
-        public Builder withFrom(@NonNull List<ResourceGroupTransfer> from) {
-            this.from = from;
-            return this;
-        }
-
-        /**
-         * Set the transfer to list.
-         * 
-         * @param to
-         * @return
-         */
-        public Builder withTo(@NonNull List<ResourceGroupTransfer> to) {
-            this.to = to;
-            return this;
-        }
-
-        public ResourceGroupConfig build() {
-            return new ResourceGroupConfig(this);
-        }
-    }
-
-    public ResourceGroupConfig(@NonNull io.milvus.grpc.ResourceGroupConfig grpcConfig) {
-        this.requests = new ResourceGroupLimit(grpcConfig.getRequests());
-        this.limits = new ResourceGroupLimit(grpcConfig.getLimits());
-        this.from = grpcConfig.getTransferFromList().stream()
-                .map(transfer -> new ResourceGroupTransfer(transfer))
-                .collect(Collectors.toList());
-        this.to = grpcConfig.getTransferToList().stream()
-                .map(transfer -> new ResourceGroupTransfer(transfer))
-                .collect(Collectors.toList());
-    }
-
-    public @NonNull io.milvus.grpc.ResourceGroupConfig toGRPC() {
-        io.milvus.grpc.ResourceGroupConfig.Builder builder = io.milvus.grpc.ResourceGroupConfig.newBuilder()
-                .setRequests(io.milvus.grpc.ResourceGroupLimit.newBuilder().setNodeNum(requests.getNodeNum()))
-                .setLimits(io.milvus.grpc.ResourceGroupLimit.newBuilder().setNodeNum(limits.getNodeNum()));
-        for (ResourceGroupTransfer transfer : from) {
-            builder.addTransferFrom(transfer.toGRPC());
-        }
-        for (ResourceGroupTransfer transfer : to) {
-            builder.addTransferTo(transfer.toGRPC());
-        }
-        return builder.build();
-    }
-}

src/main/java/io/milvus/common/resourcegroup/ResourceGroupLimit.java

@@ -1,38 +0,0 @@
-package io.milvus.common.resourcegroup;
-
-import org.jetbrains.annotations.NotNull;
-
-import lombok.Getter;
-import lombok.NonNull;
-
-@Getter
-public class ResourceGroupLimit {
-    private Integer nodeNum;
-
-    /**
-     * Constructor with node number.
-     * 
-     * @param nodeNum
-     */
-    public ResourceGroupLimit(@NonNull Integer nodeNum) {
-        this.nodeNum = nodeNum;
-    }
-
-    /**
-     * Constructor from grpc
-     * 
-     * @param grpcLimit
-     */
-    public ResourceGroupLimit(@NonNull io.milvus.grpc.ResourceGroupLimit grpcLimit) {
-        this.nodeNum = grpcLimit.getNodeNum();
-    }
-
-    /**
-     * Transfer to grpc
-     * 
-     * @return io.milvus.grpc.ResourceGroupLimit
-     */
-    public @NonNull io.milvus.grpc.ResourceGroupLimit toGRPC() {
-        return io.milvus.grpc.ResourceGroupLimit.newBuilder().setNodeNum(nodeNum).build();
-    }
-}

src/main/java/io/milvus/common/resourcegroup/ResourceGroupTransfer.java

@@ -1,38 +0,0 @@
-package io.milvus.common.resourcegroup;
-
-import lombok.Getter;
-import lombok.NonNull;
-
-@Getter
-public class ResourceGroupTransfer {
-    private String resourceGroupName;
-
-    /**
-     * Constructor with resource group name.
-     * 
-     * @param resourceGroupName
-     */
-    public ResourceGroupTransfer(@NonNull String resourceGroupName) {
-        this.resourceGroupName = resourceGroupName;
-    }
-
-    /**
-     * Constructor from grpc
-     * 
-     * @param grpcTransfer
-     */
-    public ResourceGroupTransfer(@NonNull io.milvus.grpc.ResourceGroupTransfer grpcTransfer) {
-        this.resourceGroupName = grpcTransfer.getResourceGroup();
-    }
-
-    /**
-     * Transfer to grpc
-     * 
-     * @return io.milvus.grpc.ResourceGroupTransfer
-     */
-    public @NonNull io.milvus.grpc.ResourceGroupTransfer toGRPC() {
-        return io.milvus.grpc.ResourceGroupTransfer.newBuilder()
-                .setResourceGroup(resourceGroupName)
-                .build();
-    }
-}

src/main/java/io/milvus/param/control/GetReplicasParam.java

@@ -56,12 +56,12 @@ public class GetReplicasParam {
         }
 
         /**
-         * Sets the database name. Database name cannot be empty or null.
-         * 
-         * @param databaseName
-         * @return
+         * Sets the database name. database name can be nil.
+         *
+         * @param databaseName database name
+         * @return <code>Builder</code>
          */
-        public Builder withDatabaseName(@NonNull String databaseName) {
+        public Builder withDatabaseName(String databaseName) {
             this.databaseName = databaseName;
             return this;
         }

src/main/java/io/milvus/param/resourcegroup/CreateResourceGroupParam.java

@@ -20,7 +20,6 @@
 
 package io.milvus.param.resourcegroup;
 
-import io.milvus.common.resourcegroup.ResourceGroupConfig;
 import io.milvus.exception.ParamException;
 import io.milvus.param.ParamUtils;
 import lombok.Getter;
@@ -31,11 +30,9 @@ import lombok.ToString;
 @ToString
 public class CreateResourceGroupParam {
     private final String groupName;
-    private final ResourceGroupConfig config;
 
     private CreateResourceGroupParam(@NonNull Builder builder) {
         this.groupName = builder.groupName;
-        this.config = builder.config;
     }
 
     public static Builder newBuilder() {
@@ -47,7 +44,6 @@ public class CreateResourceGroupParam {
      */
     public static final class Builder {
         private String groupName;
-        private ResourceGroupConfig config;
 
         private Builder() {
         }
@@ -63,17 +59,6 @@ public class CreateResourceGroupParam {
             return this;
         }
 
-        /**
-         * Sets the resource group config.
-         * 
-         * @param config configuration of resource group
-         * @return <code>Builder</code>
-         */
-        public Builder withConfig(@NonNull ResourceGroupConfig config) {
-            this.config = config;
-            return this;
-        }
-
         /**
          * Verifies parameters and creates a new {@link CreateResourceGroupParam} instance.
          *

src/main/java/io/milvus/param/resourcegroup/UpdateResourceGroupsParam.java

@@ -1,99 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) 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.
- */
-
-package io.milvus.param.resourcegroup;
-
-import io.milvus.common.resourcegroup.ResourceGroupConfig;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import lombok.Getter;
-import lombok.NonNull;
-
-@Getter
-public class UpdateResourceGroupsParam {
-    private final Map<String, ResourceGroupConfig> resourceGroups;
-
-    private UpdateResourceGroupsParam(Builder builder) {
-        if (null == builder.resourceGroups || builder.resourceGroups.isEmpty()) {
-            throw new IllegalArgumentException("resourceGroups cannot be empty");
-        }
-        this.resourceGroups = builder.resourceGroups;
-    }
-
-    public static Builder newBuilder() {
-        return new Builder();
-    }
-
-    /**
-     * Builder for {@link UpdateResourceGroupsParam} class.
-     * 
-     */
-    public static final class Builder {
-        private Map<String, ResourceGroupConfig> resourceGroups;
-
-        private Builder() {
-        }
-
-        public Builder putResourceGroup(@NonNull String resourceGroupName, @NonNull ResourceGroupConfig resourceGroup) {
-            if (null == this.resourceGroups) {
-                this.resourceGroups = new HashMap<>();
-            }
-            this.resourceGroups.put(resourceGroupName, resourceGroup);
-            return this;
-        }
-
-        /**
-         * Builds the UpdateResourceGroupsParam object.
-         * 
-         * @return {@link UpdateResourceGroupsParam}
-         */
-        public UpdateResourceGroupsParam build() {
-            return new UpdateResourceGroupsParam(this);
-        }
-    }
-
-    /**
-     * Converts to grpc request.
-     * 
-     * @return io.milvus.grpc.UpdateResourceGroupsRequest
-     */
-    public @NonNull io.milvus.grpc.UpdateResourceGroupsRequest toGRPC() {
-        io.milvus.grpc.UpdateResourceGroupsRequest.Builder builder = io.milvus.grpc.UpdateResourceGroupsRequest
-                .newBuilder();
-        resourceGroups.forEach((k, v) -> {
-            builder.putResourceGroups(k, v.toGRPC());
-        });
-        return builder.build();
-    }
-
-    /**
-     * Constructs a <code>String</code> by {@link UpdateResourceGroupsParam}
-     * instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return String.format("UpdateResourceGroupsRequest{resourceGroupNames:%s}",
-                resourceGroups.keySet().stream().collect(Collectors.joining(",")));
-    }
-}