Refine code (#954)

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

src/main/java/io/milvus/v2/service/collection/CollectionService.java

@@ -143,10 +143,10 @@ public class CollectionService extends BaseService {
         }
     }
 
-    public ListCollectionsResp listCollections(MilvusServiceGrpc.MilvusServiceBlockingStub milvusServiceBlockingStub) {
+    public ListCollectionsResp listCollections(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub) {
         ShowCollectionsRequest showCollectionsRequest = ShowCollectionsRequest.newBuilder()
                 .build();
-        ShowCollectionsResponse response = milvusServiceBlockingStub.showCollections(showCollectionsRequest);
+        ShowCollectionsResponse response = blockingStub.showCollections(showCollectionsRequest);
         ListCollectionsResp listCollectionsResp = ListCollectionsResp.builder()
                 .collectionNames(response.getCollectionNamesList())
                 .build();
@@ -154,35 +154,35 @@ public class CollectionService extends BaseService {
         return listCollectionsResp;
     }
 
-    public void dropCollection(MilvusServiceGrpc.MilvusServiceBlockingStub milvusServiceBlockingStub, DropCollectionReq request) {
+    public void dropCollection(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, DropCollectionReq request) {
 
         String title = String.format("DropCollectionRequest collectionName:%s", request.getCollectionName());
         DropCollectionRequest dropCollectionRequest = DropCollectionRequest.newBuilder()
                 .setCollectionName(request.getCollectionName())
                 .build();
-        Status status = milvusServiceBlockingStub.dropCollection(dropCollectionRequest);
+        Status status = blockingStub.dropCollection(dropCollectionRequest);
         rpcUtils.handleResponse(title, status);
 
         if (request.getAsync()) {
-            WaitForDropCollection(milvusServiceBlockingStub, request);
+            WaitForDropCollection(blockingStub, request);
         }
     }
 
-    public Boolean hasCollection(MilvusServiceGrpc.MilvusServiceBlockingStub milvusServiceBlockingStub, HasCollectionReq request) {
+    public Boolean hasCollection(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, HasCollectionReq request) {
         HasCollectionRequest hasCollectionRequest = HasCollectionRequest.newBuilder()
                 .setCollectionName(request.getCollectionName())
                 .build();
-        BoolResponse response = milvusServiceBlockingStub.hasCollection(hasCollectionRequest);
+        BoolResponse response = blockingStub.hasCollection(hasCollectionRequest);
         rpcUtils.handleResponse("HasCollectionRequest", response.getStatus());
         return response.getValue();
     }
 
-    public DescribeCollectionResp describeCollection(MilvusServiceGrpc.MilvusServiceBlockingStub milvusServiceBlockingStub, DescribeCollectionReq request) {
+    public DescribeCollectionResp describeCollection(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, DescribeCollectionReq request) {
         String title = String.format("DescribeCollectionRequest collectionName:%s", request.getCollectionName());
         DescribeCollectionRequest describeCollectionRequest = DescribeCollectionRequest.newBuilder()
                 .setCollectionName(request.getCollectionName())
                 .build();
-        DescribeCollectionResponse response = milvusServiceBlockingStub.describeCollection(describeCollectionRequest);
+        DescribeCollectionResponse response = blockingStub.describeCollection(describeCollectionRequest);
         rpcUtils.handleResponse(title, response.getStatus());
         return convertDescCollectionResp(response);
     }
@@ -204,42 +204,42 @@ public class CollectionService extends BaseService {
         return describeCollectionResp;
     }
 
-    public void renameCollection(MilvusServiceGrpc.MilvusServiceBlockingStub milvusServiceBlockingStub, RenameCollectionReq request) {
+    public void renameCollection(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, RenameCollectionReq request) {
         String title = String.format("RenameCollectionRequest collectionName:%s", request.getCollectionName());
         RenameCollectionRequest renameCollectionRequest = RenameCollectionRequest.newBuilder()
                 .setOldName(request.getCollectionName())
                 .setNewName(request.getNewCollectionName())
                 .build();
-        Status status = milvusServiceBlockingStub.renameCollection(renameCollectionRequest);
+        Status status = blockingStub.renameCollection(renameCollectionRequest);
         rpcUtils.handleResponse(title, status);
     }
 
-    public void loadCollection(MilvusServiceGrpc.MilvusServiceBlockingStub milvusServiceBlockingStub, LoadCollectionReq request) {
+    public void loadCollection(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, LoadCollectionReq request) {
         String title = String.format("LoadCollectionRequest collectionName:%s", request.getCollectionName());
         LoadCollectionRequest loadCollectionRequest = LoadCollectionRequest.newBuilder()
                 .setCollectionName(request.getCollectionName())
                 .setReplicaNumber(request.getNumReplicas())
                 .build();
-        Status status = milvusServiceBlockingStub.loadCollection(loadCollectionRequest);
+        Status status = blockingStub.loadCollection(loadCollectionRequest);
         rpcUtils.handleResponse(title, status);
         if (request.getAsync()) {
-            WaitForLoadCollection(milvusServiceBlockingStub, request);
+            WaitForLoadCollection(blockingStub, request);
         }
     }
 
-    public void releaseCollection(MilvusServiceGrpc.MilvusServiceBlockingStub milvusServiceBlockingStub, ReleaseCollectionReq request) {
+    public void releaseCollection(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, ReleaseCollectionReq request) {
         String title = String.format("ReleaseCollectionRequest collectionName:%s", request.getCollectionName());
         ReleaseCollectionRequest releaseCollectionRequest = ReleaseCollectionRequest.newBuilder()
                 .setCollectionName(request.getCollectionName())
                 .build();
-        Status status = milvusServiceBlockingStub.releaseCollection(releaseCollectionRequest);
+        Status status = blockingStub.releaseCollection(releaseCollectionRequest);
         rpcUtils.handleResponse(title, status);
         if (request.getAsync()) {
-            waitForCollectionRelease(milvusServiceBlockingStub, request);
+            waitForCollectionRelease(blockingStub, request);
         }
     }
 
-    public Boolean getLoadState(MilvusServiceGrpc.MilvusServiceBlockingStub milvusServiceBlockingStub, GetLoadStateReq request) {
+    public Boolean getLoadState(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, GetLoadStateReq request) {
         // getLoadState
         String title = String.format("GetLoadStateRequest collectionName:%s", request.getCollectionName());
         GetLoadStateRequest getLoadStateRequest = GetLoadStateRequest.newBuilder()
@@ -248,7 +248,7 @@ public class CollectionService extends BaseService {
         if(request.getPartitionName() != null) {
             getLoadStateRequest = getLoadStateRequest.toBuilder().addPartitionNames(request.getPartitionName()).build();
         }
-        GetLoadStateResponse response = milvusServiceBlockingStub.getLoadState(getLoadStateRequest);
+        GetLoadStateResponse response = blockingStub.getLoadState(getLoadStateRequest);
         rpcUtils.handleResponse(title, response.getStatus());
         return response.getState() == LoadState.LoadStateLoaded;
     }
@@ -272,13 +272,13 @@ public class CollectionService extends BaseService {
                 .build();
     }
 
-    public void waitForCollectionRelease(MilvusServiceGrpc.MilvusServiceBlockingStub milvusServiceBlockingStub, ReleaseCollectionReq request) {
+    public void waitForCollectionRelease(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, ReleaseCollectionReq request) {
         boolean isLoaded = true;
         long startTime = System.currentTimeMillis(); // Capture start time/ Timeout in milliseconds (60 seconds)
 
         while (isLoaded) {
             // Call the getLoadState method
-            isLoaded = getLoadState(milvusServiceBlockingStub, GetLoadStateReq.builder().collectionName(request.getCollectionName()).build());
+            isLoaded = getLoadState(blockingStub, GetLoadStateReq.builder().collectionName(request.getCollectionName()).build());
             if (isLoaded) {
                 // Check if timeout is exceeded
                 if (System.currentTimeMillis() - startTime > request.getTimeout()) {
@@ -296,13 +296,13 @@ public class CollectionService extends BaseService {
         }
     }
 
-    private void WaitForLoadCollection(MilvusServiceGrpc.MilvusServiceBlockingStub milvusServiceBlockingStub, LoadCollectionReq request) {
+    private void WaitForLoadCollection(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, LoadCollectionReq request) {
         boolean isLoaded = false;
         long startTime = System.currentTimeMillis(); // Capture start time/ Timeout in milliseconds (60 seconds)
 
         while (!isLoaded) {
             // Call the getLoadState method
-            isLoaded = getLoadState(milvusServiceBlockingStub, GetLoadStateReq.builder().collectionName(request.getCollectionName()).build());
+            isLoaded = getLoadState(blockingStub, GetLoadStateReq.builder().collectionName(request.getCollectionName()).build());
             if (!isLoaded) {
                 // Check if timeout is exceeded
                 if (System.currentTimeMillis() - startTime > request.getTimeout()) {
@@ -320,13 +320,13 @@ public class CollectionService extends BaseService {
         }
     }
 
-    private void WaitForDropCollection(MilvusServiceGrpc.MilvusServiceBlockingStub milvusServiceBlockingStub, DropCollectionReq request) {
+    private void WaitForDropCollection(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, DropCollectionReq request) {
         boolean hasCollection = true;
         long startTime = System.currentTimeMillis(); // Capture start time/ Timeout in milliseconds (60 seconds)
 
         while (hasCollection) {
             // Call the getLoadState method
-            hasCollection = hasCollection(milvusServiceBlockingStub, HasCollectionReq.builder().collectionName(request.getCollectionName()).build());
+            hasCollection = hasCollection(blockingStub, HasCollectionReq.builder().collectionName(request.getCollectionName()).build());
             if (hasCollection) {
                 // Check if timeout is exceeded
                 if (System.currentTimeMillis() - startTime > request.getTimeout()) {

src/main/java/io/milvus/v2/service/index/IndexService.java

@@ -36,7 +36,7 @@ import java.util.stream.Collectors;
 
 public class IndexService extends BaseService {
 
-    public void createIndex(MilvusServiceGrpc.MilvusServiceBlockingStub milvusServiceBlockingStub, CreateIndexReq request) {
+    public void createIndex(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, CreateIndexReq request) {
         for(IndexParam indexParam : request.getIndexParams()) {
             String title = String.format("CreateIndexRequest collectionName:%s, fieldName:%s",
                     request.getCollectionName(), indexParam.getFieldName());
@@ -69,12 +69,12 @@ public class IndexService extends BaseService {
                 }
             }
 
-            Status status = milvusServiceBlockingStub.createIndex(createIndexRequest);
+            Status status = blockingStub.createIndex(createIndexRequest);
             rpcUtils.handleResponse(title, status);
         }
     }
 
-    public void dropIndex(MilvusServiceGrpc.MilvusServiceBlockingStub milvusServiceBlockingStub, DropIndexReq request) {
+    public void dropIndex(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, DropIndexReq request) {
         String title = String.format("DropIndexRequest collectionName:%s, fieldName:%s, indexName:%s",
                 request.getCollectionName(), request.getFieldName(), request.getIndexName());
         DropIndexRequest dropIndexRequest = DropIndexRequest.newBuilder()
@@ -83,11 +83,11 @@ public class IndexService extends BaseService {
                 .setIndexName(request.getIndexName() == null ? "" : request.getIndexName())
                 .build();
 
-        Status status = milvusServiceBlockingStub.dropIndex(dropIndexRequest);
+        Status status = blockingStub.dropIndex(dropIndexRequest);
         rpcUtils.handleResponse(title, status);
     }
 
-    public DescribeIndexResp describeIndex(MilvusServiceGrpc.MilvusServiceBlockingStub milvusServiceBlockingStub, DescribeIndexReq request) {
+    public DescribeIndexResp describeIndex(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, DescribeIndexReq request) {
         String title = String.format("DescribeIndexRequest collectionName:%s, fieldName:%s, indexName:%s",
                 request.getCollectionName(), request.getFieldName(), request.getIndexName());
         DescribeIndexRequest describeIndexRequest = DescribeIndexRequest.newBuilder()
@@ -96,7 +96,7 @@ public class IndexService extends BaseService {
                 .setIndexName(request.getIndexName() == null ? "" : request.getIndexName())
                 .build();
 
-        DescribeIndexResponse response = milvusServiceBlockingStub.describeIndex(describeIndexRequest);
+        DescribeIndexResponse response = blockingStub.describeIndex(describeIndexRequest);
         rpcUtils.handleResponse(title, response.getStatus());
         List<IndexDescription> indexs = response.getIndexDescriptionsList().stream().filter(index -> index.getIndexName().equals(request.getIndexName()) || index.getFieldName().equals(request.getFieldName())).collect(Collectors.toList());
         if (indexs.isEmpty()) {

src/main/java/io/milvus/v2/service/vector/VectorService.java

@@ -125,7 +125,7 @@ public class VectorService extends BaseService {
                 .build();
     }
 
-    public QueryResp query(MilvusServiceGrpc.MilvusServiceBlockingStub milvusServiceBlockingStub, QueryReq request) {
+    public QueryResp query(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, QueryReq request) {
         String title = String.format("QueryRequest collectionName:%s", request.getCollectionName());
         if (request.getFilter() == null && request.getIds() == null) {
             throw new MilvusClientException(ErrorCode.INVALID_PARAMS, "filter and ids can't be null at the same time");
@@ -133,12 +133,12 @@ public class VectorService extends BaseService {
             throw new MilvusClientException(ErrorCode.INVALID_PARAMS, "filter and ids can't be set at the same time");
         }
 
-        DescribeCollectionResp descR = collectionService.describeCollection(milvusServiceBlockingStub, DescribeCollectionReq.builder().collectionName(request.getCollectionName()).build());
+        DescribeCollectionResp descR = collectionService.describeCollection(blockingStub, DescribeCollectionReq.builder().collectionName(request.getCollectionName()).build());
 
         if (request.getIds() != null && request.getFilter() == null) {
             request.setFilter(vectorUtils.getExprById(descR.getPrimaryFieldName(), request.getIds()));
         }
-        QueryResults response = milvusServiceBlockingStub.query(vectorUtils.ConvertToGrpcQueryRequest(request));
+        QueryResults response = blockingStub.query(vectorUtils.ConvertToGrpcQueryRequest(request));
         rpcUtils.handleResponse(title, response.getStatus());
 
         return QueryResp.builder()
@@ -147,14 +147,14 @@ public class VectorService extends BaseService {
 
     }
 
-    public SearchResp search(MilvusServiceGrpc.MilvusServiceBlockingStub milvusServiceBlockingStub, SearchReq request) {
+    public SearchResp search(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, SearchReq request) {
         String title = String.format("SearchRequest collectionName:%s", request.getCollectionName());
 
-        //checkCollectionExist(milvusServiceBlockingStub, request.getCollectionName());
+        //checkCollectionExist(blockingStub, request.getCollectionName());
 
         SearchRequest searchRequest = vectorUtils.ConvertToGrpcSearchRequest(request);
 
-        SearchResults response = milvusServiceBlockingStub.search(searchRequest);
+        SearchResults response = blockingStub.search(searchRequest);
 
         rpcUtils.handleResponse(title, response.getStatus());
 
@@ -179,14 +179,14 @@ public class VectorService extends BaseService {
         return new SearchIterator(request, blockingStub, pkField);
     }
 
-    public DeleteResp delete(MilvusServiceGrpc.MilvusServiceBlockingStub milvusServiceBlockingStub, DeleteReq request) {
+    public DeleteResp delete(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, DeleteReq request) {
         String title = String.format("DeleteRequest collectionName:%s", request.getCollectionName());
 
         if (request.getFilter() != null && request.getIds() != null) {
             throw new MilvusClientException(ErrorCode.INVALID_PARAMS, "filter and ids can't be set at the same time");
         }
 
-        DescribeCollectionResponse descResp = getCollectionInfo(milvusServiceBlockingStub, "", request.getCollectionName());
+        DescribeCollectionResponse descResp = getCollectionInfo(blockingStub, "", request.getCollectionName());
         DescribeCollectionResp respR = CollectionService.convertDescCollectionResp(descResp);
         if (request.getFilter() == null) {
             request.setFilter(vectorUtils.getExprById(respR.getPrimaryFieldName(), request.getIds()));
@@ -196,14 +196,14 @@ public class VectorService extends BaseService {
                 .setPartitionName(request.getPartitionName())
                 .setExpr(request.getFilter())
                 .build();
-        MutationResult response = milvusServiceBlockingStub.delete(deleteRequest);
+        MutationResult response = blockingStub.delete(deleteRequest);
         rpcUtils.handleResponse(title, response.getStatus());
         return DeleteResp.builder()
                 .deleteCnt(response.getDeleteCnt())
                 .build();
     }
 
-    public GetResp get(MilvusServiceGrpc.MilvusServiceBlockingStub milvusServiceBlockingStub, GetReq request) {
+    public GetResp get(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, GetReq request) {
         String title = String.format("GetRequest collectionName:%s", request.getCollectionName());
         logger.debug(title);
         QueryReq queryReq = QueryReq.builder()
@@ -214,7 +214,7 @@ public class VectorService extends BaseService {
             queryReq.setOutputFields(request.getOutputFields());
         }
         // call query to get the result
-        QueryResp queryResp = query(milvusServiceBlockingStub, queryReq);
+        QueryResp queryResp = query(blockingStub, queryReq);
 
         return GetResp.builder()
                 .getResults(queryResp.getQueryResults())