Skip to content

Experimental composible knn formats #134394

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
wants to merge 3 commits into from
Closed

Experimental composible knn formats #134394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c5bf67
Experimental composible knn formats
benwtrent Sep 9, 2025
2c1c96e
iter
benwtrent Sep 9, 2025
34657ac
[CI] Auto commit changes from spotless
Sep 9, 2025
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
4 changes: 3 additions & 1 deletion server/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,11 +458,13 @@
org.elasticsearch.index.codec.vectors.ES814HnswScalarQuantizedVectorsFormat,
org.elasticsearch.index.codec.vectors.ES815HnswBitVectorsFormat,
org.elasticsearch.index.codec.vectors.ES815BitFlatVectorFormat,
org.elasticsearch.index.codec.vectors.ES815BitFlatVectorsFormat,
org.elasticsearch.index.codec.vectors.es816.ES816BinaryQuantizedVectorsFormat,
org.elasticsearch.index.codec.vectors.es816.ES816HnswBinaryQuantizedVectorsFormat,
org.elasticsearch.index.codec.vectors.es818.ES818BinaryQuantizedVectorsFormat,
org.elasticsearch.index.codec.vectors.es818.ES818HnswBinaryQuantizedVectorsFormat,
ES920DiskBBQVectorsFormat;
ES920DiskBBQVectorsFormat,
org.elasticsearch.index.codec.vectors.ES920HnswComposableKnnVectorsFormat;

provides org.apache.lucene.codecs.Codec
with
Expand Down
4 changes: 2 additions & 2 deletions server/src/main/java/org/elasticsearch/index/codec/Elasticsearch814Codec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
import org.apache.lucene.codecs.lucene90.Lucene90DocValuesFormat;
import org.apache.lucene.codecs.lucene99.Lucene99HnswVectorsFormat;
import org.apache.lucene.codecs.perfield.PerFieldDocValuesFormat;
import org.apache.lucene.codecs.perfield.PerFieldKnnVectorsFormat;
import org.apache.lucene.codecs.perfield.PerFieldPostingsFormat;
import org.elasticsearch.index.codec.vectors.ComposablePerFieldKnnVectorsFormat;
import org.elasticsearch.index.codec.zstd.Zstd814StoredFieldsFormat;

/**
Expand Down Expand Up @@ -47,7 +47,7 @@ public DocValuesFormat getDocValuesFormatForField(String field) {
};

private static final KnnVectorsFormat defaultKnnVectorsFormat = new Lucene99HnswVectorsFormat();
private final KnnVectorsFormat knnVectorsFormat = new PerFieldKnnVectorsFormat() {
private final KnnVectorsFormat knnVectorsFormat = new ComposablePerFieldKnnVectorsFormat() {
@Override
public KnnVectorsFormat getKnnVectorsFormatForField(String field) {
return Elasticsearch814Codec.this.getKnnVectorsFormatForField(field);
Expand Down
4 changes: 2 additions & 2 deletions server/src/main/java/org/elasticsearch/index/codec/Elasticsearch816Codec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
import org.apache.lucene.codecs.lucene90.Lucene90DocValuesFormat;
import org.apache.lucene.codecs.lucene99.Lucene99HnswVectorsFormat;
import org.apache.lucene.codecs.perfield.PerFieldDocValuesFormat;
import org.apache.lucene.codecs.perfield.PerFieldKnnVectorsFormat;
import org.apache.lucene.codecs.perfield.PerFieldPostingsFormat;
import org.elasticsearch.index.codec.vectors.ComposablePerFieldKnnVectorsFormat;
import org.elasticsearch.index.codec.zstd.Zstd814StoredFieldsFormat;

/**
Expand Down Expand Up @@ -49,7 +49,7 @@ public DocValuesFormat getDocValuesFormatForField(String field) {
}
};

private final KnnVectorsFormat knnVectorsFormat = new PerFieldKnnVectorsFormat() {
private final KnnVectorsFormat knnVectorsFormat = new ComposablePerFieldKnnVectorsFormat() {
@Override
public KnnVectorsFormat getKnnVectorsFormatForField(String field) {
return Elasticsearch816Codec.this.getKnnVectorsFormatForField(field);
Expand Down
4 changes: 2 additions & 2 deletions server/src/main/java/org/elasticsearch/index/codec/Elasticsearch900Codec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
import org.apache.lucene.codecs.lucene90.Lucene90DocValuesFormat;
import org.apache.lucene.codecs.lucene99.Lucene99HnswVectorsFormat;
import org.apache.lucene.codecs.perfield.PerFieldDocValuesFormat;
import org.apache.lucene.codecs.perfield.PerFieldKnnVectorsFormat;
import org.apache.lucene.codecs.perfield.PerFieldPostingsFormat;
import org.elasticsearch.index.codec.vectors.ComposablePerFieldKnnVectorsFormat;
import org.elasticsearch.index.codec.zstd.Zstd814StoredFieldsFormat;

/**
Expand Down Expand Up @@ -47,7 +47,7 @@ public DocValuesFormat getDocValuesFormatForField(String field) {
};

private final KnnVectorsFormat defaultKnnVectorsFormat;
private final KnnVectorsFormat knnVectorsFormat = new PerFieldKnnVectorsFormat() {
private final KnnVectorsFormat knnVectorsFormat = new ComposablePerFieldKnnVectorsFormat() {
@Override
public KnnVectorsFormat getKnnVectorsFormatForField(String field) {
return Elasticsearch900Codec.this.getKnnVectorsFormatForField(field);
Expand Down
4 changes: 2 additions & 2 deletions server/src/main/java/org/elasticsearch/index/codec/Elasticsearch900Lucene101Codec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
import org.apache.lucene.codecs.lucene101.Lucene101PostingsFormat;
import org.apache.lucene.codecs.lucene90.Lucene90DocValuesFormat;
import org.apache.lucene.codecs.lucene99.Lucene99HnswVectorsFormat;
import org.apache.lucene.codecs.perfield.PerFieldKnnVectorsFormat;
import org.apache.lucene.codecs.perfield.PerFieldPostingsFormat;
import org.elasticsearch.index.codec.perfield.XPerFieldDocValuesFormat;
import org.elasticsearch.index.codec.vectors.ComposablePerFieldKnnVectorsFormat;
import org.elasticsearch.index.codec.zstd.Zstd814StoredFieldsFormat;

/**
Expand Down Expand Up @@ -49,7 +49,7 @@ public DocValuesFormat getDocValuesFormatForField(String field) {
};

private final KnnVectorsFormat defaultKnnVectorsFormat;
private final KnnVectorsFormat knnVectorsFormat = new PerFieldKnnVectorsFormat() {
private final KnnVectorsFormat knnVectorsFormat = new ComposablePerFieldKnnVectorsFormat() {
@Override
public KnnVectorsFormat getKnnVectorsFormatForField(String field) {
return Elasticsearch900Lucene101Codec.this.getKnnVectorsFormatForField(field);
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/index/codec/PerFieldFormatSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public KnnVectorsFormat getKnnVectorsFormatForField(String field) {
if (mapperService != null) {
Mapper mapper = mapperService.mappingLookup().getMapper(field);
if (mapper instanceof DenseVectorFieldMapper vectorMapper) {
return vectorMapper.getKnnVectorsFormatForField(knnVectorsFormat);
return vectorMapper.getKnnVectorsFormatForField();
}
}
return knnVectorsFormat;
Expand Down
Loading