Skip to content

remove defaultIndexName & support jsonPath index #1425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sre-ci-robot merged 1 commit into from
Jun 11, 2025
Merged

remove defaultIndexName & support jsonPath index #1425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions examples/src/main/java/io/milvus/v2/SimpleExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,13 @@ public static void main(String[] args) {

expressionTemplateValues.forEach((key, value) -> {
SearchReq request = SearchReq.builder()
.collectionName(collectionName)
.data(Collections.singletonList(new FloatVec(new float[]{1.0f, 1.0f, 1.0f, 1.0f})))
.topK(10)
.filter(key)
.filterTemplateValues(value)
.outputFields(Collections.singletonList("*"))
.build();
.collectionName(collectionName)
.data(Collections.singletonList(new FloatVec(new float[]{1.0f, 1.0f, 1.0f, 1.0f})))
.topK(10)
.filter(key)
.filterTemplateValues(value)
.outputFields(Collections.singletonList("*"))
.build();
SearchResp statusR = client.search(request);
List<List<SearchResp.SearchResult>> searchResults2 = statusR.getSearchResults();
System.out.println("\nSearch with template results:");
Expand Down
7 changes: 0 additions & 7 deletions sdk-core/src/main/java/io/milvus/v2/common/IndexParam.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,6 @@ public class IndexParam {
private MetricType metricType;
private Map<String, Object> extraParams;

public String getIndexName() {
if(indexName == null) {
return fieldName;
}
return indexName;
}

public enum MetricType {
INVALID,
// Only for float vectors
Expand Down
63 changes: 36 additions & 27 deletions sdk-core/src/main/java/io/milvus/v2/service/index/IndexService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,31 @@

package io.milvus.v2.service.index;

import com.google.gson.JsonObject;
import io.milvus.grpc.*;
import io.milvus.grpc.AllocTimestampRequest;
import io.milvus.grpc.AllocTimestampResponse;
import io.milvus.grpc.AlterIndexRequest;
import io.milvus.grpc.CreateIndexRequest;
import io.milvus.grpc.DescribeIndexRequest;
import io.milvus.grpc.DescribeIndexResponse;
import io.milvus.grpc.DropIndexRequest;
import io.milvus.grpc.IndexDescription;
import io.milvus.grpc.KeyValuePair;
import io.milvus.grpc.MilvusServiceGrpc;
import io.milvus.grpc.Status;
import io.milvus.param.Constant;
import io.milvus.param.ParamUtils;
import io.milvus.v2.common.IndexBuildState;
import io.milvus.v2.common.IndexParam;
import io.milvus.v2.exception.ErrorCode;
import io.milvus.v2.exception.MilvusClientException;
import io.milvus.v2.service.BaseService;
import io.milvus.v2.service.index.request.*;
import io.milvus.v2.service.index.response.*;
import io.milvus.v2.service.index.request.AlterIndexPropertiesReq;
import io.milvus.v2.service.index.request.CreateIndexReq;
import io.milvus.v2.service.index.request.DescribeIndexReq;
import io.milvus.v2.service.index.request.DropIndexPropertiesReq;
import io.milvus.v2.service.index.request.DropIndexReq;
import io.milvus.v2.service.index.request.ListIndexesReq;
import io.milvus.v2.service.index.response.DescribeIndexResp;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;

Expand All @@ -46,13 +60,16 @@ public Void createIndex(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub
request.getCollectionName(), indexParam.getFieldName());
CreateIndexRequest.Builder builder = CreateIndexRequest.newBuilder();
builder.setCollectionName(request.getCollectionName())
.setIndexName(indexParam.getIndexName())
.setFieldName(indexParam.getFieldName())
.addExtraParams(KeyValuePair.newBuilder()
.setKey(Constant.INDEX_TYPE)
.setValue(indexParam.getIndexType().getName())
.build());

if (StringUtils.isNotEmpty(indexParam.getIndexName())) {
builder.setIndexName(indexParam.getIndexName());
}

if (StringUtils.isNotEmpty(request.getDatabaseName())) {
builder.setDbName(request.getDatabaseName());
}
Expand Down Expand Up @@ -153,11 +170,6 @@ public DescribeIndexResp describeIndex(MilvusServiceGrpc.MilvusServiceBlockingSt
DescribeIndexResponse response = blockingStub.describeIndex(builder.build());
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()) {
throw new MilvusClientException(ErrorCode.SERVER_ERROR, "Index not found");
} else if (indexs.size() > 1) {
throw new MilvusClientException(ErrorCode.SERVER_ERROR, "More than one index found");
}
return convertUtils.convertToDescribeIndexResp(indexs);
}

Expand Down Expand Up @@ -207,28 +219,25 @@ private void WaitForIndexComplete(MilvusServiceGrpc.MilvusServiceBlockingStub bl
}
DescribeIndexResp response = describeIndex(blockingStub, describeIndexReq);
List<DescribeIndexResp.IndexDesc> indices = response.getIndexDescriptions();
DescribeIndexResp.IndexDesc desc = null;
if (indices.size() == 1) {
desc = indices.get(0);
} else {
for (DescribeIndexResp.IndexDesc index : indices) {
if (fieldName.equals(index.getFieldName())) {
desc = index;
break;
}
}
}

if (desc == null) {
if (CollectionUtils.isEmpty(indices)) {
String msg = String.format("Failed to describe the index '%s' of field '%s' from serv side", fieldName, indexName);
throw new MilvusClientException(ErrorCode.SERVER_ERROR, msg);
}

if (desc.getIndexState() == IndexBuildState.Finished) {
boolean allIndexBuildCompleted = true;
for (DescribeIndexResp.IndexDesc index : indices) {
if (index.getIndexState() == IndexBuildState.Failed) {
String msg = "Index is failed, reason: " + index.getIndexFailedReason();
throw new MilvusClientException(ErrorCode.SERVER_ERROR, msg);
}

if (index.getIndexState() != IndexBuildState.Finished) {
allIndexBuildCompleted = false;
}
}

if (allIndexBuildCompleted) {
return;
} else if (desc.getIndexState() == IndexBuildState.Failed) {
String msg = "Index is failed, reason: " + desc.getIndexFailedReason();
throw new MilvusClientException(ErrorCode.SERVER_ERROR, msg);
}

// Check if timeout is exceeded
Expand Down
Loading