Skip to content

Make int4 confidence_interval BWC for mixed cluster scenarios #144597

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

Closed
tteofili wants to merge 4 commits into from
Closed

Make int4 confidence_interval BWC for mixed cluster scenarios #144597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e732b98
Make int4 confidence_interval BWC for mixed cluster scenarios
tteofili Mar 19, 2026
e71b567
Merge branch 'main' of github.com:elastic/elasticsearch into int4_ci_bwc
tteofili Mar 20, 2026
788a181
removed useless line
tteofili Mar 20, 2026
431d238
Merge branch 'main' of github.com:elastic/elasticsearch into int4_ci_bwc
tteofili Mar 20, 2026
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
8 changes: 6 additions & 2 deletions server/src/main/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2067,7 +2067,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
builder.field("type", type);
builder.field("m", m);
builder.field("ef_construction", efConstruction);
if (confidenceInterval != null) {
if (hasSerializableConfidenceInterval(confidenceInterval)) {
builder.field("confidence_interval", confidenceInterval);
}
if (onDiskRescore) {
Expand Down Expand Up @@ -2161,7 +2161,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
if (rescoreVector != null) {
rescoreVector.toXContent(builder, params);
}
if (confidenceInterval != null) {
if (hasSerializableConfidenceInterval(confidenceInterval)) {
builder.field("confidence_interval", confidenceInterval);
}
builder.endObject();
Expand Down Expand Up @@ -3555,6 +3555,10 @@ private static Float parseConfidenceInterval(String fieldName, Map<String, ?> in
return confidenceInterval;
}

private static boolean hasSerializableConfidenceInterval(Float confidenceInterval) {
return confidenceInterval != null && Float.compare(confidenceInterval, 0.0f) != 0;
}

/**
* @return the custom kNN vectors format that is configured for this field or
* {@code null} if the default format should be used.
Expand Down
36 changes: 36 additions & 0 deletions server/src/test/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasToString;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.startsWith;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
Expand Down Expand Up @@ -2033,6 +2034,41 @@ public void testConfidenceIntervalNoDeprecationBeforeLatestIndexVersion() throws
assertWarnings();
}

public void testConfidenceIntervalZeroNormalizedAndOmittedFromMappingSource() throws IOException {
DocumentMapper mapper = createDocumentMapper(IndexVersions.UPGRADE_TO_LUCENE_10_4_0, fieldMapping(b -> {
b.field("type", "dense_vector");
b.field("dims", 6);
b.field("index", true);
b.field("similarity", "dot_product");
b.startObject("index_options");
b.field("type", "int4_hnsw");
b.field("m", 16);
b.field("ef_construction", 100);
b.field("confidence_interval", 0.0);
b.endObject();
}));
String source = mapper.mappingSource().string();
assertThat(source, containsString("\"type\":\"int4_hnsw\""));
assertThat(source, not(containsString("confidence_interval")));
}

public void testConfidenceIntervalAbsentInt4HnswMappingSourceStable() throws IOException {
DocumentMapper mapper = createDocumentMapper(IndexVersions.UPGRADE_TO_LUCENE_10_4_0, fieldMapping(b -> {
b.field("type", "dense_vector");
b.field("dims", 6);
b.field("index", true);
b.field("similarity", "dot_product");
b.startObject("index_options");
b.field("type", "int4_hnsw");
b.field("m", 16);
b.field("ef_construction", 100);
b.endObject();
}));
String source = mapper.mappingSource().string();
assertThat(source, containsString("\"type\":\"int4_hnsw\""));
assertThat(source, not(containsString("confidence_interval")));
}

public void testKnnQuantizedFlatVectorsFormat() throws IOException {
for (String quantizedFlatFormat : new String[] { "int8_flat", "int4_flat" }) {
MapperService mapperService = createMapperService(
Expand Down
Loading