Browse Source

Refine code (#800)

Signed-off-by: yhmo <yihua.mo@zilliz.com>
groot 1 year ago
parent
commit
136d02f4ee
61 changed files with 612 additions and 809 deletions
  1. 141 78
      src/main/java/io/milvus/client/AbstractMilvusGrpcClient.java
  2. 8 1
      src/main/java/io/milvus/param/ParamUtils.java
  3. 3 12
      src/main/java/io/milvus/param/RpcStatus.java
  4. 2 13
      src/main/java/io/milvus/param/alias/AlterAliasParam.java
  5. 2 13
      src/main/java/io/milvus/param/alias/CreateAliasParam.java
  6. 2 12
      src/main/java/io/milvus/param/alias/DropAliasParam.java
  7. 2 12
      src/main/java/io/milvus/param/alias/ListAliasesParam.java
  8. 17 15
      src/main/java/io/milvus/param/bulkinsert/BulkInsertParam.java
  9. 3 12
      src/main/java/io/milvus/param/bulkinsert/GetBulkInsertStateParam.java
  10. 17 15
      src/main/java/io/milvus/param/bulkinsert/ListBulkInsertTasksParam.java
  11. 3 14
      src/main/java/io/milvus/param/collection/AlterCollectionParam.java
  12. 3 12
      src/main/java/io/milvus/param/collection/CreateDatabaseParam.java
  13. 2 10
      src/main/java/io/milvus/param/collection/DropCollectionParam.java
  14. 3 11
      src/main/java/io/milvus/param/collection/DropDatabaseParam.java
  15. 3 17
      src/main/java/io/milvus/param/collection/FieldType.java
  16. 3 14
      src/main/java/io/milvus/param/collection/FlushParam.java
  17. 2 12
      src/main/java/io/milvus/param/collection/GetCollectionStatisticsParam.java
  18. 2 1
      src/main/java/io/milvus/param/collection/GetLoadStateParam.java
  19. 17 18
      src/main/java/io/milvus/param/collection/GetLoadingProgressParam.java
  20. 2 11
      src/main/java/io/milvus/param/collection/ReleaseCollectionParam.java
  21. 31 14
      src/main/java/io/milvus/param/collection/RenameCollectionParam.java
  22. 3 12
      src/main/java/io/milvus/param/collection/ShowCollectionsParam.java
  23. 2 12
      src/main/java/io/milvus/param/control/GetCompactionPlansParam.java
  24. 2 12
      src/main/java/io/milvus/param/control/GetCompactionStateParam.java
  25. 17 14
      src/main/java/io/milvus/param/control/GetFlushAllStateParam.java
  26. 19 15
      src/main/java/io/milvus/param/control/GetFlushStateParam.java
  27. 2 11
      src/main/java/io/milvus/param/control/GetMetricsParam.java
  28. 2 11
      src/main/java/io/milvus/param/control/GetPersistentSegmentInfoParam.java
  29. 2 11
      src/main/java/io/milvus/param/control/GetQuerySegmentInfoParam.java
  30. 16 11
      src/main/java/io/milvus/param/control/GetReplicasParam.java
  31. 31 14
      src/main/java/io/milvus/param/control/LoadBalanceParam.java
  32. 2 12
      src/main/java/io/milvus/param/control/ManualCompactParam.java
  33. 2 11
      src/main/java/io/milvus/param/credential/CreateCredentialParam.java
  34. 2 11
      src/main/java/io/milvus/param/credential/DeleteCredentialParam.java
  35. 2 9
      src/main/java/io/milvus/param/credential/ListCredUsersParam.java
  36. 2 11
      src/main/java/io/milvus/param/credential/UpdateCredentialParam.java
  37. 16 13
      src/main/java/io/milvus/param/dml/DeleteParam.java
  38. 3 31
      src/main/java/io/milvus/param/dml/InsertParam.java
  39. 16 18
      src/main/java/io/milvus/param/dml/QueryParam.java
  40. 18 22
      src/main/java/io/milvus/param/dml/SearchParam.java
  41. 2 17
      src/main/java/io/milvus/param/dml/UpsertParam.java
  42. 3 15
      src/main/java/io/milvus/param/index/AlterIndexParam.java
  43. 2 12
      src/main/java/io/milvus/param/index/DescribeIndexParam.java
  44. 16 12
      src/main/java/io/milvus/param/index/DropIndexParam.java
  45. 16 12
      src/main/java/io/milvus/param/index/GetIndexBuildProgressParam.java
  46. 16 12
      src/main/java/io/milvus/param/index/GetIndexStateParam.java
  47. 16 12
      src/main/java/io/milvus/param/partition/CreatePartitionParam.java
  48. 16 12
      src/main/java/io/milvus/param/partition/DropPartitionParam.java
  49. 16 13
      src/main/java/io/milvus/param/partition/GetPartitionStatisticsParam.java
  50. 16 12
      src/main/java/io/milvus/param/partition/HasPartitionParam.java
  51. 3 14
      src/main/java/io/milvus/param/partition/LoadPartitionsParam.java
  52. 17 12
      src/main/java/io/milvus/param/partition/ReleasePartitionsParam.java
  53. 17 13
      src/main/java/io/milvus/param/partition/ShowPartitionsParam.java
  54. 2 11
      src/main/java/io/milvus/param/resourcegroup/CreateResourceGroupParam.java
  55. 2 11
      src/main/java/io/milvus/param/resourcegroup/DescribeResourceGroupParam.java
  56. 2 11
      src/main/java/io/milvus/param/resourcegroup/DropResourceGroupParam.java
  57. 2 0
      src/main/java/io/milvus/param/resourcegroup/ListResourceGroupsParam.java
  58. 2 13
      src/main/java/io/milvus/param/resourcegroup/TransferNodeParam.java
  59. 2 15
      src/main/java/io/milvus/param/resourcegroup/TransferReplicaParam.java
  60. 16 1
      src/main/java/io/milvus/param/role/SelectGrantForRoleParam.java
  61. 1 1
      src/main/java/io/milvus/response/SearchResultsWrapper.java

+ 141 - 78
src/main/java/io/milvus/client/AbstractMilvusGrpcClient.java

@@ -616,12 +616,18 @@ public abstract class AbstractMilvusGrpcClient implements MilvusClient {
         String title = String.format("RenameCollectionRequest collectionName:%s", requestParam.getOldCollectionName());
         String title = String.format("RenameCollectionRequest collectionName:%s", requestParam.getOldCollectionName());
 
 
         try {
         try {
-            RenameCollectionRequest renameCollectionRequest = RenameCollectionRequest.newBuilder()
+            RenameCollectionRequest.Builder builder = RenameCollectionRequest.newBuilder()
                     .setOldName(requestParam.getOldCollectionName())
                     .setOldName(requestParam.getOldCollectionName())
-                    .setNewName(requestParam.getNewCollectionName())
-                    .build();
+                    .setNewName(requestParam.getNewCollectionName());
+
+            if (StringUtils.isNotEmpty(requestParam.getOldDatabaseName())) {
+                builder.setDbName(requestParam.getOldDatabaseName());
+            }
+            if (StringUtils.isNotEmpty(requestParam.getNewDatabaseName())) {
+                builder.setNewDBName(requestParam.getNewDatabaseName());
+            }
 
 
-            Status response = blockingStub().renameCollection(renameCollectionRequest);
+            Status response = blockingStub().renameCollection(builder.build());
             handleResponse(title, response);
             handleResponse(title, response);
             return R.success(new RpcStatus(RpcStatus.SUCCESS_MSG));
             return R.success(new RpcStatus(RpcStatus.SUCCESS_MSG));
         } catch (StatusRuntimeException e) {
         } catch (StatusRuntimeException e) {
@@ -851,12 +857,15 @@ public abstract class AbstractMilvusGrpcClient implements MilvusClient {
                 requestParam.getCollectionName(), requestParam.getPartitionName());
                 requestParam.getCollectionName(), requestParam.getPartitionName());
 
 
         try {
         try {
-            CreatePartitionRequest createPartitionRequest = CreatePartitionRequest.newBuilder()
+            CreatePartitionRequest.Builder builder = CreatePartitionRequest.newBuilder()
                     .setCollectionName(requestParam.getCollectionName())
                     .setCollectionName(requestParam.getCollectionName())
-                    .setPartitionName(requestParam.getPartitionName())
-                    .build();
+                    .setPartitionName(requestParam.getPartitionName());
+
+            if (StringUtils.isNotEmpty(requestParam.getDatabaseName())) {
+                builder.setDbName(requestParam.getDatabaseName());
+            }
 
 
-            Status response = blockingStub().createPartition(createPartitionRequest);
+            Status response = blockingStub().createPartition(builder.build());
             handleResponse(title, response);
             handleResponse(title, response);
             return R.success(new RpcStatus(RpcStatus.SUCCESS_MSG));
             return R.success(new RpcStatus(RpcStatus.SUCCESS_MSG));
         } catch (StatusRuntimeException e) {
         } catch (StatusRuntimeException e) {
@@ -879,12 +888,15 @@ public abstract class AbstractMilvusGrpcClient implements MilvusClient {
                 requestParam.getCollectionName(), requestParam.getPartitionName());
                 requestParam.getCollectionName(), requestParam.getPartitionName());
 
 
         try {
         try {
-            DropPartitionRequest dropPartitionRequest = DropPartitionRequest.newBuilder()
+            DropPartitionRequest.Builder builder = DropPartitionRequest.newBuilder()
                     .setCollectionName(requestParam.getCollectionName())
                     .setCollectionName(requestParam.getCollectionName())
-                    .setPartitionName(requestParam.getPartitionName())
-                    .build();
+                    .setPartitionName(requestParam.getPartitionName());
+
+            if (StringUtils.isNotEmpty(requestParam.getDatabaseName())) {
+                builder.setDbName(requestParam.getDatabaseName());
+            }
 
 
-            Status response = blockingStub().dropPartition(dropPartitionRequest);
+            Status response = blockingStub().dropPartition(builder.build());
             handleResponse(title, response);
             handleResponse(title, response);
             return R.success(new RpcStatus(RpcStatus.SUCCESS_MSG));
             return R.success(new RpcStatus(RpcStatus.SUCCESS_MSG));
         } catch (StatusRuntimeException e) {
         } catch (StatusRuntimeException e) {
@@ -907,12 +919,15 @@ public abstract class AbstractMilvusGrpcClient implements MilvusClient {
                 requestParam.getCollectionName(), requestParam.getPartitionName());
                 requestParam.getCollectionName(), requestParam.getPartitionName());
 
 
         try {
         try {
-            HasPartitionRequest hasPartitionRequest = HasPartitionRequest.newBuilder()
+            HasPartitionRequest.Builder builder = HasPartitionRequest.newBuilder()
                     .setCollectionName(requestParam.getCollectionName())
                     .setCollectionName(requestParam.getCollectionName())
-                    .setPartitionName(requestParam.getPartitionName())
-                    .build();
+                    .setPartitionName(requestParam.getPartitionName());
+
+            if (StringUtils.isNotEmpty(requestParam.getDatabaseName())) {
+                builder.setDbName(requestParam.getDatabaseName());
+            }
 
 
-            BoolResponse response = blockingStub().hasPartition(hasPartitionRequest);
+            BoolResponse response = blockingStub().hasPartition(builder.build());
             handleResponse(title, response.getStatus());
             handleResponse(title, response.getStatus());
             Boolean result = response.getValue();
             Boolean result = response.getValue();
             return R.success(result);
             return R.success(result);
@@ -941,12 +956,12 @@ public abstract class AbstractMilvusGrpcClient implements MilvusClient {
                     .addAllPartitionNames(requestParam.getPartitionNames())
                     .addAllPartitionNames(requestParam.getPartitionNames())
                     .addAllResourceGroups(requestParam.getResourceGroups())
                     .addAllResourceGroups(requestParam.getResourceGroups())
                     .setRefresh(requestParam.isRefresh());
                     .setRefresh(requestParam.isRefresh());
+
             if (StringUtils.isNotEmpty(requestParam.getDatabaseName())) {
             if (StringUtils.isNotEmpty(requestParam.getDatabaseName())) {
                 builder.setDbName(requestParam.getDatabaseName());
                 builder.setDbName(requestParam.getDatabaseName());
             }
             }
-            LoadPartitionsRequest loadPartitionsRequest = builder.build();
 
 
-            Status response = blockingStub().loadPartitions(loadPartitionsRequest);
+            Status response = blockingStub().loadPartitions(builder.build());
             handleResponse(title, response);
             handleResponse(title, response);
 
 
             // sync load, wait until all partitions finish loading
             // sync load, wait until all partitions finish loading
@@ -975,12 +990,15 @@ public abstract class AbstractMilvusGrpcClient implements MilvusClient {
         String title = String.format("ReleasePartitionsRequest collectionName:%s", requestParam.getCollectionName());
         String title = String.format("ReleasePartitionsRequest collectionName:%s", requestParam.getCollectionName());
 
 
         try {
         try {
-            ReleasePartitionsRequest releasePartitionsRequest = ReleasePartitionsRequest.newBuilder()
+            ReleasePartitionsRequest.Builder builder = ReleasePartitionsRequest.newBuilder()
                     .setCollectionName(requestParam.getCollectionName())
                     .setCollectionName(requestParam.getCollectionName())
-                    .addAllPartitionNames(requestParam.getPartitionNames())
-                    .build();
+                    .addAllPartitionNames(requestParam.getPartitionNames());
+
+            if (StringUtils.isNotEmpty(requestParam.getDatabaseName())) {
+                builder.setDbName(requestParam.getDatabaseName());
+            }
 
 
-            Status response = blockingStub().releasePartitions(releasePartitionsRequest);
+            Status response = blockingStub().releasePartitions(builder.build());
             handleResponse(title, response);
             handleResponse(title, response);
             return R.success(new RpcStatus(RpcStatus.SUCCESS_MSG));
             return R.success(new RpcStatus(RpcStatus.SUCCESS_MSG));
         } catch (StatusRuntimeException e) {
         } catch (StatusRuntimeException e) {
@@ -1014,14 +1032,15 @@ public abstract class AbstractMilvusGrpcClient implements MilvusClient {
                 }
                 }
             }
             }
 
 
-            GetPartitionStatisticsRequest getPartitionStatisticsRequest = GetPartitionStatisticsRequest.newBuilder()
+            GetPartitionStatisticsRequest.Builder builder = GetPartitionStatisticsRequest.newBuilder()
                     .setCollectionName(requestParam.getCollectionName())
                     .setCollectionName(requestParam.getCollectionName())
-                    .setPartitionName(requestParam.getPartitionName())
-                    .build();
+                    .setPartitionName(requestParam.getPartitionName());
 
 
-            GetPartitionStatisticsResponse response =
-                    blockingStub().getPartitionStatistics(getPartitionStatisticsRequest);
+            if (StringUtils.isNotEmpty(requestParam.getDatabaseName())) {
+                builder.setDbName(requestParam.getDatabaseName());
+            }
 
 
+            GetPartitionStatisticsResponse response = blockingStub().getPartitionStatistics(builder.build());
             handleResponse(title, response.getStatus());
             handleResponse(title, response.getStatus());
             return R.success(response);
             return R.success(response);
         } catch (StatusRuntimeException e) {
         } catch (StatusRuntimeException e) {
@@ -1043,12 +1062,15 @@ public abstract class AbstractMilvusGrpcClient implements MilvusClient {
         String title = String.format("ShowPartitionsRequest collectionName:%s", requestParam.getCollectionName());
         String title = String.format("ShowPartitionsRequest collectionName:%s", requestParam.getCollectionName());
 
 
         try {
         try {
-            ShowPartitionsRequest showPartitionsRequest = ShowPartitionsRequest.newBuilder()
+            ShowPartitionsRequest.Builder builder = ShowPartitionsRequest.newBuilder()
                     .setCollectionName(requestParam.getCollectionName())
                     .setCollectionName(requestParam.getCollectionName())
-                    .addAllPartitionNames(requestParam.getPartitionNames())
-                    .build();
+                    .addAllPartitionNames(requestParam.getPartitionNames());
+
+            if (StringUtils.isNotEmpty(requestParam.getDatabaseName())) {
+                builder.setDbName(requestParam.getDatabaseName());
+            }
 
 
-            ShowPartitionsResponse response = blockingStub().showPartitions(showPartitionsRequest);
+            ShowPartitionsResponse response = blockingStub().showPartitions(builder.build());
             handleResponse(title, response.getStatus());
             handleResponse(title, response.getStatus());
             return R.success(response);
             return R.success(response);
         } catch (StatusRuntimeException e) {
         } catch (StatusRuntimeException e) {
@@ -1202,12 +1224,12 @@ public abstract class AbstractMilvusGrpcClient implements MilvusClient {
                     .setCollectionName(requestParam.getCollectionName())
                     .setCollectionName(requestParam.getCollectionName())
                     .setFieldName(requestParam.getFieldName())
                     .setFieldName(requestParam.getFieldName())
                     .setIndexName(requestParam.getIndexName());
                     .setIndexName(requestParam.getIndexName());
+
             if (StringUtils.isNotEmpty(requestParam.getDatabaseName())) {
             if (StringUtils.isNotEmpty(requestParam.getDatabaseName())) {
                 builder.setDbName(requestParam.getDatabaseName());
                 builder.setDbName(requestParam.getDatabaseName());
             }
             }
-            CreateIndexRequest createIndexRequest = builder.build();
 
 
-            Status response = blockingStub().createIndex(createIndexRequest);
+            Status response = blockingStub().createIndex(builder.build());
             handleResponse(title, response);
             handleResponse(title, response);
 
 
             if (requestParam.isSyncMode()) {
             if (requestParam.isSyncMode()) {
@@ -1241,12 +1263,15 @@ public abstract class AbstractMilvusGrpcClient implements MilvusClient {
                 requestParam.getCollectionName(), requestParam.getIndexName());
                 requestParam.getCollectionName(), requestParam.getIndexName());
 
 
         try {
         try {
-            DropIndexRequest dropIndexRequest = DropIndexRequest.newBuilder()
+            DropIndexRequest.Builder builder = DropIndexRequest.newBuilder()
                     .setCollectionName(requestParam.getCollectionName())
                     .setCollectionName(requestParam.getCollectionName())
-                    .setIndexName(requestParam.getIndexName())
-                    .build();
+                    .setIndexName(requestParam.getIndexName());
+
+            if (StringUtils.isNotEmpty(requestParam.getDatabaseName())) {
+                builder.setDbName(requestParam.getDatabaseName());
+            }
 
 
-            Status response = blockingStub().dropIndex(dropIndexRequest);
+            Status response = blockingStub().dropIndex(builder.build());
             handleResponse(title, response);
             handleResponse(title, response);
             return R.success(new RpcStatus(RpcStatus.SUCCESS_MSG));
             return R.success(new RpcStatus(RpcStatus.SUCCESS_MSG));
         } catch (StatusRuntimeException e) {
         } catch (StatusRuntimeException e) {
@@ -1272,12 +1297,12 @@ public abstract class AbstractMilvusGrpcClient implements MilvusClient {
             DescribeIndexRequest.Builder builder = DescribeIndexRequest.newBuilder()
             DescribeIndexRequest.Builder builder = DescribeIndexRequest.newBuilder()
                     .setCollectionName(requestParam.getCollectionName())
                     .setCollectionName(requestParam.getCollectionName())
                     .setIndexName(requestParam.getIndexName());
                     .setIndexName(requestParam.getIndexName());
+
             if (StringUtils.isNotEmpty(requestParam.getDatabaseName())) {
             if (StringUtils.isNotEmpty(requestParam.getDatabaseName())) {
                 builder.setDbName(requestParam.getDatabaseName());
                 builder.setDbName(requestParam.getDatabaseName());
             }
             }
-            DescribeIndexRequest describeIndexRequest = builder.build();
 
 
-            DescribeIndexResponse response = blockingStub().describeIndex(describeIndexRequest);
+            DescribeIndexResponse response = blockingStub().describeIndex(builder.build());
             handleResponse(title, response.getStatus());
             handleResponse(title, response.getStatus());
             return R.success(response);
             return R.success(response);
         } catch (StatusRuntimeException e) {
         } catch (StatusRuntimeException e) {
@@ -1302,12 +1327,15 @@ public abstract class AbstractMilvusGrpcClient implements MilvusClient {
                 requestParam.getCollectionName(), requestParam.getIndexName());
                 requestParam.getCollectionName(), requestParam.getIndexName());
 
 
         try {
         try {
-            GetIndexStateRequest getIndexStateRequest = GetIndexStateRequest.newBuilder()
+            GetIndexStateRequest.Builder builder = GetIndexStateRequest.newBuilder()
                     .setCollectionName(requestParam.getCollectionName())
                     .setCollectionName(requestParam.getCollectionName())
-                    .setIndexName(requestParam.getIndexName())
-                    .build();
+                    .setIndexName(requestParam.getIndexName());
 
 
-            GetIndexStateResponse response = blockingStub().getIndexState(getIndexStateRequest);
+            if (StringUtils.isNotEmpty(requestParam.getDatabaseName())) {
+                builder.setDbName(requestParam.getDatabaseName());
+            }
+
+            GetIndexStateResponse response = blockingStub().getIndexState(builder.build());
             handleResponse(title, response.getStatus());
             handleResponse(title, response.getStatus());
             return R.success(response);
             return R.success(response);
         } catch (StatusRuntimeException e) {
         } catch (StatusRuntimeException e) {
@@ -1332,12 +1360,15 @@ public abstract class AbstractMilvusGrpcClient implements MilvusClient {
                 requestParam.getCollectionName(), requestParam.getIndexName());
                 requestParam.getCollectionName(), requestParam.getIndexName());
 
 
         try {
         try {
-            GetIndexBuildProgressRequest getIndexBuildProgressRequest = GetIndexBuildProgressRequest.newBuilder()
+            GetIndexBuildProgressRequest.Builder builder = GetIndexBuildProgressRequest.newBuilder()
                     .setCollectionName(requestParam.getCollectionName())
                     .setCollectionName(requestParam.getCollectionName())
-                    .setIndexName(requestParam.getIndexName())
-                    .build();
+                    .setIndexName(requestParam.getIndexName());
+
+            if (StringUtils.isNotEmpty(requestParam.getDatabaseName())) {
+                builder.setDbName(requestParam.getDatabaseName());
+            }
 
 
-            GetIndexBuildProgressResponse response = blockingStub().getIndexBuildProgress(getIndexBuildProgressRequest);
+            GetIndexBuildProgressResponse response = blockingStub().getIndexBuildProgress(builder.build());
             handleResponse(title, response.getStatus());
             handleResponse(title, response.getStatus());
             return R.success(response);
             return R.success(response);
         } catch (StatusRuntimeException e) {
         } catch (StatusRuntimeException e) {
@@ -1395,14 +1426,17 @@ public abstract class AbstractMilvusGrpcClient implements MilvusClient {
         String title = String.format("DeleteRequest collectionName:%s", requestParam.getCollectionName());
         String title = String.format("DeleteRequest collectionName:%s", requestParam.getCollectionName());
 
 
         try {
         try {
-            DeleteRequest deleteRequest = DeleteRequest.newBuilder()
+            DeleteRequest.Builder builder = DeleteRequest.newBuilder()
                     .setBase(MsgBase.newBuilder().setMsgType(MsgType.Delete).build())
                     .setBase(MsgBase.newBuilder().setMsgType(MsgType.Delete).build())
                     .setCollectionName(requestParam.getCollectionName())
                     .setCollectionName(requestParam.getCollectionName())
                     .setPartitionName(requestParam.getPartitionName())
                     .setPartitionName(requestParam.getPartitionName())
-                    .setExpr(requestParam.getExpr())
-                    .build();
+                    .setExpr(requestParam.getExpr());
+
+            if (StringUtils.isNotEmpty(requestParam.getDatabaseName())) {
+                builder.setDbName(requestParam.getDatabaseName());
+            }
 
 
-            MutationResult response = blockingStub().delete(deleteRequest);
+            MutationResult response = blockingStub().delete(builder.build());
             handleResponse(title, response.getStatus());
             handleResponse(title, response.getStatus());
             return R.success(response);
             return R.success(response);
         } catch (StatusRuntimeException e) {
         } catch (StatusRuntimeException e) {
@@ -1776,13 +1810,16 @@ public abstract class AbstractMilvusGrpcClient implements MilvusClient {
         String title = String.format("GetFlushState collectionName:%s", requestParam.getCollectionName());
         String title = String.format("GetFlushState collectionName:%s", requestParam.getCollectionName());
 
 
         try {
         try {
-            GetFlushStateRequest getFlushStateRequest = GetFlushStateRequest.newBuilder()
+            GetFlushStateRequest.Builder builder = GetFlushStateRequest.newBuilder()
                     .addAllSegmentIDs(requestParam.getSegmentIDs())
                     .addAllSegmentIDs(requestParam.getSegmentIDs())
                     .setCollectionName(requestParam.getCollectionName())
                     .setCollectionName(requestParam.getCollectionName())
-                    .setFlushTs(requestParam.getFlushTs())
-                    .build();
+                    .setFlushTs(requestParam.getFlushTs());
 
 
-            GetFlushStateResponse response = blockingStub().getFlushState(getFlushStateRequest);
+            if (StringUtils.isNotBlank(requestParam.getDatabaseName())) {
+                builder.setDbName(requestParam.getDatabaseName());
+            }
+
+            GetFlushStateResponse response = blockingStub().getFlushState(builder.build());
             handleResponse(title, response.getStatus());
             handleResponse(title, response.getStatus());
             return R.success(response);
             return R.success(response);
         } catch (StatusRuntimeException e) {
         } catch (StatusRuntimeException e) {
@@ -1893,12 +1930,15 @@ public abstract class AbstractMilvusGrpcClient implements MilvusClient {
                 return R.failed(descResp.getException());
                 return R.failed(descResp.getException());
             }
             }
 
 
-            GetReplicasRequest getReplicasRequest = GetReplicasRequest.newBuilder()
+            GetReplicasRequest.Builder builder = GetReplicasRequest.newBuilder()
                     .setCollectionID(descResp.getData().getCollectionID())
                     .setCollectionID(descResp.getData().getCollectionID())
-                    .setWithShardNodes(requestParam.isWithShardNodes())
-                    .build();
+                    .setWithShardNodes(requestParam.isWithShardNodes());
+
+            if (StringUtils.isNotBlank(requestParam.getDatabaseName())) {
+                builder.setDbName(requestParam.getDatabaseName());
+            }
 
 
-            GetReplicasResponse response = blockingStub().getReplicas(getReplicasRequest);
+            GetReplicasResponse response = blockingStub().getReplicas(builder.build());
             handleResponse(title, response.getStatus());
             handleResponse(title, response.getStatus());
             return R.success(response);
             return R.success(response);
         } catch (StatusRuntimeException e) {
         } catch (StatusRuntimeException e) {
@@ -1920,13 +1960,20 @@ public abstract class AbstractMilvusGrpcClient implements MilvusClient {
         String title = "LoadBalanceRequest";
         String title = "LoadBalanceRequest";
 
 
         try {
         try {
-            LoadBalanceRequest loadBalanceRequest = LoadBalanceRequest.newBuilder()
+            LoadBalanceRequest.Builder builder = LoadBalanceRequest.newBuilder()
                     .setSrcNodeID(requestParam.getSrcNodeID())
                     .setSrcNodeID(requestParam.getSrcNodeID())
                     .addAllDstNodeIDs(requestParam.getDestNodeIDs())
                     .addAllDstNodeIDs(requestParam.getDestNodeIDs())
-                    .addAllSealedSegmentIDs(requestParam.getSegmentIDs())
-                    .build();
+                    .addAllSealedSegmentIDs(requestParam.getSegmentIDs());
 
 
-            Status response = blockingStub().loadBalance(loadBalanceRequest);
+            if (StringUtils.isNotBlank(requestParam.getCollectionName())) {
+                builder.setCollectionName(requestParam.getCollectionName());
+            }
+
+            if (StringUtils.isNotBlank(requestParam.getDatabaseName())) {
+                builder.setDbName(requestParam.getDatabaseName());
+            }
+
+            Status response = blockingStub().loadBalance(builder.build());
             handleResponse(title, response);
             handleResponse(title, response);
             return R.success(new RpcStatus(RpcStatus.SUCCESS_MSG));
             return R.success(new RpcStatus(RpcStatus.SUCCESS_MSG));
         } catch (StatusRuntimeException e) {
         } catch (StatusRuntimeException e) {
@@ -2380,10 +2427,15 @@ public abstract class AbstractMilvusGrpcClient implements MilvusClient {
         String title = String.format("SelectGrantForRoleRequest roleName:%s", requestParam.getRoleName());
         String title = String.format("SelectGrantForRoleRequest roleName:%s", requestParam.getRoleName());
 
 
         try {
         try {
+            GrantEntity.Builder builder = GrantEntity.newBuilder()
+                    .setRole(RoleEntity.newBuilder().setName(requestParam.getRoleName()).build());
+
+            if (StringUtils.isNotEmpty(requestParam.getDatabaseName())) {
+                builder.setDbName(requestParam.getDatabaseName());
+            }
+
             SelectGrantRequest request = SelectGrantRequest.newBuilder()
             SelectGrantRequest request = SelectGrantRequest.newBuilder()
-                    .setEntity(GrantEntity.newBuilder()
-                            .setRole(RoleEntity.newBuilder().setName(requestParam.getRoleName()).build())
-                            .build())
+                    .setEntity(builder.build())
                     .build();
                     .build();
 
 
             SelectGrantResponse response = blockingStub().selectGrant(request);
             SelectGrantResponse response = blockingStub().selectGrant(request);
@@ -2437,20 +2489,24 @@ public abstract class AbstractMilvusGrpcClient implements MilvusClient {
         String title = String.format("BulkInsertRequest collectionName:%s", requestParam.getCollectionName());
         String title = String.format("BulkInsertRequest collectionName:%s", requestParam.getCollectionName());
 
 
         try {
         try {
-            ImportRequest.Builder importRequest = ImportRequest.newBuilder()
+            ImportRequest.Builder builder = ImportRequest.newBuilder()
                     .setCollectionName(requestParam.getCollectionName())
                     .setCollectionName(requestParam.getCollectionName())
                     .addAllFiles(requestParam.getFiles());
                     .addAllFiles(requestParam.getFiles());
 
 
+            if (StringUtils.isNotEmpty(requestParam.getDatabaseName())) {
+                builder.setDbName(requestParam.getDatabaseName());
+            }
+
             if (StringUtils.isNotEmpty(requestParam.getPartitionName())) {
             if (StringUtils.isNotEmpty(requestParam.getPartitionName())) {
-                importRequest.setPartitionName(requestParam.getPartitionName());
+                builder.setPartitionName(requestParam.getPartitionName());
             }
             }
 
 
             List<KeyValuePair> options = ParamUtils.AssembleKvPair(requestParam.getOptions());
             List<KeyValuePair> options = ParamUtils.AssembleKvPair(requestParam.getOptions());
             if (CollectionUtils.isNotEmpty(options)) {
             if (CollectionUtils.isNotEmpty(options)) {
-                options.forEach(importRequest::addOptions);
+                options.forEach(builder::addOptions);
             }
             }
 
 
-            ImportResponse response = blockingStub().import_(importRequest.build());
+            ImportResponse response = blockingStub().import_(builder.build());
             handleResponse(title, response.getStatus());
             handleResponse(title, response.getStatus());
             return R.success(response);
             return R.success(response);
         } catch (StatusRuntimeException e) {
         } catch (StatusRuntimeException e) {
@@ -2499,12 +2555,15 @@ public abstract class AbstractMilvusGrpcClient implements MilvusClient {
                 requestParam.getCollectionName());
                 requestParam.getCollectionName());
 
 
         try {
         try {
-            ListImportTasksRequest listImportTasksRequest = ListImportTasksRequest.newBuilder()
+            ListImportTasksRequest.Builder builder = ListImportTasksRequest.newBuilder()
                     .setCollectionName(requestParam.getCollectionName())
                     .setCollectionName(requestParam.getCollectionName())
-                    .setLimit(requestParam.getLimit())
-                    .build();
+                    .setLimit(requestParam.getLimit());
 
 
-            ListImportTasksResponse response = blockingStub().listImportTasks(listImportTasksRequest);
+            if (StringUtils.isNotEmpty(requestParam.getDatabaseName())) {
+                builder.setDbName(requestParam.getDatabaseName());
+            }
+
+            ListImportTasksResponse response = blockingStub().listImportTasks(builder.build());
             handleResponse(title, response.getStatus());
             handleResponse(title, response.getStatus());
             return R.success(response);
             return R.success(response);
         } catch (StatusRuntimeException e) {
         } catch (StatusRuntimeException e) {
@@ -2527,12 +2586,15 @@ public abstract class AbstractMilvusGrpcClient implements MilvusClient {
                 requestParam.getCollectionName());
                 requestParam.getCollectionName());
 
 
         try {
         try {
-            GetLoadingProgressRequest getLoadingProgressRequest = GetLoadingProgressRequest.newBuilder()
+            GetLoadingProgressRequest.Builder builder = GetLoadingProgressRequest.newBuilder()
                     .setCollectionName(requestParam.getCollectionName())
                     .setCollectionName(requestParam.getCollectionName())
-                    .addAllPartitionNames(requestParam.getPartitionNames())
-                    .build();
+                    .addAllPartitionNames(requestParam.getPartitionNames());
+
+            if (StringUtils.isNotEmpty(requestParam.getDatabaseName())) {
+                builder.setDbName(requestParam.getDatabaseName());
+            }
 
 
-            GetLoadingProgressResponse response = blockingStub().getLoadingProgress(getLoadingProgressRequest);
+            GetLoadingProgressResponse response = blockingStub().getLoadingProgress(builder.build());
             handleResponse(title, response.getStatus());
             handleResponse(title, response.getStatus());
             return R.success(response);
             return R.success(response);
         } catch (StatusRuntimeException e) {
         } catch (StatusRuntimeException e) {
@@ -2558,6 +2620,7 @@ public abstract class AbstractMilvusGrpcClient implements MilvusClient {
             GetLoadStateRequest.Builder builder = GetLoadStateRequest.newBuilder()
             GetLoadStateRequest.Builder builder = GetLoadStateRequest.newBuilder()
                     .setCollectionName(requestParam.getCollectionName())
                     .setCollectionName(requestParam.getCollectionName())
                     .addAllPartitionNames(requestParam.getPartitionNames());
                     .addAllPartitionNames(requestParam.getPartitionNames());
+
             if (StringUtils.isNotEmpty(requestParam.getDatabaseName())) {
             if (StringUtils.isNotEmpty(requestParam.getDatabaseName())) {
                 builder.setDbName(requestParam.getDatabaseName());
                 builder.setDbName(requestParam.getDatabaseName());
             }
             }

+ 8 - 1
src/main/java/io/milvus/param/ParamUtils.java

@@ -406,11 +406,14 @@ public class ParamUtils {
     @SuppressWarnings("unchecked")
     @SuppressWarnings("unchecked")
     public static SearchRequest convertSearchParam(@NonNull SearchParam requestParam) throws ParamException {
     public static SearchRequest convertSearchParam(@NonNull SearchParam requestParam) throws ParamException {
         SearchRequest.Builder builder = SearchRequest.newBuilder()
         SearchRequest.Builder builder = SearchRequest.newBuilder()
-                .setDbName("")
                 .setCollectionName(requestParam.getCollectionName());
                 .setCollectionName(requestParam.getCollectionName());
+
         if (!requestParam.getPartitionNames().isEmpty()) {
         if (!requestParam.getPartitionNames().isEmpty()) {
             requestParam.getPartitionNames().forEach(builder::addPartitionNames);
             requestParam.getPartitionNames().forEach(builder::addPartitionNames);
         }
         }
+        if (StringUtils.isNotEmpty(requestParam.getDatabaseName())) {
+            builder.setDbName(requestParam.getDatabaseName());
+        }
 
 
         // prepare target vectors
         // prepare target vectors
         // TODO: check target vector dimension(use DescribeCollection get schema to compare)
         // TODO: check target vector dimension(use DescribeCollection get schema to compare)
@@ -539,6 +542,10 @@ public class ParamUtils {
                 .setTravelTimestamp(requestParam.getTravelTimestamp())
                 .setTravelTimestamp(requestParam.getTravelTimestamp())
                 .setGuaranteeTimestamp(guaranteeTimestamp);
                 .setGuaranteeTimestamp(guaranteeTimestamp);
 
 
+        if (StringUtils.isNotEmpty(requestParam.getDatabaseName())) {
+            builder.setDbName(requestParam.getDatabaseName());
+        }
+
         // a new parameter from v2.2.9, if user didn't specify consistency level, set this parameter to true
         // a new parameter from v2.2.9, if user didn't specify consistency level, set this parameter to true
         if (requestParam.getConsistencyLevel() == null) {
         if (requestParam.getConsistencyLevel() == null) {
             builder.setUseDefaultConsistency(true);
             builder.setUseDefaultConsistency(true);

+ 3 - 12
src/main/java/io/milvus/param/RpcStatus.java

@@ -19,9 +19,12 @@
 
 
 package io.milvus.param;
 package io.milvus.param;
 
 
+import lombok.ToString;
+
 /**
 /**
  * Utility class to wrap a message.
  * Utility class to wrap a message.
  */
  */
+@ToString
 public class RpcStatus {
 public class RpcStatus {
     public static final String SUCCESS_MSG = "Success";
     public static final String SUCCESS_MSG = "Success";
 
 
@@ -34,16 +37,4 @@ public class RpcStatus {
     public RpcStatus(String msg) {
     public RpcStatus(String msg) {
         this.msg = msg;
         this.msg = msg;
     }
     }
-
-    /**
-     * Constructs a <code>String</code> by {@link RpcStatus} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "RpcStatus{" +
-                "msg='" + getMsg() + '\'' +
-                '}';
-    }
 }
 }

+ 2 - 13
src/main/java/io/milvus/param/alias/AlterAliasParam.java

@@ -5,11 +5,13 @@ import io.milvus.param.ParamUtils;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 /**
 /**
  * Parameters for <code>alterAlias</code> interface.
  * Parameters for <code>alterAlias</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class AlterAliasParam {
 public class AlterAliasParam {
     private final String collectionName;
     private final String collectionName;
     private final String databaseName;
     private final String databaseName;
@@ -82,17 +84,4 @@ public class AlterAliasParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link AlterAliasParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "AlterAliasParam{" +
-                "collectionName='" + collectionName + '\'' +
-                "databaseName='" + databaseName + '\'' +
-                ", alias='" + alias + '\'' +
-                '}';
-    }
 }
 }

+ 2 - 13
src/main/java/io/milvus/param/alias/CreateAliasParam.java

@@ -5,11 +5,13 @@ import io.milvus.param.ParamUtils;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 /**
 /**
  * Parameters for <code>createAlias</code> interface.
  * Parameters for <code>createAlias</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class CreateAliasParam {
 public class CreateAliasParam {
     private final String collectionName;
     private final String collectionName;
     private final String databaseName;
     private final String databaseName;
@@ -82,17 +84,4 @@ public class CreateAliasParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link CreateAliasParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "CreateAliasParam{" +
-                "collectionName='" + collectionName + '\'' +
-                "databaseName='" + databaseName + '\'' +
-                ", alias='" + alias + '\'' +
-                '}';
-    }
 }
 }

+ 2 - 12
src/main/java/io/milvus/param/alias/DropAliasParam.java

@@ -5,11 +5,13 @@ import io.milvus.param.ParamUtils;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 /**
 /**
  * Parameters for <code>dropAlias</code> interface.
  * Parameters for <code>dropAlias</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class DropAliasParam {
 public class DropAliasParam {
     private final String alias;
     private final String alias;
     private final String databaseName;
     private final String databaseName;
@@ -67,16 +69,4 @@ public class DropAliasParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link DropAliasParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "DropAliasParam{" +
-                ", alias='" + alias + '\'' +
-                "databaseName='" + databaseName + '\'' +
-                '}';
-    }
 }
 }

+ 2 - 12
src/main/java/io/milvus/param/alias/ListAliasesParam.java

@@ -5,8 +5,10 @@ import io.milvus.param.ParamUtils;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 @Getter
 @Getter
+@ToString
 public class ListAliasesParam {
 public class ListAliasesParam {
     private final String collectionName;
     private final String collectionName;
     private final String databaseName;
     private final String databaseName;
@@ -64,16 +66,4 @@ public class ListAliasesParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link ListAliasesParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "ListAliasesParam{" +
-                "collectionName='" + collectionName + '\'' +
-                "databaseName='" + databaseName + '\'' +
-                '}';
-    }
 }
 }

+ 17 - 15
src/main/java/io/milvus/param/bulkinsert/BulkInsertParam.java

@@ -23,6 +23,7 @@ import io.milvus.exception.ParamException;
 import io.milvus.param.ParamUtils;
 import io.milvus.param.ParamUtils;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
@@ -34,13 +35,16 @@ import java.util.Map;
  * Parameters for <code>bulkInsert</code> interface.
  * Parameters for <code>bulkInsert</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class BulkInsertParam {
 public class BulkInsertParam {
+    private final String databaseName;
     private final String collectionName;
     private final String collectionName;
     private final String partitionName;
     private final String partitionName;
     private final List<String> files;
     private final List<String> files;
     private final Map<String, String> options;
     private final Map<String, String> options;
 
 
     private BulkInsertParam(@NonNull Builder builder) {
     private BulkInsertParam(@NonNull Builder builder) {
+        this.databaseName = builder.databaseName;
         this.collectionName = builder.collectionName;
         this.collectionName = builder.collectionName;
         this.partitionName = builder.partitionName;
         this.partitionName = builder.partitionName;
         this.files = builder.files;
         this.files = builder.files;
@@ -55,6 +59,7 @@ public class BulkInsertParam {
      * Builder for {@link BulkInsertParam} class.
      * Builder for {@link BulkInsertParam} class.
      */
      */
     public static final class Builder {
     public static final class Builder {
+        private String databaseName;
         private String collectionName;
         private String collectionName;
         private String partitionName;
         private String partitionName;
         private final List<String> files = new ArrayList<>();
         private final List<String> files = new ArrayList<>();
@@ -62,6 +67,17 @@ public class BulkInsertParam {
         private Builder() {
         private Builder() {
         }
         }
 
 
+        /**
+         * Sets the database name. database name can be nil.
+         *
+         * @param databaseName database name
+         * @return <code>Builder</code>
+         */
+        public Builder withDatabaseName(String databaseName) {
+            this.databaseName = databaseName;
+            return this;
+        }
+
         /**
         /**
          * Sets the collection name. Collection name cannot be empty or null.
          * Sets the collection name. Collection name cannot be empty or null.
          *
          *
@@ -143,18 +159,4 @@ public class BulkInsertParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link BulkInsertParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "BulkInsertParam{" +
-                "collectionName='" + collectionName + '\'' +
-                ", partitionName='" + partitionName + '\'' +
-                ", files=" + files +
-                ", options=" + options +
-                '}';
-    }
-}
+}

+ 3 - 12
src/main/java/io/milvus/param/bulkinsert/GetBulkInsertStateParam.java

@@ -22,11 +22,13 @@ package io.milvus.param.bulkinsert;
 import io.milvus.exception.ParamException;
 import io.milvus.exception.ParamException;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 /**
 /**
  * Parameters for <code>getBulkInsertState</code> interface.
  * Parameters for <code>getBulkInsertState</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class GetBulkInsertStateParam {
 public class GetBulkInsertStateParam {
     private final Long task;
     private final Long task;
 
 
@@ -69,15 +71,4 @@ public class GetBulkInsertStateParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link GetBulkInsertStateParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "GetBulkInsertStateParam{" +
-                "taskID='" + task + '\'' +
-                '}';
-    }
-}
+}

+ 17 - 15
src/main/java/io/milvus/param/bulkinsert/ListBulkInsertTasksParam.java

@@ -20,20 +20,22 @@
 package io.milvus.param.bulkinsert;
 package io.milvus.param.bulkinsert;
 
 
 import io.milvus.exception.ParamException;
 import io.milvus.exception.ParamException;
-import io.milvus.param.collection.DropCollectionParam;
-import io.milvus.param.collection.LoadCollectionParam;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 /**
 /**
  * Parameters for <code>listBulkInsertTasks</code> interface.
  * Parameters for <code>listBulkInsertTasks</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class ListBulkInsertTasksParam {
 public class ListBulkInsertTasksParam {
+    private final String databaseName;
     private final String collectionName;
     private final String collectionName;
     private final int limit;
     private final int limit;
 
 
     private ListBulkInsertTasksParam(@NonNull Builder builder) {
     private ListBulkInsertTasksParam(@NonNull Builder builder) {
+        this.databaseName = builder.databaseName;
         this.collectionName = builder.collectionName;
         this.collectionName = builder.collectionName;
         this.limit = builder.limit;
         this.limit = builder.limit;
     }
     }
@@ -46,6 +48,7 @@ public class ListBulkInsertTasksParam {
      * Builder for {@link ListBulkInsertTasksParam} class.
      * Builder for {@link ListBulkInsertTasksParam} class.
      */
      */
     public static final class Builder {
     public static final class Builder {
+        private String databaseName;
         private String collectionName = ""; // empty string will list all tasks in the server side
         private String collectionName = ""; // empty string will list all tasks in the server side
 
 
         // The limit count of returned tasks, list all tasks if the value is 0
         // The limit count of returned tasks, list all tasks if the value is 0
@@ -55,6 +58,17 @@ public class ListBulkInsertTasksParam {
         private Builder() {
         private Builder() {
         }
         }
 
 
+        /**
+         * Sets the database name. database name can be nil.
+         *
+         * @param databaseName database name
+         * @return <code>Builder</code>
+         */
+        public Builder withDatabaseName(String databaseName) {
+            this.databaseName = databaseName;
+            return this;
+        }
+
         /**
         /**
          * Sets the target collection name, list all tasks if the name is empty.
          * Sets the target collection name, list all tasks if the name is empty.
          * Default value is an empty string.
          * Default value is an empty string.
@@ -92,16 +106,4 @@ public class ListBulkInsertTasksParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link ListBulkInsertTasksParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "ListBulkInsertTasksParam{" +
-                "collectionName='" + collectionName + '\'' +
-                ", limit=" + limit +
-                '}';
-    }
-}
+}

+ 3 - 14
src/main/java/io/milvus/param/collection/AlterCollectionParam.java

@@ -24,6 +24,7 @@ import io.milvus.param.Constant;
 import io.milvus.param.ParamUtils;
 import io.milvus.param.ParamUtils;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map;
@@ -32,6 +33,7 @@ import java.util.Map;
  * Parameters for <code>alterCollection</code> interface.
  * Parameters for <code>alterCollection</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class AlterCollectionParam {
 public class AlterCollectionParam {
     private final String collectionName;
     private final String collectionName;
     private final String databaseName;
     private final String databaseName;
@@ -133,17 +135,4 @@ public class AlterCollectionParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link AlterCollectionParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "AlterCollectionParam{" +
-                "collectionName='" + collectionName + '\'' +
-                "dbName='" + databaseName + '\'' +
-                ", properties='" + properties.toString() + '\'' +
-                '}';
-    }
-}
+}

+ 3 - 12
src/main/java/io/milvus/param/collection/CreateDatabaseParam.java

@@ -23,11 +23,13 @@ import io.milvus.exception.ParamException;
 import io.milvus.param.ParamUtils;
 import io.milvus.param.ParamUtils;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 /**
 /**
  * Parameters for <code>createDatabase</code> interface.
  * Parameters for <code>createDatabase</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class CreateDatabaseParam {
 public class CreateDatabaseParam {
     private final String databaseName;
     private final String databaseName;
 
 
@@ -71,15 +73,4 @@ public class CreateDatabaseParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link CreateDatabaseParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "CreateDatabaseParam{" +
-                "databaseName='" + databaseName + '\'' +
-                '}';
-    }
-}
+}

+ 2 - 10
src/main/java/io/milvus/param/collection/DropCollectionParam.java

@@ -24,11 +24,13 @@ import io.milvus.param.ParamUtils;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 /**
 /**
  * Parameters for <code>dropCollection</code> interface.
  * Parameters for <code>dropCollection</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class DropCollectionParam {
 public class DropCollectionParam {
     private final String collectionName;
     private final String collectionName;
     private final String databaseName;
     private final String databaseName;
@@ -86,14 +88,4 @@ public class DropCollectionParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link DropCollectionParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "DropCollectionParam{" +
-                "collectionName='" + collectionName + '\'' + '}';
-    }
 }
 }

+ 3 - 11
src/main/java/io/milvus/param/collection/DropDatabaseParam.java

@@ -23,11 +23,13 @@ import io.milvus.exception.ParamException;
 import io.milvus.param.ParamUtils;
 import io.milvus.param.ParamUtils;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 /**
 /**
  * Parameters for <code>dropDatabase</code> interface.
  * Parameters for <code>dropDatabase</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class DropDatabaseParam {
 public class DropDatabaseParam {
     private final String databaseName;
     private final String databaseName;
 
 
@@ -71,14 +73,4 @@ public class DropDatabaseParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link DropDatabaseParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "DropDatabaseParam{" +
-                "databaseName='" + databaseName + '\'' + '}';
-    }
-}
+}

+ 3 - 17
src/main/java/io/milvus/param/collection/FieldType.java

@@ -26,6 +26,8 @@ import io.milvus.param.ParamUtils;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
+
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map;
 
 
@@ -34,6 +36,7 @@ import java.util.Map;
  * @see CreateCollectionParam
  * @see CreateCollectionParam
  */
  */
 @Getter
 @Getter
+@ToString
 public class FieldType {
 public class FieldType {
     private final String name;
     private final String name;
     private final boolean primaryKey;
     private final boolean primaryKey;
@@ -332,21 +335,4 @@ public class FieldType {
         }
         }
     }
     }
 
 
-    /**
-     * Construct a <code>String</code> by {@link FieldType} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "FieldType{" +
-                "name='" + name + '\'' +
-                ", type='" + dataType.name() + '\'' +
-                ", elementType='" + elementType.name() + '\'' +
-                ", primaryKey=" + primaryKey +
-                ", partitionKey=" + partitionKey +
-                ", autoID=" + autoID +
-                ", params=" + typeParams +
-                '}';
-    }
 }
 }

+ 3 - 14
src/main/java/io/milvus/param/collection/FlushParam.java

@@ -6,6 +6,8 @@ import io.milvus.param.ParamUtils;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
+
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 import java.util.Objects;
 import java.util.Objects;
@@ -15,6 +17,7 @@ import java.util.Objects;
  * Note that the flush interface is not exposed currently.
  * Note that the flush interface is not exposed currently.
  */
  */
 @Getter
 @Getter
+@ToString
 public class FlushParam {
 public class FlushParam {
     private final String databaseName;
     private final String databaseName;
     private final List<String> collectionNames;
     private final List<String> collectionNames;
@@ -165,18 +168,4 @@ public class FlushParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link FlushParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "FlushParam{" +
-                "collectionNames='" + collectionNames + '\'' +
-                ", syncFlush=" + syncFlush.toString() +
-                ", syncFlushWaitingInterval=" + syncFlushWaitingInterval +
-                ", syncFlushWaitingTimeout=" + syncFlushWaitingTimeout +
-                '}';
-    }
 }
 }

+ 2 - 12
src/main/java/io/milvus/param/collection/GetCollectionStatisticsParam.java

@@ -24,11 +24,13 @@ import io.milvus.param.ParamUtils;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 /**
 /**
  * Parameters for <code>getCollectionStatistics</code> interface.
  * Parameters for <code>getCollectionStatistics</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class GetCollectionStatisticsParam {
 public class GetCollectionStatisticsParam {
     private final String databaseName;
     private final String databaseName;
     private final String collectionName;
     private final String collectionName;
@@ -103,16 +105,4 @@ public class GetCollectionStatisticsParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link GetCollectionStatisticsParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "GetCollectionStatisticsParam{" +
-                "collectionName='" + collectionName + '\'' +
-                " flush=" + flushCollection +
-                '}';
-    }
 }
 }

+ 2 - 1
src/main/java/io/milvus/param/collection/GetLoadStateParam.java

@@ -117,4 +117,5 @@ public class GetLoadStateParam {
             return new GetLoadStateParam(this);
             return new GetLoadStateParam(this);
         }
         }
     }
     }
-}
+
+}

+ 17 - 18
src/main/java/io/milvus/param/collection/GetLoadingProgressParam.java

@@ -21,26 +21,25 @@ package io.milvus.param.collection;
 
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Lists;
 import io.milvus.exception.ParamException;
 import io.milvus.exception.ParamException;
-import io.milvus.param.Constant;
 import io.milvus.param.ParamUtils;
 import io.milvus.param.ParamUtils;
-import io.milvus.param.dml.QueryParam;
-import io.milvus.param.partition.ReleasePartitionsParam;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
-import java.util.Objects;
 
 
 /**
 /**
  * Parameters for <code>loadCollection</code> interface.
  * Parameters for <code>loadCollection</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class GetLoadingProgressParam {
 public class GetLoadingProgressParam {
+    private final String databaseName;
     private final String collectionName;
     private final String collectionName;
     private final List<String> partitionNames;
     private final List<String> partitionNames;
 
 
     public GetLoadingProgressParam(@NonNull Builder builder) {
     public GetLoadingProgressParam(@NonNull Builder builder) {
+        this.databaseName = builder.databaseName;
         this.collectionName = builder.collectionName;
         this.collectionName = builder.collectionName;
         this.partitionNames = builder.partitionNames;
         this.partitionNames = builder.partitionNames;
     }
     }
@@ -53,6 +52,7 @@ public class GetLoadingProgressParam {
      * Builder for {@link GetLoadingProgressParam} class.
      * Builder for {@link GetLoadingProgressParam} class.
      */
      */
     public static final class Builder {
     public static final class Builder {
+        private String databaseName;
         private String collectionName;
         private String collectionName;
 
 
         private final List<String> partitionNames = Lists.newArrayList();
         private final List<String> partitionNames = Lists.newArrayList();
@@ -60,6 +60,17 @@ public class GetLoadingProgressParam {
         private Builder() {
         private Builder() {
         }
         }
 
 
+        /**
+         * Sets the database name. database name can be nil.
+         *
+         * @param databaseName database name
+         * @return <code>Builder</code>
+         */
+        public Builder withDatabaseName(String databaseName) {
+            this.databaseName = databaseName;
+            return this;
+        }
+
         /**
         /**
          * Sets the collection name. Collection name cannot be empty or null.
          * Sets the collection name. Collection name cannot be empty or null.
          *
          *
@@ -107,16 +118,4 @@ public class GetLoadingProgressParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link GetLoadingProgressParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "GetLoadingProgressParam{" +
-                "collectionName='" + collectionName + '\'' +
-                ", partitionNames='" + partitionNames.toString() + '\'' +
-                '}';
-    }
-}
+}

+ 2 - 11
src/main/java/io/milvus/param/collection/ReleaseCollectionParam.java

@@ -24,11 +24,13 @@ import io.milvus.param.ParamUtils;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 /**
 /**
  * Parameters for <code>releaseCollection</code> interface.
  * Parameters for <code>releaseCollection</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class ReleaseCollectionParam {
 public class ReleaseCollectionParam {
     private final String databaseName;
     private final String databaseName;
     private final String collectionName;
     private final String collectionName;
@@ -86,15 +88,4 @@ public class ReleaseCollectionParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link ReleaseCollectionParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "ReleaseCollectionParam{" +
-                "databaseName='" + databaseName + '\'' +
-                "collectionName='" + collectionName + '\'' + '}';
-    }
 }
 }

+ 31 - 14
src/main/java/io/milvus/param/collection/RenameCollectionParam.java

@@ -20,10 +20,10 @@
 package io.milvus.param.collection;
 package io.milvus.param.collection;
 
 
 import io.milvus.exception.ParamException;
 import io.milvus.exception.ParamException;
-import io.milvus.param.Constant;
 import io.milvus.param.ParamUtils;
 import io.milvus.param.ParamUtils;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 import java.util.Objects;
 import java.util.Objects;
 
 
@@ -31,11 +31,16 @@ import java.util.Objects;
  * Parameters for <code>renameCollection</code> interface.
  * Parameters for <code>renameCollection</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class RenameCollectionParam {
 public class RenameCollectionParam {
+    private final String oldDatabaseName;
+    private final String newDatabaseName;
     private final String oldCollectionName;
     private final String oldCollectionName;
     private final String newCollectionName;
     private final String newCollectionName;
 
 
     public RenameCollectionParam(@NonNull Builder builder) {
     public RenameCollectionParam(@NonNull Builder builder) {
+        this.oldDatabaseName = builder.oldDatabaseName;
+        this.newDatabaseName = builder.newDatabaseName;
         this.oldCollectionName = builder.oldCollectionName;
         this.oldCollectionName = builder.oldCollectionName;
         this.newCollectionName = builder.newCollectionName;
         this.newCollectionName = builder.newCollectionName;
     }
     }
@@ -48,6 +53,8 @@ public class RenameCollectionParam {
      * Builder for {@link RenameCollectionParam} class.
      * Builder for {@link RenameCollectionParam} class.
      */
      */
     public static final class Builder {
     public static final class Builder {
+        private String oldDatabaseName;
+        private String newDatabaseName;
         private String oldCollectionName;
         private String oldCollectionName;
 
 
         private String newCollectionName;
         private String newCollectionName;
@@ -55,6 +62,28 @@ public class RenameCollectionParam {
         private Builder() {
         private Builder() {
         }
         }
 
 
+        /**
+         * Sets the old database name. database name can be nil.
+         *
+         * @param databaseName database name
+         * @return <code>Builder</code>
+         */
+        public Builder withOldDatabaseName(String databaseName) {
+            this.oldDatabaseName = databaseName;
+            return this;
+        }
+
+        /**
+         * Sets the old database name. database name can be nil.
+         *
+         * @param databaseName database name
+         * @return <code>Builder</code>
+         */
+        public Builder withNewDatabaseName(String databaseName) {
+            this.newDatabaseName = databaseName;
+            return this;
+        }
+
         /**
         /**
          * Sets the old collection name. Old collection name cannot be empty or null.
          * Sets the old collection name. Old collection name cannot be empty or null.
          *
          *
@@ -90,16 +119,4 @@ public class RenameCollectionParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link RenameCollectionParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "RenameCollectionParam{" +
-                "oldCollectionName='" + oldCollectionName + '\'' +
-                ", NewCollectionName=" + newCollectionName + '\'' +
-                '}';
-    }
-}
+}

+ 3 - 12
src/main/java/io/milvus/param/collection/ShowCollectionsParam.java

@@ -25,6 +25,8 @@ import io.milvus.param.ParamUtils;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
+
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
@@ -32,6 +34,7 @@ import java.util.List;
  * Parameters for <code>showCollections</code> interface.
  * Parameters for <code>showCollections</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class ShowCollectionsParam {
 public class ShowCollectionsParam {
     private final List<String> collectionNames;
     private final List<String> collectionNames;
     private final ShowType showType;
     private final ShowType showType;
@@ -118,16 +121,4 @@ public class ShowCollectionsParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link ShowCollectionsParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "ShowCollectionsParam{" +
-                "collectionNames='" + collectionNames.toString() + '\'' +
-                ", showType=" + showType.toString() +
-                '}';
-    }
 }
 }

+ 2 - 12
src/main/java/io/milvus/param/control/GetCompactionPlansParam.java

@@ -3,6 +3,7 @@ package io.milvus.param.control;
 import io.milvus.exception.ParamException;
 import io.milvus.exception.ParamException;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 /**
 /**
  * Parameters for <code>getCompactionStateWithPlans</code> interface.
  * Parameters for <code>getCompactionStateWithPlans</code> interface.
@@ -10,6 +11,7 @@ import lombok.NonNull;
  * @see <a href="https://wiki.lfaidata.foundation/display/MIL/MEP+16+--+Compaction">Compaction function design</a>
  * @see <a href="https://wiki.lfaidata.foundation/display/MIL/MEP+16+--+Compaction">Compaction function design</a>
  */
  */
 @Getter
 @Getter
+@ToString
 public class GetCompactionPlansParam {
 public class GetCompactionPlansParam {
     private final Long compactionID;
     private final Long compactionID;
 
 
@@ -21,18 +23,6 @@ public class GetCompactionPlansParam {
         return new Builder();
         return new Builder();
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link GetCompactionPlansParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "GetCompactionPlansParam{" +
-                "compactionID='" + compactionID + '\'' +
-                '}';
-    }
-
     /**
     /**
      * Builder for {@link GetCompactionPlansParam} class.
      * Builder for {@link GetCompactionPlansParam} class.
      */
      */

+ 2 - 12
src/main/java/io/milvus/param/control/GetCompactionStateParam.java

@@ -3,6 +3,7 @@ package io.milvus.param.control;
 import io.milvus.exception.ParamException;
 import io.milvus.exception.ParamException;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 
 
 /**
 /**
@@ -11,6 +12,7 @@ import lombok.NonNull;
  * @see <a href="https://wiki.lfaidata.foundation/display/MIL/MEP+16+--+Compaction">Compaction function design</a>
  * @see <a href="https://wiki.lfaidata.foundation/display/MIL/MEP+16+--+Compaction">Compaction function design</a>
  */
  */
 @Getter
 @Getter
+@ToString
 public class GetCompactionStateParam {
 public class GetCompactionStateParam {
     private final Long compactionID;
     private final Long compactionID;
 
 
@@ -22,18 +24,6 @@ public class GetCompactionStateParam {
         return new Builder();
         return new Builder();
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link GetCompactionStateParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "GetCompactionStateParam{" +
-                "compactionID='" + compactionID + '\'' +
-                '}';
-    }
-
     /**
     /**
      * Builder for {@link GetCompactionStateParam} class.
      * Builder for {@link GetCompactionStateParam} class.
      */
      */

+ 17 - 14
src/main/java/io/milvus/param/control/GetFlushAllStateParam.java

@@ -3,18 +3,20 @@ package io.milvus.param.control;
 import io.milvus.exception.ParamException;
 import io.milvus.exception.ParamException;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
-import java.util.ArrayList;
-import java.util.List;
 
 
 /**
 /**
  * Parameters for <code>getFlushAllState</code> interface.
  * Parameters for <code>getFlushAllState</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class GetFlushAllStateParam {
 public class GetFlushAllStateParam {
+    private final String databaseName;
     private final long flushAllTs;
     private final long flushAllTs;
 
 
     private GetFlushAllStateParam(@NonNull Builder builder) {
     private GetFlushAllStateParam(@NonNull Builder builder) {
+        this.databaseName = builder.databaseName;
         this.flushAllTs = builder.flushAllTs;
         this.flushAllTs = builder.flushAllTs;
     }
     }
 
 
@@ -26,11 +28,23 @@ public class GetFlushAllStateParam {
      * Builder for {@link GetFlushAllStateParam} class.
      * Builder for {@link GetFlushAllStateParam} class.
      */
      */
     public static final class Builder {
     public static final class Builder {
+        private String databaseName;
         private Long flushAllTs;
         private Long flushAllTs;
 
 
         private Builder() {
         private Builder() {
         }
         }
 
 
+        /**
+         * Sets the database name. database name can be nil.
+         *
+         * @param databaseName database name
+         * @return <code>Builder</code>
+         */
+        public Builder withDatabaseName(String databaseName) {
+            this.databaseName = databaseName;
+            return this;
+        }
+
         public Builder withFlushAllTs(@NonNull Long flushAllTs) {
         public Builder withFlushAllTs(@NonNull Long flushAllTs) {
             this.flushAllTs = flushAllTs;
             this.flushAllTs = flushAllTs;
             return this;
             return this;
@@ -47,15 +61,4 @@ public class GetFlushAllStateParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link GetFlushAllStateParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "GetFlushAllStateParam{" +
-                "flushAllTs=" + flushAllTs +
-                '}';
-    }
-}
+}

+ 19 - 15
src/main/java/io/milvus/param/control/GetFlushStateParam.java

@@ -4,6 +4,7 @@ import io.milvus.exception.ParamException;
 import io.milvus.param.ParamUtils;
 import io.milvus.param.ParamUtils;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
@@ -12,14 +13,17 @@ import java.util.List;
  * Parameters for <code>getMetric</code> interface.
  * Parameters for <code>getMetric</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class GetFlushStateParam {
 public class GetFlushStateParam {
-    private final List<Long> segmentIDs;
+    private final String databaseName;
     private final String collectionName;
     private final String collectionName;
+    private final List<Long> segmentIDs;
     private final Long flushTs;
     private final Long flushTs;
 
 
     private GetFlushStateParam(@NonNull Builder builder) {
     private GetFlushStateParam(@NonNull Builder builder) {
-        this.segmentIDs = builder.segmentIDs;
+        this.databaseName = builder.databaseName;
         this.collectionName = builder.collectionName;
         this.collectionName = builder.collectionName;
+        this.segmentIDs = builder.segmentIDs;
         this.flushTs = builder.flushTs;
         this.flushTs = builder.flushTs;
     }
     }
 
 
@@ -31,13 +35,25 @@ public class GetFlushStateParam {
      * Builder for {@link GetFlushStateParam} class.
      * Builder for {@link GetFlushStateParam} class.
      */
      */
     public static final class Builder {
     public static final class Builder {
-        private final List<Long> segmentIDs = new ArrayList<>(); // deprecated
+        private String databaseName;
         private String collectionName;
         private String collectionName;
+        private final List<Long> segmentIDs = new ArrayList<>(); // deprecated
         private Long flushTs = 0L;
         private Long flushTs = 0L;
 
 
         private Builder() {
         private Builder() {
         }
         }
 
 
+        /**
+         * Sets the database name. database name can be nil.
+         *
+         * @param databaseName database name
+         * @return <code>Builder</code>
+         */
+        public Builder withDatabaseName(String databaseName) {
+            this.databaseName = databaseName;
+            return this;
+        }
+
         /**
         /**
          * Specify segments
          * Specify segments
          *
          *
@@ -96,16 +112,4 @@ public class GetFlushStateParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link GetFlushStateParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "GetFlushStateParam{" +
-                "collectionName='" + collectionName + '\'' +
-                ", flushTs=" + flushTs +
-                '}';
-    }
 }
 }

+ 2 - 11
src/main/java/io/milvus/param/control/GetMetricsParam.java

@@ -24,11 +24,13 @@ import io.milvus.param.ParamUtils;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 /**
 /**
  * Parameters for <code>getMetric</code> interface.
  * Parameters for <code>getMetric</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class GetMetricsParam {
 public class GetMetricsParam {
     private final String request;
     private final String request;
 
 
@@ -75,15 +77,4 @@ public class GetMetricsParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link GetMetricsParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "GetMetricsParam{" +
-                "request='" + request + '\'' +
-                '}';
-    }
 }
 }

+ 2 - 11
src/main/java/io/milvus/param/control/GetPersistentSegmentInfoParam.java

@@ -24,11 +24,13 @@ import io.milvus.param.ParamUtils;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 /**
 /**
  * Parameters for <code>getPersistentSegmentInfo</code> interface.
  * Parameters for <code>getPersistentSegmentInfo</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class GetPersistentSegmentInfoParam {
 public class GetPersistentSegmentInfoParam {
     private final String collectionName;
     private final String collectionName;
 
 
@@ -72,15 +74,4 @@ public class GetPersistentSegmentInfoParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link GetPersistentSegmentInfoParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "GetPersistentSegmentInfoParam{" +
-                "collectionName='" + collectionName + '\'' +
-                '}';
-    }
 }
 }

+ 2 - 11
src/main/java/io/milvus/param/control/GetQuerySegmentInfoParam.java

@@ -24,11 +24,13 @@ import io.milvus.param.ParamUtils;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 /**
 /**
  * Parameters for <code>getQuerySegmentInfo</code> interface.
  * Parameters for <code>getQuerySegmentInfo</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class GetQuerySegmentInfoParam {
 public class GetQuerySegmentInfoParam {
     private final String collectionName;
     private final String collectionName;
 
 
@@ -72,15 +74,4 @@ public class GetQuerySegmentInfoParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link GetQuerySegmentInfoParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "GetQuerySegmentInfoParam{" +
-                "collectionName='" + collectionName + '\'' +
-                '}';
-    }
 }
 }

+ 16 - 11
src/main/java/io/milvus/param/control/GetReplicasParam.java

@@ -4,16 +4,20 @@ import io.milvus.exception.ParamException;
 import io.milvus.param.ParamUtils;
 import io.milvus.param.ParamUtils;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 /**
 /**
  * Parameters for <code>getReplicas</code> interface.
  * Parameters for <code>getReplicas</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class GetReplicasParam {
 public class GetReplicasParam {
+    private final String databaseName;
     private final String collectionName;
     private final String collectionName;
     private boolean withShardNodes;
     private boolean withShardNodes;
 
 
     private GetReplicasParam(@NonNull Builder builder) {
     private GetReplicasParam(@NonNull Builder builder) {
+        this.databaseName = builder.databaseName;
         this.collectionName = builder.collectionName;
         this.collectionName = builder.collectionName;
         this.withShardNodes = true;
         this.withShardNodes = true;
     }
     }
@@ -26,11 +30,23 @@ public class GetReplicasParam {
      * Builder for {@link GetReplicasParam} class.
      * Builder for {@link GetReplicasParam} class.
      */
      */
     public static final class Builder {
     public static final class Builder {
+        private String databaseName;
         private String collectionName;
         private String collectionName;
 
 
         private Builder() {
         private Builder() {
         }
         }
 
 
+        /**
+         * Sets the database name. database name can be nil.
+         *
+         * @param databaseName database name
+         * @return <code>Builder</code>
+         */
+        public Builder withDatabaseName(String databaseName) {
+            this.databaseName = databaseName;
+            return this;
+        }
+
         /**
         /**
          * Sets the collection name. Collection name cannot be empty or null.
          * Sets the collection name. Collection name cannot be empty or null.
          *
          *
@@ -54,15 +70,4 @@ public class GetReplicasParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link GetReplicasParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "GetReplicasParam{" +
-                "collectionName='" + collectionName + '\'' +
-                '}';
-    }
 }
 }

+ 31 - 14
src/main/java/io/milvus/param/control/LoadBalanceParam.java

@@ -22,6 +22,7 @@ package io.milvus.param.control;
 import io.milvus.exception.ParamException;
 import io.milvus.exception.ParamException;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
@@ -32,12 +33,17 @@ import java.util.List;
  * @see <a href="https://wiki.lfaidata.foundation/display/MIL/MEP+17+--+Support+handoff+and+load+balance+segment+on+query+nodes">Handoff and load balance</a>
  * @see <a href="https://wiki.lfaidata.foundation/display/MIL/MEP+17+--+Support+handoff+and+load+balance+segment+on+query+nodes">Handoff and load balance</a>
  */
  */
 @Getter
 @Getter
+@ToString
 public class LoadBalanceParam {
 public class LoadBalanceParam {
+    private final String databaseName;
+    private final String collectionName;
     private final Long srcNodeID;
     private final Long srcNodeID;
     private final List<Long> destNodeIDs;
     private final List<Long> destNodeIDs;
     private final List<Long> segmentIDs;
     private final List<Long> segmentIDs;
 
 
     private LoadBalanceParam(@NonNull Builder builder) {
     private LoadBalanceParam(@NonNull Builder builder) {
+        this.databaseName = builder.databaseName;
+        this.collectionName = builder.collectionName;
         this.srcNodeID = builder.srcNodeID;
         this.srcNodeID = builder.srcNodeID;
         this.destNodeIDs = builder.destNodeIDs;
         this.destNodeIDs = builder.destNodeIDs;
         this.segmentIDs = builder.segmentIDs;
         this.segmentIDs = builder.segmentIDs;
@@ -47,24 +53,12 @@ public class LoadBalanceParam {
         return new Builder();
         return new Builder();
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link LoadBalanceParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "LoadBalanceParam{" +
-                "srcNodeID='" + srcNodeID + '\'' +
-                "destNodeIDs='" + destNodeIDs.toString() + '\'' +
-                "segmentIDs='" + segmentIDs.toString() + '\'' +
-                '}';
-    }
-
     /**
     /**
      * Builder for {@link LoadBalanceParam} class.
      * Builder for {@link LoadBalanceParam} class.
      */
      */
     public static final class Builder {
     public static final class Builder {
+        private String databaseName;
+        private String collectionName;
         private final List<Long> destNodeIDs = new ArrayList<>();
         private final List<Long> destNodeIDs = new ArrayList<>();
         private final List<Long> segmentIDs = new ArrayList<>();
         private final List<Long> segmentIDs = new ArrayList<>();
         private Long srcNodeID;
         private Long srcNodeID;
@@ -72,6 +66,28 @@ public class LoadBalanceParam {
         private Builder() {
         private Builder() {
         }
         }
 
 
+        /**
+         * Sets the database name. database name can be nil.
+         *
+         * @param databaseName database name
+         * @return <code>Builder</code>
+         */
+        public Builder withDatabaseName(String databaseName) {
+            this.databaseName = databaseName;
+            return this;
+        }
+
+        /**
+         * Sets the collection name. Collection name cannot be empty or null.
+         *
+         * @param collectionName collection name
+         * @return <code>Builder</code>
+         */
+        public Builder withCollectionName(@NonNull String collectionName) {
+            this.collectionName = collectionName;
+            return this;
+        }
+
         /**
         /**
          * Sets the source query node by ID in which the sealed segments were loaded.
          * Sets the source query node by ID in which the sealed segments were loaded.
          *
          *
@@ -150,4 +166,5 @@ public class LoadBalanceParam {
             return new LoadBalanceParam(this);
             return new LoadBalanceParam(this);
         }
         }
     }
     }
+
 }
 }

+ 2 - 12
src/main/java/io/milvus/param/control/ManualCompactParam.java

@@ -4,6 +4,7 @@ import io.milvus.exception.ParamException;
 import io.milvus.param.ParamUtils;
 import io.milvus.param.ParamUtils;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 /**
 /**
  * Parameters for <code>manualCompact</code> interface.
  * Parameters for <code>manualCompact</code> interface.
@@ -11,6 +12,7 @@ import lombok.NonNull;
  * @see <a href="https://wiki.lfaidata.foundation/display/MIL/MEP+16+--+Compaction">Compaction function design</a>
  * @see <a href="https://wiki.lfaidata.foundation/display/MIL/MEP+16+--+Compaction">Compaction function design</a>
  */
  */
 @Getter
 @Getter
+@ToString
 public class ManualCompactParam {
 public class ManualCompactParam {
     private final String collectionName;
     private final String collectionName;
 
 
@@ -22,18 +24,6 @@ public class ManualCompactParam {
         return new Builder();
         return new Builder();
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link ManualCompactParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "ManualCompactionParam{" +
-                "collectionName='" + collectionName + '\'' +
-                '}';
-    }
-
     /**
     /**
      * Builder for {@link ManualCompactParam} class.
      * Builder for {@link ManualCompactParam} class.
      */
      */

+ 2 - 11
src/main/java/io/milvus/param/credential/CreateCredentialParam.java

@@ -4,8 +4,10 @@ import io.milvus.exception.ParamException;
 import io.milvus.param.ParamUtils;
 import io.milvus.param.ParamUtils;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 @Getter
 @Getter
+@ToString
 public class CreateCredentialParam {
 public class CreateCredentialParam {
     private final String username;
     private final String username;
 
 
@@ -65,15 +67,4 @@ public class CreateCredentialParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link CreateCredentialParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "CreateCredentialParam{" +
-                "username='" + username +
-                '}';
-    }
 }
 }

+ 2 - 11
src/main/java/io/milvus/param/credential/DeleteCredentialParam.java

@@ -4,8 +4,10 @@ import io.milvus.exception.ParamException;
 import io.milvus.param.ParamUtils;
 import io.milvus.param.ParamUtils;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 @Getter
 @Getter
+@ToString
 public class DeleteCredentialParam {
 public class DeleteCredentialParam {
     private final String username;
     private final String username;
 
 
@@ -49,15 +51,4 @@ public class DeleteCredentialParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link DeleteCredentialParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "DeleteCredentialParam{" +
-                "username='" + username + '\'' +
-                '}';
-    }
 }
 }

+ 2 - 9
src/main/java/io/milvus/param/credential/ListCredUsersParam.java

@@ -3,8 +3,10 @@ package io.milvus.param.credential;
 import io.milvus.exception.ParamException;
 import io.milvus.exception.ParamException;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 @Getter
 @Getter
+@ToString
 public class ListCredUsersParam {
 public class ListCredUsersParam {
 
 
     private ListCredUsersParam(@NonNull ListCredUsersParam.Builder builder) {
     private ListCredUsersParam(@NonNull ListCredUsersParam.Builder builder) {
@@ -32,13 +34,4 @@ public class ListCredUsersParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link ListCredUsersParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "ListCredUsersParam{}";
-    }
 }
 }

+ 2 - 11
src/main/java/io/milvus/param/credential/UpdateCredentialParam.java

@@ -4,8 +4,10 @@ import io.milvus.exception.ParamException;
 import io.milvus.param.ParamUtils;
 import io.milvus.param.ParamUtils;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 @Getter
 @Getter
+@ToString
 public class UpdateCredentialParam {
 public class UpdateCredentialParam {
     private final String username;
     private final String username;
     private final String oldPassword;
     private final String oldPassword;
@@ -79,15 +81,4 @@ public class UpdateCredentialParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link UpdateCredentialParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "UpdateCredentialParam{" +
-                "username='" + username +
-                '}';
-    }
 }
 }

+ 16 - 13
src/main/java/io/milvus/param/dml/DeleteParam.java

@@ -24,17 +24,21 @@ import io.milvus.param.ParamUtils;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 /**
 /**
  * Parameters for <code>delete</code> interface.
  * Parameters for <code>delete</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class DeleteParam {
 public class DeleteParam {
+    protected final String databaseName;
     private final String collectionName;
     private final String collectionName;
     private final String partitionName;
     private final String partitionName;
     private final String expr;
     private final String expr;
 
 
     private DeleteParam(@NonNull Builder builder) {
     private DeleteParam(@NonNull Builder builder) {
+        this.databaseName = builder.databaseName;
         this.collectionName = builder.collectionName;
         this.collectionName = builder.collectionName;
         this.partitionName = builder.partitionName;
         this.partitionName = builder.partitionName;
         this.expr = builder.expr;
         this.expr = builder.expr;
@@ -48,6 +52,7 @@ public class DeleteParam {
      * Builder for {@link DeleteParam} class.
      * Builder for {@link DeleteParam} class.
      */
      */
     public static class Builder {
     public static class Builder {
+        private String databaseName;
         private String collectionName;
         private String collectionName;
         private String partitionName = "";
         private String partitionName = "";
         private String expr;
         private String expr;
@@ -55,6 +60,17 @@ public class DeleteParam {
         private Builder() {
         private Builder() {
         }
         }
 
 
+        /**
+         * Sets the database name. database name can be nil.
+         *
+         * @param databaseName database name
+         * @return <code>Builder</code>
+         */
+        public Builder withDatabaseName(String databaseName) {
+            this.databaseName = databaseName;
+            return this;
+        }
+
         /**
         /**
          * Sets the collection name. Collection name cannot be empty or null.
          * Sets the collection name. Collection name cannot be empty or null.
          *
          *
@@ -102,17 +118,4 @@ public class DeleteParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link DeleteParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "DeleteParam{" +
-                "collectionName='" + collectionName + '\'' +
-                ", partitionName='" + partitionName + '\'' +
-                ", expr='" + expr + '\'' +
-                '}';
-    }
 }
 }

+ 3 - 31
src/main/java/io/milvus/param/dml/InsertParam.java

@@ -25,6 +25,7 @@ import io.milvus.param.ParamUtils;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;
 
 
 import java.util.List;
 import java.util.List;
@@ -33,6 +34,7 @@ import java.util.List;
  * Parameters for <code>insert</code> interface.
  * Parameters for <code>insert</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class InsertParam {
 public class InsertParam {
     protected final List<Field> fields;
     protected final List<Field> fields;
     protected final List<JSONObject> rows;
     protected final List<JSONObject> rows;
@@ -207,24 +209,6 @@ public class InsertParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link InsertParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        String baseStr = "InsertParam{" +
-                "collectionName='" + collectionName + '\'' +
-                ", partitionName='" + partitionName + '\'' +
-                ", rowCount=" + rowCount;
-        if (!CollectionUtils.isEmpty(fields)) {
-            return baseStr + ", columns=" + fields + '}';
-        } else {
-            return baseStr + '}';
-        }
-    }
-
     /**
     /**
      * Internal class for insert data.
      * Internal class for insert data.
      * If dataType is Bool, values is List of Boolean;
      * If dataType is Bool, values is List of Boolean;
@@ -242,6 +226,7 @@ public class InsertParam {
      *
      *
      */
      */
     @lombok.Builder
     @lombok.Builder
+    @ToString
     public static class Field {
     public static class Field {
         private final String name;
         private final String name;
         private final List<?> values;
         private final List<?> values;
@@ -268,18 +253,5 @@ public class InsertParam {
         public List<?> getValues() {
         public List<?> getValues() {
             return values;
             return values;
         }
         }
-
-        /**
-         * Constructs a <code>String</code> by {@link InsertParam.Field} instance.
-         *
-         * @return <code>String</code>
-         */
-        @Override
-        public String toString() {
-            return "Field{" +
-                    "fieldName='" + name + '\'' +
-                    ", row_count=" + values.size() +
-                    '}';
-        }
     }
     }
 }
 }

+ 16 - 18
src/main/java/io/milvus/param/dml/QueryParam.java

@@ -26,6 +26,7 @@ import io.milvus.param.Constant;
 import io.milvus.param.ParamUtils;
 import io.milvus.param.ParamUtils;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
@@ -34,7 +35,9 @@ import java.util.List;
  * Parameters for <code>query</code> interface.
  * Parameters for <code>query</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class QueryParam {
 public class QueryParam {
+    private final String databaseName;
     private final String collectionName;
     private final String collectionName;
     private final List<String> partitionNames;
     private final List<String> partitionNames;
     private final List<String> outFields;
     private final List<String> outFields;
@@ -48,6 +51,7 @@ public class QueryParam {
     private final boolean ignoreGrowing;
     private final boolean ignoreGrowing;
 
 
     private QueryParam(@NonNull Builder builder) {
     private QueryParam(@NonNull Builder builder) {
+        this.databaseName = builder.databaseName;
         this.collectionName = builder.collectionName;
         this.collectionName = builder.collectionName;
         this.partitionNames = builder.partitionNames;
         this.partitionNames = builder.partitionNames;
         this.outFields = builder.outFields;
         this.outFields = builder.outFields;
@@ -69,6 +73,7 @@ public class QueryParam {
      * Builder for {@link QueryParam} class.
      * Builder for {@link QueryParam} class.
      */
      */
     public static class Builder {
     public static class Builder {
+        private String databaseName;
         private String collectionName;
         private String collectionName;
         private final List<String> partitionNames = Lists.newArrayList();
         private final List<String> partitionNames = Lists.newArrayList();
         private final List<String> outFields = new ArrayList<>();
         private final List<String> outFields = new ArrayList<>();
@@ -84,6 +89,17 @@ public class QueryParam {
         private Builder() {
         private Builder() {
         }
         }
 
 
+        /**
+         * Sets the database name. database name can be nil.
+         *
+         * @param databaseName database name
+         * @return <code>Builder</code>
+         */
+        public Builder withDatabaseName(String databaseName) {
+            this.databaseName = databaseName;
+            return this;
+        }
+
         /**
         /**
          * Sets the collection name. Collection name cannot be empty or null.
          * Sets the collection name. Collection name cannot be empty or null.
          *
          *
@@ -231,22 +247,4 @@ public class QueryParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link QueryParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "QueryParam{" +
-                "collectionName='" + collectionName + '\'' +
-                ", partitionNames='" + partitionNames.toString() + '\'' +
-                ", outFields=" + outFields.toString() +
-                ", expr='" + expr + '\'' +
-                ", consistencyLevel='" + consistencyLevel + '\'' +
-                ", offset=" + offset +
-                ", limit=" + limit +
-                ", ignoreGrowing='" + ignoreGrowing + '\'' +
-                '}';
-    }
 }
 }

+ 18 - 22
src/main/java/io/milvus/param/dml/SearchParam.java

@@ -28,6 +28,8 @@ import io.milvus.param.ParamUtils;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
+
 import java.nio.ByteBuffer;
 import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.List;
 
 
@@ -35,7 +37,9 @@ import java.util.List;
  * Parameters for <code>search</code> interface.
  * Parameters for <code>search</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class SearchParam {
 public class SearchParam {
+    private final String databaseName;
     private final String collectionName;
     private final String collectionName;
     private final List<String> partitionNames;
     private final List<String> partitionNames;
     private final String metricType;
     private final String metricType;
@@ -54,6 +58,7 @@ public class SearchParam {
     private final boolean ignoreGrowing;
     private final boolean ignoreGrowing;
 
 
     private SearchParam(@NonNull Builder builder) {
     private SearchParam(@NonNull Builder builder) {
+        this.databaseName = builder.databaseName;
         this.collectionName = builder.collectionName;
         this.collectionName = builder.collectionName;
         this.partitionNames = builder.partitionNames;
         this.partitionNames = builder.partitionNames;
         this.metricType = builder.metricType.name();
         this.metricType = builder.metricType.name();
@@ -80,6 +85,7 @@ public class SearchParam {
      * Builder for {@link SearchParam} class.
      * Builder for {@link SearchParam} class.
      */
      */
     public static class Builder {
     public static class Builder {
+        private String databaseName;
         private String collectionName;
         private String collectionName;
         private final List<String> partitionNames = Lists.newArrayList();
         private final List<String> partitionNames = Lists.newArrayList();
         private MetricType metricType = MetricType.None;
         private MetricType metricType = MetricType.None;
@@ -97,7 +103,18 @@ public class SearchParam {
         private ConsistencyLevelEnum consistencyLevel = null;
         private ConsistencyLevelEnum consistencyLevel = null;
         private Boolean ignoreGrowing = Boolean.FALSE;
         private Boolean ignoreGrowing = Boolean.FALSE;
 
 
-       Builder() {
+        Builder() {
+        }
+
+        /**
+         * Sets the database name. database name can be nil.
+         *
+         * @param databaseName database name
+         * @return <code>Builder</code>
+         */
+        public Builder withDatabaseName(String databaseName) {
+            this.databaseName = databaseName;
+            return this;
         }
         }
 
 
         /**
         /**
@@ -323,25 +340,4 @@ public class SearchParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link SearchParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "SearchParam{" +
-                "collectionName='" + collectionName + '\'' +
-                ", partitionNames='" + partitionNames.toString() + '\'' +
-                ", metricType=" + metricType +
-                ", target vectors count=" + vectors.size() +
-                ", vectorFieldName='" + vectorFieldName + '\'' +
-                ", topK=" + topK +
-                ", nq=" + NQ +
-                ", expr='" + expr + '\'' +
-                ", params='" + params + '\'' +
-                ", consistencyLevel='" + consistencyLevel + '\'' +
-                ", ignoreGrowing='" + ignoreGrowing + '\'' +
-                '}';
-    }
 }
 }

+ 2 - 17
src/main/java/io/milvus/param/dml/UpsertParam.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import io.milvus.exception.ParamException;
 import io.milvus.exception.ParamException;
 
 
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;
 
 
 import java.util.List;
 import java.util.List;
@@ -12,6 +13,7 @@ import java.util.List;
 /**
 /**
  * Parameters for <code>upsert</code> interface.
  * Parameters for <code>upsert</code> interface.
  */
  */
+@ToString
 public class UpsertParam extends InsertParam {
 public class UpsertParam extends InsertParam {
     private UpsertParam(@NonNull Builder builder) {
     private UpsertParam(@NonNull Builder builder) {
         super(builder);
         super(builder);
@@ -97,21 +99,4 @@ public class UpsertParam extends InsertParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link UpsertParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        String baseStr = "UpsertParam{" +
-                "collectionName='" + collectionName + '\'' +
-                ", partitionName='" + partitionName + '\'' +
-                ", rowCount=" + rowCount;
-        if (!CollectionUtils.isEmpty(fields)) {
-            return baseStr + ", columns=" + fields + '}';
-        } else {
-            return baseStr + '}';
-        }
-    }
 }
 }

+ 3 - 15
src/main/java/io/milvus/param/index/AlterIndexParam.java

@@ -24,6 +24,7 @@ import io.milvus.param.Constant;
 import io.milvus.param.ParamUtils;
 import io.milvus.param.ParamUtils;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map;
@@ -32,6 +33,7 @@ import java.util.Map;
  * Parameters for <code>alterCollection</code> interface.
  * Parameters for <code>alterCollection</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class AlterIndexParam {
 public class AlterIndexParam {
     private final String collectionName;
     private final String collectionName;
     private final String databaseName;
     private final String databaseName;
@@ -131,18 +133,4 @@ public class AlterIndexParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link AlterIndexParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "AlterIndexParam{" +
-                "collectionName='" + collectionName + '\'' +
-                "dbName='" + databaseName + '\'' +
-                "indexName='" + indexName + '\'' +
-                ", properties='" + properties.toString() + '\'' +
-                '}';
-    }
-}
+}

+ 2 - 12
src/main/java/io/milvus/param/index/DescribeIndexParam.java

@@ -25,12 +25,14 @@ import io.milvus.param.ParamUtils;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 
 
 /**
 /**
  * Parameters for <code>describeIndex</code> interface.
  * Parameters for <code>describeIndex</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class DescribeIndexParam {
 public class DescribeIndexParam {
     private final String databaseName;
     private final String databaseName;
     private final String collectionName;
     private final String collectionName;
@@ -104,16 +106,4 @@ public class DescribeIndexParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link DescribeIndexParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "DescribeIndexParam{" +
-                "collectionName='" + collectionName + '\'' +
-                ", indexName='" + indexName + '\'' +
-                '}';
-    }
 }
 }

+ 16 - 12
src/main/java/io/milvus/param/index/DropIndexParam.java

@@ -25,17 +25,21 @@ import io.milvus.param.ParamUtils;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 
 
 /**
 /**
  * Parameters for <code>dropIndex</code> interface.
  * Parameters for <code>dropIndex</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class DropIndexParam {
 public class DropIndexParam {
+    private final String databaseName;
     private final String collectionName;
     private final String collectionName;
     private final String indexName;
     private final String indexName;
 
 
     private DropIndexParam(@NonNull Builder builder) {
     private DropIndexParam(@NonNull Builder builder) {
+        this.databaseName = builder.databaseName;
         this.collectionName = builder.collectionName;
         this.collectionName = builder.collectionName;
         this.indexName = builder.indexName;
         this.indexName = builder.indexName;
     }
     }
@@ -48,12 +52,24 @@ public class DropIndexParam {
      * Builder for {@link DropIndexParam} class.
      * Builder for {@link DropIndexParam} class.
      */
      */
     public static final class Builder {
     public static final class Builder {
+        private String databaseName;
         private String collectionName;
         private String collectionName;
         private String indexName = Constant.DEFAULT_INDEX_NAME;
         private String indexName = Constant.DEFAULT_INDEX_NAME;
 
 
         private Builder() {
         private Builder() {
         }
         }
 
 
+        /**
+         * Sets the database name. database name can be nil.
+         *
+         * @param databaseName database name
+         * @return <code>Builder</code>
+         */
+        public Builder withDatabaseName(String databaseName) {
+            this.databaseName = databaseName;
+            return this;
+        }
+
         /**
         /**
          * Sets the collection name. Collection name cannot be empty or null.
          * Sets the collection name. Collection name cannot be empty or null.
          *
          *
@@ -93,16 +109,4 @@ public class DropIndexParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link DropIndexParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "DropIndexParam{" +
-                "collectionName='" + collectionName + '\'' +
-                ", indexName='" + indexName + '\'' +
-                '}';
-    }
 }
 }

+ 16 - 12
src/main/java/io/milvus/param/index/GetIndexBuildProgressParam.java

@@ -25,17 +25,21 @@ import io.milvus.param.ParamUtils;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 
 
 /**
 /**
  * Parameters for <code>getIndexBuildProgress</code> interface.
  * Parameters for <code>getIndexBuildProgress</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class GetIndexBuildProgressParam {
 public class GetIndexBuildProgressParam {
+    private final String databaseName;
     private final String collectionName;
     private final String collectionName;
     private final String indexName;
     private final String indexName;
 
 
     private GetIndexBuildProgressParam(@NonNull Builder builder) {
     private GetIndexBuildProgressParam(@NonNull Builder builder) {
+        this.databaseName = builder.databaseName;
         this.collectionName = builder.collectionName;
         this.collectionName = builder.collectionName;
         this.indexName = builder.indexName;
         this.indexName = builder.indexName;
     }
     }
@@ -48,12 +52,24 @@ public class GetIndexBuildProgressParam {
      * Builder for {@link GetIndexBuildProgressParam} class.
      * Builder for {@link GetIndexBuildProgressParam} class.
      */
      */
     public static final class Builder {
     public static final class Builder {
+        private String databaseName;
         private String collectionName;
         private String collectionName;
         private String indexName = Constant.DEFAULT_INDEX_NAME;
         private String indexName = Constant.DEFAULT_INDEX_NAME;
 
 
         private Builder() {
         private Builder() {
         }
         }
 
 
+        /**
+         * Sets the database name. database name can be nil.
+         *
+         * @param databaseName database name
+         * @return <code>Builder</code>
+         */
+        public Builder withDatabaseName(String databaseName) {
+            this.databaseName = databaseName;
+            return this;
+        }
+
         /**
         /**
          * Sets the collection name. Collection name cannot be empty or null.
          * Sets the collection name. Collection name cannot be empty or null.
          *
          *
@@ -93,16 +109,4 @@ public class GetIndexBuildProgressParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link GetIndexBuildProgressParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "GetIndexBuildProgressParam{" +
-                "collectionName='" + collectionName + '\'' +
-                ", indexName='" + indexName + '\'' +
-                '}';
-    }
 }
 }

+ 16 - 12
src/main/java/io/milvus/param/index/GetIndexStateParam.java

@@ -25,17 +25,21 @@ import io.milvus.param.ParamUtils;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 
 
 /**
 /**
  * Parameters for <code>getIndexState</code> interface.
  * Parameters for <code>getIndexState</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class GetIndexStateParam {
 public class GetIndexStateParam {
+    private final String databaseName;
     private final String collectionName;
     private final String collectionName;
     private final String indexName;
     private final String indexName;
 
 
     private GetIndexStateParam(@NonNull Builder builder) {
     private GetIndexStateParam(@NonNull Builder builder) {
+        this.databaseName = builder.databaseName;
         this.collectionName = builder.collectionName;
         this.collectionName = builder.collectionName;
         this.indexName = builder.indexName;
         this.indexName = builder.indexName;
     }
     }
@@ -48,12 +52,24 @@ public class GetIndexStateParam {
      * Builder for {@link GetIndexStateParam} class.
      * Builder for {@link GetIndexStateParam} class.
      */
      */
     public static final class Builder {
     public static final class Builder {
+        private String databaseName;
         private String collectionName;
         private String collectionName;
         private String indexName = Constant.DEFAULT_INDEX_NAME;
         private String indexName = Constant.DEFAULT_INDEX_NAME;
 
 
         private Builder() {
         private Builder() {
         }
         }
 
 
+        /**
+         * Sets the database name. database name can be nil.
+         *
+         * @param databaseName database name
+         * @return <code>Builder</code>
+         */
+        public Builder withDatabaseName(String databaseName) {
+            this.databaseName = databaseName;
+            return this;
+        }
+
         /**
         /**
          * Sets the collection name. Collection name cannot be empty or null.
          * Sets the collection name. Collection name cannot be empty or null.
          *
          *
@@ -93,16 +109,4 @@ public class GetIndexStateParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link GetIndexStateParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "GetIndexStateParam{" +
-                "collectionName='" + collectionName + '\'' +
-                ", indexName='" + indexName + '\'' +
-                '}';
-    }
 }
 }

+ 16 - 12
src/main/java/io/milvus/param/partition/CreatePartitionParam.java

@@ -23,16 +23,20 @@ import io.milvus.exception.ParamException;
 import io.milvus.param.ParamUtils;
 import io.milvus.param.ParamUtils;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 /**
 /**
  * Parameters for <code>createPartition</code> interface.
  * Parameters for <code>createPartition</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class CreatePartitionParam {
 public class CreatePartitionParam {
+    private final String databaseName;
     private final String collectionName;
     private final String collectionName;
     private final String partitionName;
     private final String partitionName;
 
 
     private CreatePartitionParam(@NonNull Builder builder) {
     private CreatePartitionParam(@NonNull Builder builder) {
+        this.databaseName = builder.databaseName;
         this.collectionName = builder.collectionName;
         this.collectionName = builder.collectionName;
         this.partitionName = builder.partitionName;
         this.partitionName = builder.partitionName;
     }
     }
@@ -45,12 +49,24 @@ public class CreatePartitionParam {
      * Builder for {@link CreatePartitionParam} class.
      * Builder for {@link CreatePartitionParam} class.
      */
      */
     public static final class Builder {
     public static final class Builder {
+        private String databaseName;
         private String collectionName;
         private String collectionName;
         private String partitionName;
         private String partitionName;
 
 
         private Builder() {
         private Builder() {
         }
         }
 
 
+        /**
+         * Sets the database name. database name can be nil.
+         *
+         * @param databaseName database name
+         * @return <code>Builder</code>
+         */
+        public Builder withDatabaseName(String databaseName) {
+            this.databaseName = databaseName;
+            return this;
+        }
+
         /**
         /**
          * Sets the collection name. Collection name cannot be empty or null.
          * Sets the collection name. Collection name cannot be empty or null.
          *
          *
@@ -86,16 +102,4 @@ public class CreatePartitionParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link CreatePartitionParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "CreatePartitionParam{" +
-                "collectionName='" + collectionName + '\'' +
-                ", partitionName='" + partitionName + '\'' +
-                '}';
-    }
 }
 }

+ 16 - 12
src/main/java/io/milvus/param/partition/DropPartitionParam.java

@@ -24,16 +24,20 @@ import io.milvus.param.ParamUtils;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 /**
 /**
  * Parameters for <code>dropPartition</code> interface.
  * Parameters for <code>dropPartition</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class DropPartitionParam {
 public class DropPartitionParam {
+    private final String databaseName;
     private final String collectionName;
     private final String collectionName;
     private final String partitionName;
     private final String partitionName;
 
 
     private DropPartitionParam(@NonNull Builder builder) {
     private DropPartitionParam(@NonNull Builder builder) {
+        this.databaseName = builder.databaseName;
         this.collectionName = builder.collectionName;
         this.collectionName = builder.collectionName;
         this.partitionName = builder.partitionName;
         this.partitionName = builder.partitionName;
     }
     }
@@ -46,12 +50,24 @@ public class DropPartitionParam {
      * Builder for {@link DropPartitionParam} class.
      * Builder for {@link DropPartitionParam} class.
      */
      */
     public static final class Builder {
     public static final class Builder {
+        private String databaseName;
         private String collectionName;
         private String collectionName;
         private String partitionName;
         private String partitionName;
 
 
         private Builder() {
         private Builder() {
         }
         }
 
 
+        /**
+         * Sets the database name. database name can be nil.
+         *
+         * @param databaseName database name
+         * @return <code>Builder</code>
+         */
+        public Builder withDatabaseName(String databaseName) {
+            this.databaseName = databaseName;
+            return this;
+        }
+
         /**
         /**
          * Sets the collection name. Collection name cannot be empty or null.
          * Sets the collection name. Collection name cannot be empty or null.
          *
          *
@@ -87,16 +103,4 @@ public class DropPartitionParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link DropPartitionParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "DropPartitionParam{" +
-                "collectionName='" + collectionName + '\'' +
-                ", partitionName='" + partitionName + '\'' +
-                '}';
-    }
 }
 }

+ 16 - 13
src/main/java/io/milvus/param/partition/GetPartitionStatisticsParam.java

@@ -24,17 +24,21 @@ import io.milvus.param.ParamUtils;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 /**
 /**
  * Parameters for <code>getPartitionStatistics</code> interface.
  * Parameters for <code>getPartitionStatistics</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class GetPartitionStatisticsParam {
 public class GetPartitionStatisticsParam {
+    private final String databaseName;
     private final String collectionName;
     private final String collectionName;
     private final String partitionName;
     private final String partitionName;
     private final boolean flushCollection;
     private final boolean flushCollection;
 
 
     private GetPartitionStatisticsParam(@NonNull Builder builder) {
     private GetPartitionStatisticsParam(@NonNull Builder builder) {
+        this.databaseName = builder.databaseName;
         this.collectionName = builder.collectionName;
         this.collectionName = builder.collectionName;
         this.partitionName = builder.partitionName;
         this.partitionName = builder.partitionName;
         this.flushCollection = builder.flushCollection;
         this.flushCollection = builder.flushCollection;
@@ -48,6 +52,7 @@ public class GetPartitionStatisticsParam {
      * Builder for {@link GetPartitionStatisticsParam} class.
      * Builder for {@link GetPartitionStatisticsParam} class.
      */
      */
     public static final class Builder {
     public static final class Builder {
+        private String databaseName;
         private String collectionName;
         private String collectionName;
         private String partitionName;
         private String partitionName;
 
 
@@ -58,6 +63,17 @@ public class GetPartitionStatisticsParam {
         private Builder() {
         private Builder() {
         }
         }
 
 
+        /**
+         * Sets the database name. database name can be nil.
+         *
+         * @param databaseName database name
+         * @return <code>Builder</code>
+         */
+        public Builder withDatabaseName(String databaseName) {
+            this.databaseName = databaseName;
+            return this;
+        }
+
         /**
         /**
          * Sets the collection name. Collection name cannot be empty or null.
          * Sets the collection name. Collection name cannot be empty or null.
          *
          *
@@ -104,17 +120,4 @@ public class GetPartitionStatisticsParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link GetPartitionStatisticsParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "GetPartitionStatisticsParam{" +
-                "collectionName='" + collectionName + '\'' +
-                ", partitionName='" + partitionName + '\'' +
-                ", flush=" + flushCollection +
-                '}';
-    }
 }
 }

+ 16 - 12
src/main/java/io/milvus/param/partition/HasPartitionParam.java

@@ -24,16 +24,20 @@ import io.milvus.param.ParamUtils;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 /**
 /**
  * Parameters for <code>hasPartition</code> interface.
  * Parameters for <code>hasPartition</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class HasPartitionParam {
 public class HasPartitionParam {
+    private final String databaseName;
     private final String collectionName;
     private final String collectionName;
     private final String partitionName;
     private final String partitionName;
 
 
     private HasPartitionParam(@NonNull Builder builder) {
     private HasPartitionParam(@NonNull Builder builder) {
+        this.databaseName = builder.databaseName;
         this.collectionName = builder.collectionName;
         this.collectionName = builder.collectionName;
         this.partitionName = builder.partitionName;
         this.partitionName = builder.partitionName;
     }
     }
@@ -46,12 +50,24 @@ public class HasPartitionParam {
      * Builder for {@link HasPartitionParam} class.
      * Builder for {@link HasPartitionParam} class.
      */
      */
     public static final class Builder {
     public static final class Builder {
+        private String databaseName;
         private String collectionName;
         private String collectionName;
         private String partitionName;
         private String partitionName;
 
 
         private Builder() {
         private Builder() {
         }
         }
 
 
+        /**
+         * Sets the database name. database name can be nil.
+         *
+         * @param databaseName database name
+         * @return <code>Builder</code>
+         */
+        public Builder withDatabaseName(String databaseName) {
+            this.databaseName = databaseName;
+            return this;
+        }
+
         /**
         /**
          * Sets the collection name. Collection name cannot be empty or null.
          * Sets the collection name. Collection name cannot be empty or null.
          *
          *
@@ -87,16 +103,4 @@ public class HasPartitionParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link HasPartitionParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "HasPartitionParam{" +
-                "collectionName='" + collectionName + '\'' +
-                ", partitionName='" + partitionName + '\'' +
-                '}';
-    }
 }
 }

+ 3 - 14
src/main/java/io/milvus/param/partition/LoadPartitionsParam.java

@@ -25,6 +25,8 @@ import io.milvus.param.ParamUtils;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
+
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 import java.util.Objects;
 import java.util.Objects;
@@ -33,6 +35,7 @@ import java.util.Objects;
  * Parameters for <code>loadPartition</code> interface.
  * Parameters for <code>loadPartition</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class LoadPartitionsParam {
 public class LoadPartitionsParam {
     private final String databaseName;
     private final String databaseName;
     private final String collectionName;
     private final String collectionName;
@@ -260,18 +263,4 @@ public class LoadPartitionsParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link LoadPartitionsParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "LoadPartitionsParam{" +
-                "collectionName='" + collectionName + '\'' +
-                ", partitionName='" + partitionNames.toString() + '\'' +
-                ", syncLoad=" + syncLoad +
-                ", syncLoadWaitingInterval=" + syncLoadWaitingInterval +
-                '}';
-    }
 }
 }

+ 17 - 12
src/main/java/io/milvus/param/partition/ReleasePartitionsParam.java

@@ -24,6 +24,8 @@ import io.milvus.param.ParamUtils;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
+
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
@@ -31,11 +33,14 @@ import java.util.List;
  * Parameters for <code>releasePartition</code> interface.
  * Parameters for <code>releasePartition</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class ReleasePartitionsParam {
 public class ReleasePartitionsParam {
+    private final String databaseName;
     private final String collectionName;
     private final String collectionName;
     private final List<String> partitionNames;
     private final List<String> partitionNames;
 
 
     private ReleasePartitionsParam(@NonNull Builder builder) {
     private ReleasePartitionsParam(@NonNull Builder builder) {
+        this.databaseName = builder.databaseName;
         this.collectionName = builder.collectionName;
         this.collectionName = builder.collectionName;
         this.partitionNames = builder.partitionNames;
         this.partitionNames = builder.partitionNames;
     }
     }
@@ -48,12 +53,24 @@ public class ReleasePartitionsParam {
      * Builder for {@link ReleasePartitionsParam} class.
      * Builder for {@link ReleasePartitionsParam} class.
      */
      */
     public static final class Builder {
     public static final class Builder {
+        private String databaseName;
         private String collectionName;
         private String collectionName;
         private final List<String> partitionNames = new ArrayList<>();
         private final List<String> partitionNames = new ArrayList<>();
 
 
         private Builder() {
         private Builder() {
         }
         }
 
 
+        /**
+         * Sets the database name. database name can be nil.
+         *
+         * @param databaseName database name
+         * @return <code>Builder</code>
+         */
+        public Builder withDatabaseName(String databaseName) {
+            this.databaseName = databaseName;
+            return this;
+        }
+
         /**
         /**
          * Sets the collection name. Collection name cannot be empty or null.
          * Sets the collection name. Collection name cannot be empty or null.
          *
          *
@@ -109,16 +126,4 @@ public class ReleasePartitionsParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link ReleasePartitionsParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "ReleasePartitionsParam{" +
-                "collectionName='" + collectionName + '\'' +
-                ", partitionNames='" + partitionNames.toString() + '\'' +
-                '}';
-    }
 }
 }

+ 17 - 13
src/main/java/io/milvus/param/partition/ShowPartitionsParam.java

@@ -25,6 +25,8 @@ import io.milvus.param.ParamUtils;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
+
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
@@ -32,12 +34,15 @@ import java.util.List;
  * Parameters for <code>showPartition</code> interface.
  * Parameters for <code>showPartition</code> interface.
  */
  */
 @Getter
 @Getter
+@ToString
 public class ShowPartitionsParam {
 public class ShowPartitionsParam {
+    private final String databaseName;
     private final String collectionName;
     private final String collectionName;
     private final List<String> partitionNames;
     private final List<String> partitionNames;
     private final ShowType showType;
     private final ShowType showType;
 
 
     private ShowPartitionsParam(@NonNull Builder builder) {
     private ShowPartitionsParam(@NonNull Builder builder) {
+        this.databaseName = builder.databaseName;
         this.collectionName = builder.collectionName;
         this.collectionName = builder.collectionName;
         this.partitionNames = builder.partitionNames;
         this.partitionNames = builder.partitionNames;
         this.showType = builder.showType;
         this.showType = builder.showType;
@@ -51,6 +56,7 @@ public class ShowPartitionsParam {
      * Builder for {@link ShowPartitionsParam} class.
      * Builder for {@link ShowPartitionsParam} class.
      */
      */
     public static final class Builder {
     public static final class Builder {
+        private String databaseName;
         private String collectionName;
         private String collectionName;
         private final List<String> partitionNames = new ArrayList<>();
         private final List<String> partitionNames = new ArrayList<>();
 
 
@@ -62,6 +68,17 @@ public class ShowPartitionsParam {
         private Builder() {
         private Builder() {
         }
         }
 
 
+        /**
+         * Sets the database name. database name can be nil.
+         *
+         * @param databaseName database name
+         * @return <code>Builder</code>
+         */
+        public Builder withDatabaseName(String databaseName) {
+            this.databaseName = databaseName;
+            return this;
+        }
+
         /**
         /**
          * Sets the collection name. Collection name cannot be empty or null.
          * Sets the collection name. Collection name cannot be empty or null.
          *
          *
@@ -116,17 +133,4 @@ public class ShowPartitionsParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link ShowPartitionsParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "ShowPartitionsParam{" +
-                "collectionName='" + collectionName + '\'' +
-                ", partitionNames='" + partitionNames.toString() + '\'' +
-                ", showType=" + showType.toString() +
-                '}';
-    }
 }
 }

+ 2 - 11
src/main/java/io/milvus/param/resourcegroup/CreateResourceGroupParam.java

@@ -24,8 +24,10 @@ import io.milvus.exception.ParamException;
 import io.milvus.param.ParamUtils;
 import io.milvus.param.ParamUtils;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 @Getter
 @Getter
+@ToString
 public class CreateResourceGroupParam {
 public class CreateResourceGroupParam {
     private final String groupName;
     private final String groupName;
 
 
@@ -69,15 +71,4 @@ public class CreateResourceGroupParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link CreateResourceGroupParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "CreateResourceGroupParam{" +
-                "groupName='" + groupName +
-                '}';
-    }
 }
 }

+ 2 - 11
src/main/java/io/milvus/param/resourcegroup/DescribeResourceGroupParam.java

@@ -24,8 +24,10 @@ import io.milvus.exception.ParamException;
 import io.milvus.param.ParamUtils;
 import io.milvus.param.ParamUtils;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 @Getter
 @Getter
+@ToString
 public class DescribeResourceGroupParam {
 public class DescribeResourceGroupParam {
     private final String groupName;
     private final String groupName;
 
 
@@ -69,15 +71,4 @@ public class DescribeResourceGroupParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link DescribeResourceGroupParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "DescribeResourceGroupParam{" +
-                "groupName='" + groupName +
-                '}';
-    }
 }
 }

+ 2 - 11
src/main/java/io/milvus/param/resourcegroup/DropResourceGroupParam.java

@@ -24,8 +24,10 @@ import io.milvus.exception.ParamException;
 import io.milvus.param.ParamUtils;
 import io.milvus.param.ParamUtils;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 @Getter
 @Getter
+@ToString
 public class DropResourceGroupParam {
 public class DropResourceGroupParam {
     private final String groupName;
     private final String groupName;
 
 
@@ -69,15 +71,4 @@ public class DropResourceGroupParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link DropResourceGroupParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "DropResourceGroupParam{" +
-                "groupName='" + groupName +
-                '}';
-    }
 }
 }

+ 2 - 0
src/main/java/io/milvus/param/resourcegroup/ListResourceGroupsParam.java

@@ -23,8 +23,10 @@ package io.milvus.param.resourcegroup;
 import io.milvus.exception.ParamException;
 import io.milvus.exception.ParamException;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 @Getter
 @Getter
+@ToString
 public class ListResourceGroupsParam {
 public class ListResourceGroupsParam {
     private ListResourceGroupsParam(@NonNull Builder builder) {
     private ListResourceGroupsParam(@NonNull Builder builder) {
     }
     }

+ 2 - 13
src/main/java/io/milvus/param/resourcegroup/TransferNodeParam.java

@@ -24,8 +24,10 @@ import io.milvus.exception.ParamException;
 import io.milvus.param.ParamUtils;
 import io.milvus.param.ParamUtils;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 @Getter
 @Getter
+@ToString
 public class TransferNodeParam {
 public class TransferNodeParam {
     private final String sourceGroupName;
     private final String sourceGroupName;
     private final String targetGroupName;
     private final String targetGroupName;
@@ -98,17 +100,4 @@ public class TransferNodeParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link TransferNodeParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "TransferNodeParam{" +
-                "sourceGroupName='" + sourceGroupName + '\'' +
-                "targetGroupName='" + targetGroupName + '\'' +
-                "nodeNumber='" + nodeNumber +
-                '}';
-    }
 }
 }

+ 2 - 15
src/main/java/io/milvus/param/resourcegroup/TransferReplicaParam.java

@@ -24,8 +24,10 @@ import io.milvus.exception.ParamException;
 import io.milvus.param.ParamUtils;
 import io.milvus.param.ParamUtils;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
+import lombok.ToString;
 
 
 @Getter
 @Getter
+@ToString
 public class TransferReplicaParam {
 public class TransferReplicaParam {
     private final String sourceGroupName;
     private final String sourceGroupName;
     private final String targetGroupName;
     private final String targetGroupName;
@@ -131,19 +133,4 @@ public class TransferReplicaParam {
         }
         }
     }
     }
 
 
-    /**
-     * Constructs a <code>String</code> by {@link TransferReplicaParam} instance.
-     *
-     * @return <code>String</code>
-     */
-    @Override
-    public String toString() {
-        return "TransferReplicaParam{" +
-                "sourceGroupName='" + sourceGroupName + '\'' +
-                "targetGroupName='" + targetGroupName + '\'' +
-                "collectionName='" + collectionName + '\'' +
-                "databaseName='" + databaseName + '\'' +
-                "replicaNumber='" + replicaNumber +
-                '}';
-    }
 }
 }

+ 16 - 1
src/main/java/io/milvus/param/role/SelectGrantForRoleParam.java

@@ -2,6 +2,7 @@ package io.milvus.param.role;
 
 
 import io.milvus.exception.ParamException;
 import io.milvus.exception.ParamException;
 import io.milvus.param.ParamUtils;
 import io.milvus.param.ParamUtils;
+import io.milvus.param.partition.ShowPartitionsParam;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
 import lombok.ToString;
 import lombok.ToString;
@@ -9,10 +10,12 @@ import lombok.ToString;
 @Getter
 @Getter
 @ToString
 @ToString
 public class SelectGrantForRoleParam {
 public class SelectGrantForRoleParam {
+    private final String databaseName;
 
 
     private final String roleName;
     private final String roleName;
 
 
     private SelectGrantForRoleParam(@NonNull SelectGrantForRoleParam.Builder builder) {
     private SelectGrantForRoleParam(@NonNull SelectGrantForRoleParam.Builder builder) {
+        this.databaseName = builder.databaseName;
         this.roleName = builder.roleName;
         this.roleName = builder.roleName;
     }
     }
 
 
@@ -24,11 +27,23 @@ public class SelectGrantForRoleParam {
      * Builder for {@link SelectGrantForRoleParam} class.
      * Builder for {@link SelectGrantForRoleParam} class.
      */
      */
     public static final class Builder {
     public static final class Builder {
+        private String databaseName;
         private String roleName;
         private String roleName;
 
 
         private Builder() {
         private Builder() {
         }
         }
 
 
+        /**
+         * Sets the database name. database name can be nil.
+         *
+         * @param databaseName database name
+         * @return <code>Builder</code>
+         */
+        public Builder withDatabaseName(String databaseName) {
+            this.databaseName = databaseName;
+            return this;
+        }
+
         /**
         /**
          * Sets the roleName. RoleName cannot be empty or null.
          * Sets the roleName. RoleName cannot be empty or null.
          *
          *
@@ -52,4 +67,4 @@ public class SelectGrantForRoleParam {
         }
         }
     }
     }
 
 
-}
+}

+ 1 - 1
src/main/java/io/milvus/response/SearchResultsWrapper.java

@@ -57,8 +57,8 @@ public class SearchResultsWrapper extends RowRecordWrapper {
      */
      */
     public List<QueryResultsWrapper.RowRecord> getRowRecords(int indexOfTarget) {
     public List<QueryResultsWrapper.RowRecord> getRowRecords(int indexOfTarget) {
         List<QueryResultsWrapper.RowRecord> records = new ArrayList<>();
         List<QueryResultsWrapper.RowRecord> records = new ArrayList<>();
-        long topK = results.getTopK();
         List<IDScore> idScore = getIDScore(indexOfTarget);
         List<IDScore> idScore = getIDScore(indexOfTarget);
+        long topK = Math.min(results.getTopK(), idScore.size());
         for (int i = 0; i < topK; ++i) {
         for (int i = 0; i < topK; ++i) {
             IDScore score = idScore.get(i);
             IDScore score = idScore.get(i);
             QueryResultsWrapper.RowRecord record = new QueryResultsWrapper.RowRecord();
             QueryResultsWrapper.RowRecord record = new QueryResultsWrapper.RowRecord();