Skip to content

Commit 67dca68

Browse files
authored
optim clientV2 search/query to support db (#1323)
Signed-off-by: lentitude2tk <xushuang.hu@zilliz.com>
1 parent 2b1bed9 commit 67dca68

5 files changed

Lines changed: 21 additions & 2 deletions

File tree

sdk-core/src/main/java/io/milvus/v2/common/ConsistencyLevel.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,13 @@ public enum ConsistencyLevel{
3333
this.name = name;
3434
this.code = code;
3535
}
36+
37+
public static ConsistencyLevel fromName(String name) {
38+
for (ConsistencyLevel level : ConsistencyLevel.values()) {
39+
if (level.getName().equals(name)) {
40+
return level;
41+
}
42+
}
43+
return null;
44+
}
3645
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public UpsertResp upsert(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStu
177177
}
178178

179179
public QueryResp query(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, QueryReq request) {
180-
String title = String.format("QueryRequest collectionName:%s", request.getCollectionName());
180+
String title = String.format("QueryRequest collectionName:%s, databaseName:%s", request.getCollectionName(), request.getDatabaseName());
181181
if (request.getFilter() == null && request.getIds() == null) {
182182
throw new MilvusClientException(ErrorCode.INVALID_PARAMS, "filter and ids can't be null at the same time");
183183
} else if (request.getFilter() != null && request.getIds() != null) {
@@ -201,7 +201,7 @@ public QueryResp query(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub,
201201
}
202202

203203
public SearchResp search(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, SearchReq request) {
204-
String title = String.format("SearchRequest collectionName:%s", request.getCollectionName());
204+
String title = String.format("SearchRequest collectionName:%s, databaseName:%s", request.getCollectionName(), request.getDatabaseName());
205205

206206
//checkCollectionExist(blockingStub, request.getCollectionName());
207207

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
@Data
3030
@SuperBuilder
3131
public class QueryReq {
32+
private String databaseName;
3233
private String collectionName;
3334
@Builder.Default
3435
private List<String> partitionNames = new ArrayList<>();

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
@Data
3535
@SuperBuilder
3636
public class SearchReq {
37+
private String databaseName;
3738
private String collectionName;
3839
@Builder.Default
3940
private List<String> partitionNames = new ArrayList<>();

sdk-core/src/main/java/io/milvus/v2/utils/VectorUtils.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ public QueryRequest ConvertToGrpcQueryRequest(QueryReq request){
4848
.addAllPartitionNames(request.getPartitionNames())
4949
.addAllOutputFields(request.getOutputFields())
5050
.setExpr(request.getFilter());
51+
if (StringUtils.isNotEmpty(request.getDatabaseName())) {
52+
builder.setDbName(request.getDatabaseName());
53+
}
54+
5155
if (request.getFilter() != null && !request.getFilter().isEmpty()) {
5256
Map<String, Object> filterTemplateValues = request.getFilterTemplateValues();
5357
filterTemplateValues.forEach((key, value)->{
@@ -140,6 +144,10 @@ public SearchRequest ConvertToGrpcSearchRequest(SearchReq request) {
140144
request.getPartitionNames().forEach(builder::addPartitionNames);
141145
}
142146

147+
if (StringUtils.isNotEmpty(request.getDatabaseName())) {
148+
builder.setDbName(request.getDatabaseName());
149+
}
150+
143151
// prepare target, the input could be vectors or string list for doc-in-doc-out
144152
List<BaseVector> vectors = request.getData();
145153
if (vectors.isEmpty()) {

0 commit comments

Comments
 (0)