|
@@ -651,7 +651,7 @@ class MilvusClientDockerTest {
|
|
SearchParam searchParam = SearchParam.newBuilder()
|
|
SearchParam searchParam = SearchParam.newBuilder()
|
|
.withCollectionName(randomCollectionName)
|
|
.withCollectionName(randomCollectionName)
|
|
.withMetricType(MetricType.L2)
|
|
.withMetricType(MetricType.L2)
|
|
- .withTopK(topK)
|
|
|
|
|
|
+ .withLimit((long)topK)
|
|
.withFloatVectors(targetVectors)
|
|
.withFloatVectors(targetVectors)
|
|
.withVectorFieldName(DataType.FloatVector.name())
|
|
.withVectorFieldName(DataType.FloatVector.name())
|
|
.withParams("{\"ef\":64}")
|
|
.withParams("{\"ef\":64}")
|
|
@@ -854,7 +854,7 @@ class MilvusClientDockerTest {
|
|
SearchParam searchOneParam = SearchParam.newBuilder()
|
|
SearchParam searchOneParam = SearchParam.newBuilder()
|
|
.withCollectionName(randomCollectionName)
|
|
.withCollectionName(randomCollectionName)
|
|
.withMetricType(MetricType.JACCARD)
|
|
.withMetricType(MetricType.JACCARD)
|
|
- .withTopK(5)
|
|
|
|
|
|
+ .withLimit(5L)
|
|
.withBinaryVectors(Collections.singletonList(targetVector))
|
|
.withBinaryVectors(Collections.singletonList(targetVector))
|
|
.withVectorFieldName(DataType.BinaryVector.name())
|
|
.withVectorFieldName(DataType.BinaryVector.name())
|
|
.addOutField(DataType.BinaryVector.name())
|
|
.addOutField(DataType.BinaryVector.name())
|
|
@@ -921,7 +921,7 @@ class MilvusClientDockerTest {
|
|
SearchParam searchParam = SearchParam.newBuilder()
|
|
SearchParam searchParam = SearchParam.newBuilder()
|
|
.withCollectionName(randomCollectionName)
|
|
.withCollectionName(randomCollectionName)
|
|
.withMetricType(MetricType.HAMMING)
|
|
.withMetricType(MetricType.HAMMING)
|
|
- .withTopK(topK)
|
|
|
|
|
|
+ .withLimit((long)topK)
|
|
.withBinaryVectors(targetVectors)
|
|
.withBinaryVectors(targetVectors)
|
|
.withVectorFieldName(DataType.BinaryVector.name())
|
|
.withVectorFieldName(DataType.BinaryVector.name())
|
|
.withParams("{\"nprobe\":8}")
|
|
.withParams("{\"nprobe\":8}")
|
|
@@ -1038,7 +1038,7 @@ class MilvusClientDockerTest {
|
|
SearchParam searchParam = SearchParam.newBuilder()
|
|
SearchParam searchParam = SearchParam.newBuilder()
|
|
.withCollectionName(randomCollectionName)
|
|
.withCollectionName(randomCollectionName)
|
|
.withMetricType(MetricType.IP)
|
|
.withMetricType(MetricType.IP)
|
|
- .withTopK(topK)
|
|
|
|
|
|
+ .withLimit((long)topK)
|
|
.withSparseFloatVectors(targetVectors)
|
|
.withSparseFloatVectors(targetVectors)
|
|
.withVectorFieldName(DataType.SparseFloatVector.name())
|
|
.withVectorFieldName(DataType.SparseFloatVector.name())
|
|
.addOutField(DataType.SparseFloatVector.name())
|
|
.addOutField(DataType.SparseFloatVector.name())
|
|
@@ -1241,7 +1241,7 @@ class MilvusClientDockerTest {
|
|
R<SearchResults> searchR = client.search(SearchParam.newBuilder()
|
|
R<SearchResults> searchR = client.search(SearchParam.newBuilder()
|
|
.withCollectionName(randomCollectionName)
|
|
.withCollectionName(randomCollectionName)
|
|
.withMetricType(MetricType.COSINE)
|
|
.withMetricType(MetricType.COSINE)
|
|
- .withTopK(topK)
|
|
|
|
|
|
+ .withLimit((long)topK)
|
|
.withFloat16Vectors(Collections.singletonList(fp16Vector))
|
|
.withFloat16Vectors(Collections.singletonList(fp16Vector))
|
|
.withVectorFieldName(DataType.Float16Vector.name())
|
|
.withVectorFieldName(DataType.Float16Vector.name())
|
|
.addOutField(DataType.Float16Vector.name())
|
|
.addOutField(DataType.Float16Vector.name())
|
|
@@ -1269,7 +1269,7 @@ class MilvusClientDockerTest {
|
|
searchR = client.search(SearchParam.newBuilder()
|
|
searchR = client.search(SearchParam.newBuilder()
|
|
.withCollectionName(randomCollectionName)
|
|
.withCollectionName(randomCollectionName)
|
|
.withMetricType(MetricType.COSINE)
|
|
.withMetricType(MetricType.COSINE)
|
|
- .withTopK(topK)
|
|
|
|
|
|
+ .withLimit((long)topK)
|
|
.withParams("{\"nprobe\": 16}")
|
|
.withParams("{\"nprobe\": 16}")
|
|
.withBFloat16Vectors(Collections.singletonList(bf16Vector))
|
|
.withBFloat16Vectors(Collections.singletonList(bf16Vector))
|
|
.withVectorFieldName(DataType.BFloat16Vector.name())
|
|
.withVectorFieldName(DataType.BFloat16Vector.name())
|
|
@@ -1377,7 +1377,7 @@ class MilvusClientDockerTest {
|
|
.withFloatVectors(utils.generateFloatVectors(1))
|
|
.withFloatVectors(utils.generateFloatVectors(1))
|
|
.withMetricType(MetricType.COSINE)
|
|
.withMetricType(MetricType.COSINE)
|
|
.withParams("{\"nprobe\": 32}")
|
|
.withParams("{\"nprobe\": 32}")
|
|
- .withTopK(10)
|
|
|
|
|
|
+ .withLimit(10L)
|
|
.build();
|
|
.build();
|
|
|
|
|
|
AnnSearchParam param2 = AnnSearchParam.newBuilder()
|
|
AnnSearchParam param2 = AnnSearchParam.newBuilder()
|
|
@@ -1385,7 +1385,7 @@ class MilvusClientDockerTest {
|
|
.withBinaryVectors(utils.generateBinaryVectors(1))
|
|
.withBinaryVectors(utils.generateBinaryVectors(1))
|
|
.withMetricType(MetricType.HAMMING)
|
|
.withMetricType(MetricType.HAMMING)
|
|
.withParams("{}")
|
|
.withParams("{}")
|
|
- .withTopK(5)
|
|
|
|
|
|
+ .withLimit(5L)
|
|
.build();
|
|
.build();
|
|
|
|
|
|
AnnSearchParam param3 = AnnSearchParam.newBuilder()
|
|
AnnSearchParam param3 = AnnSearchParam.newBuilder()
|
|
@@ -1393,7 +1393,7 @@ class MilvusClientDockerTest {
|
|
.withSparseFloatVectors(utils.generateSparseVectors(1))
|
|
.withSparseFloatVectors(utils.generateSparseVectors(1))
|
|
.withMetricType(MetricType.IP)
|
|
.withMetricType(MetricType.IP)
|
|
.withParams("{\"drop_ratio_search\":0.2}")
|
|
.withParams("{\"drop_ratio_search\":0.2}")
|
|
- .withTopK(7)
|
|
|
|
|
|
+ .withLimit(7L)
|
|
.build();
|
|
.build();
|
|
|
|
|
|
HybridSearchParam searchParam = HybridSearchParam.newBuilder()
|
|
HybridSearchParam searchParam = HybridSearchParam.newBuilder()
|
|
@@ -1402,7 +1402,7 @@ class MilvusClientDockerTest {
|
|
.addSearchRequest(param1)
|
|
.addSearchRequest(param1)
|
|
.addSearchRequest(param2)
|
|
.addSearchRequest(param2)
|
|
.addSearchRequest(param3)
|
|
.addSearchRequest(param3)
|
|
- .withTopK(3)
|
|
|
|
|
|
+ .withLimit(3L)
|
|
.withConsistencyLevel(ConsistencyLevelEnum.STRONG)
|
|
.withConsistencyLevel(ConsistencyLevelEnum.STRONG)
|
|
.withRanker(WeightedRanker.newBuilder()
|
|
.withRanker(WeightedRanker.newBuilder()
|
|
.withWeights(Lists.newArrayList(0.5f, 0.5f, 1.0f))
|
|
.withWeights(Lists.newArrayList(0.5f, 0.5f, 1.0f))
|
|
@@ -1528,7 +1528,7 @@ class MilvusClientDockerTest {
|
|
SearchParam searchParam = SearchParam.newBuilder()
|
|
SearchParam searchParam = SearchParam.newBuilder()
|
|
.withCollectionName(randomCollectionName)
|
|
.withCollectionName(randomCollectionName)
|
|
.withMetricType(MetricType.IP)
|
|
.withMetricType(MetricType.IP)
|
|
- .withTopK(topK)
|
|
|
|
|
|
+ .withLimit((long)topK)
|
|
.withVectors(targetVectors)
|
|
.withVectors(targetVectors)
|
|
.withVectorFieldName(DataType.FloatVector.name())
|
|
.withVectorFieldName(DataType.FloatVector.name())
|
|
.build();
|
|
.build();
|
|
@@ -1775,7 +1775,7 @@ class MilvusClientDockerTest {
|
|
SearchParam searchParam = SearchParam.newBuilder()
|
|
SearchParam searchParam = SearchParam.newBuilder()
|
|
.withCollectionName(randomCollectionName)
|
|
.withCollectionName(randomCollectionName)
|
|
.withMetricType(MetricType.IP)
|
|
.withMetricType(MetricType.IP)
|
|
- .withTopK(topK)
|
|
|
|
|
|
+ .withLimit((long)topK)
|
|
.withFloatVectors(targetVectors)
|
|
.withFloatVectors(targetVectors)
|
|
.withVectorFieldName(DataType.FloatVector.name())
|
|
.withVectorFieldName(DataType.FloatVector.name())
|
|
.addOutField(DataType.Int64.name())
|
|
.addOutField(DataType.Int64.name())
|
|
@@ -2012,7 +2012,7 @@ class MilvusClientDockerTest {
|
|
SearchParam searchParam = SearchParam.newBuilder()
|
|
SearchParam searchParam = SearchParam.newBuilder()
|
|
.withCollectionName(randomCollectionName)
|
|
.withCollectionName(randomCollectionName)
|
|
.withMetricType(MetricType.COSINE)
|
|
.withMetricType(MetricType.COSINE)
|
|
- .withTopK(topK)
|
|
|
|
|
|
+ .withLimit((long)topK)
|
|
.withFloatVectors(targetVectors)
|
|
.withFloatVectors(targetVectors)
|
|
.withVectorFieldName(DataType.FloatVector.name())
|
|
.withVectorFieldName(DataType.FloatVector.name())
|
|
.withParams("{}")
|
|
.withParams("{}")
|
|
@@ -2187,7 +2187,7 @@ class MilvusClientDockerTest {
|
|
SearchParam searchParam = SearchParam.newBuilder()
|
|
SearchParam searchParam = SearchParam.newBuilder()
|
|
.withCollectionName(randomCollectionName)
|
|
.withCollectionName(randomCollectionName)
|
|
.withMetricType(MetricType.L2)
|
|
.withMetricType(MetricType.L2)
|
|
- .withTopK(5)
|
|
|
|
|
|
+ .withLimit(5L)
|
|
.withFloatVectors(searchVectors)
|
|
.withFloatVectors(searchVectors)
|
|
.withVectorFieldName(DataType.FloatVector.name())
|
|
.withVectorFieldName(DataType.FloatVector.name())
|
|
.addOutField(varcharArrayName)
|
|
.addOutField(varcharArrayName)
|
|
@@ -2218,7 +2218,7 @@ class MilvusClientDockerTest {
|
|
searchParam = SearchParam.newBuilder()
|
|
searchParam = SearchParam.newBuilder()
|
|
.withCollectionName(randomCollectionName)
|
|
.withCollectionName(randomCollectionName)
|
|
.withMetricType(MetricType.L2)
|
|
.withMetricType(MetricType.L2)
|
|
- .withTopK(10)
|
|
|
|
|
|
+ .withLimit(10L)
|
|
.withExpr(String.format("array_contains_any(%s, [450038, 680015])", intArrayName))
|
|
.withExpr(String.format("array_contains_any(%s, [450038, 680015])", intArrayName))
|
|
.withFloatVectors(searchVectors)
|
|
.withFloatVectors(searchVectors)
|
|
.withVectorFieldName(DataType.FloatVector.name())
|
|
.withVectorFieldName(DataType.FloatVector.name())
|
|
@@ -2789,7 +2789,7 @@ class MilvusClientDockerTest {
|
|
.withBatchSize(10L)
|
|
.withBatchSize(10L)
|
|
.withVectorFieldName(DataType.FloatVector.name())
|
|
.withVectorFieldName(DataType.FloatVector.name())
|
|
.withFloatVectors(vectors)
|
|
.withFloatVectors(vectors)
|
|
- .withTopK(50)
|
|
|
|
|
|
+ .withLimit(50L)
|
|
.withMetricType(MetricType.L2);
|
|
.withMetricType(MetricType.L2);
|
|
|
|
|
|
R<SearchIterator> sResponse = client.searchIterator(searchIteratorParamBuilder.build());
|
|
R<SearchIterator> sResponse = client.searchIterator(searchIteratorParamBuilder.build());
|
|
@@ -3099,7 +3099,7 @@ class MilvusClientDockerTest {
|
|
SearchParam searchParam = SearchParam.newBuilder()
|
|
SearchParam searchParam = SearchParam.newBuilder()
|
|
.withCollectionName(randomCollectionName)
|
|
.withCollectionName(randomCollectionName)
|
|
.withMetricType(MetricType.L2)
|
|
.withMetricType(MetricType.L2)
|
|
- .withTopK(10)
|
|
|
|
|
|
+ .withLimit(10L)
|
|
.withFloatVectors(searchVectors)
|
|
.withFloatVectors(searchVectors)
|
|
.withVectorFieldName("vector")
|
|
.withVectorFieldName("vector")
|
|
.withParams("{}")
|
|
.withParams("{}")
|