Skip to content

Commit 2664ea1

Browse files
authored
Fix the issue with dbName in queryV2 (milvus-io#1337)
Signed-off-by: lentitude2tk <xushuang.hu@zilliz.com>
1 parent 58f17f5 commit 2664ea1

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -260,11 +260,14 @@ public Boolean hasCollection(MilvusServiceGrpc.MilvusServiceBlockingStub blockin
260260
}
261261

262262
public DescribeCollectionResp describeCollection(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, DescribeCollectionReq request) {
263-
String title = String.format("DescribeCollectionRequest collectionName:%s", request.getCollectionName());
264-
DescribeCollectionRequest describeCollectionRequest = DescribeCollectionRequest.newBuilder()
265-
.setCollectionName(request.getCollectionName())
266-
.build();
267-
DescribeCollectionResponse response = blockingStub.describeCollection(describeCollectionRequest);
263+
String title = String.format("DescribeCollectionRequest collectionName:%s, databaseName:%s", request.getCollectionName(), request.getDatabaseName());
264+
DescribeCollectionRequest.Builder builder = DescribeCollectionRequest.newBuilder()
265+
.setCollectionName(request.getCollectionName());
266+
if (StringUtils.isNotEmpty(request.getDatabaseName())) {
267+
builder.setDbName(request.getDatabaseName());
268+
}
269+
270+
DescribeCollectionResponse response = blockingStub.describeCollection(builder.build());
268271
rpcUtils.handleResponse(title, response.getStatus());
269272
return convertUtils.convertDescCollectionResp(response);
270273
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@
2525
@Data
2626
@SuperBuilder
2727
public class DescribeCollectionReq {
28+
private String databaseName;
2829
private String collectionName;
2930
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ public QueryResp query(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub,
186186

187187

188188
if (request.getIds() != null && request.getFilter() == null) {
189-
DescribeCollectionReq descReq = DescribeCollectionReq.builder().collectionName(request.getCollectionName()).build();
189+
DescribeCollectionReq descReq = DescribeCollectionReq.builder().databaseName(request.getDatabaseName()).collectionName(request.getCollectionName()).build();
190190
DescribeCollectionResp descResp = collectionService.describeCollection(blockingStub, descReq);
191191
request.setFilter(vectorUtils.getExprById(descResp.getPrimaryFieldName(), request.getIds()));
192192
}

0 commit comments

Comments
 (0)