Browse Source

Fix the issue with dbName in queryV2 (#1337)

Signed-off-by: lentitude2tk <xushuang.hu@zilliz.com>
xushuang.hu 1 month ago
parent
commit
2664ea140a

+ 8 - 5
sdk-core/src/main/java/io/milvus/v2/service/collection/CollectionService.java

@@ -260,11 +260,14 @@ public class CollectionService extends BaseService {
     }
 
     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 = blockingStub.describeCollection(describeCollectionRequest);
+        String title = String.format("DescribeCollectionRequest collectionName:%s, databaseName:%s", request.getCollectionName(), request.getDatabaseName());
+        DescribeCollectionRequest.Builder builder = DescribeCollectionRequest.newBuilder()
+                .setCollectionName(request.getCollectionName());
+        if (StringUtils.isNotEmpty(request.getDatabaseName())) {
+            builder.setDbName(request.getDatabaseName());
+        }
+
+        DescribeCollectionResponse response = blockingStub.describeCollection(builder.build());
         rpcUtils.handleResponse(title, response.getStatus());
         return convertUtils.convertDescCollectionResp(response);
     }

+ 1 - 0
sdk-core/src/main/java/io/milvus/v2/service/collection/request/DescribeCollectionReq.java

@@ -25,5 +25,6 @@ import lombok.experimental.SuperBuilder;
 @Data
 @SuperBuilder
 public class DescribeCollectionReq {
+    private String databaseName;
     private String collectionName;
 }

+ 1 - 1
sdk-core/src/main/java/io/milvus/v2/service/vector/VectorService.java

@@ -186,7 +186,7 @@ public class VectorService extends BaseService {
 
 
         if (request.getIds() != null && request.getFilter() == null) {
-            DescribeCollectionReq descReq = DescribeCollectionReq.builder().collectionName(request.getCollectionName()).build();
+            DescribeCollectionReq descReq = DescribeCollectionReq.builder().databaseName(request.getDatabaseName()).collectionName(request.getCollectionName()).build();
             DescribeCollectionResp descResp = collectionService.describeCollection(blockingStub, descReq);
             request.setFilter(vectorUtils.getExprById(descResp.getPrimaryFieldName(), request.getIds()));
         }