Skip to content
Open
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
c10fd76
Add HNSW scalar quantized bfloat16 implementation
thecoop Oct 15, 2025
3a6f7fc
Add flat format
thecoop Oct 15, 2025
a85b7ca
Add int8 implementation
thecoop Oct 16, 2025
a638b59
Rename class
thecoop Oct 20, 2025
419032d
Improve tests
thecoop Oct 20, 2025
038db83
Merge branch 'main' into int-hnsw-bfloat16
thecoop Oct 20, 2025
1287a0b
Fix module reference
thecoop Oct 20, 2025
bd55e05
Merge branch 'lucene_snapshot' into int-hnsw-bfloat16
thecoop Oct 23, 2025
7c343c5
Update to use new Lucene104 format
thecoop Oct 23, 2025
4fa4338
Update more tests
thecoop Oct 23, 2025
84f5bf4
Merge branch 'lucene_snapshot' into int-hnsw-bfloat16
thecoop Oct 23, 2025
4815bc2
Class renames
thecoop Oct 23, 2025
94ef4f1
[CI] Auto commit changes from spotless
Oct 23, 2025
61de804
Merge branch 'main' into int-hnsw-bfloat16
thecoop Oct 23, 2025
6720384
Update for ElementType change
thecoop Oct 23, 2025
5c0e171
Merge branch 'lucene_snapshot' into int-hnsw-bfloat16
thecoop Oct 23, 2025
115507a
Revert "Use the reader in Lucene BWC"
thecoop Oct 24, 2025
44ecd39
Remove intermediate class
thecoop Oct 24, 2025
cbba58b
Merge branch 'lucene_snapshot' into int-hnsw-bfloat16
thecoop Oct 24, 2025
f989a30
Merge branch 'lucene_snapshot' into int-hnsw-bfloat16
thecoop Oct 30, 2025
33fe50d
Merge branch 'lucene_snapshot' into int-hnsw-bfloat16
thecoop Oct 31, 2025
f6ee769
Use public constructor
thecoop Oct 31, 2025
3017e33
Mute org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapperTes…
elasticsearchmachine Nov 3, 2025
70507a6
Verify execution info in remote index resolution tests (#137361)
idegtiarenko Nov 3, 2025
0b8a37a
Handle ._original and._ignore_malformed stored fields correctly with …
martijnvg Nov 3, 2025
18e27e2
Merge branch 'lucene_snapshot' into int-hnsw-bfloat16
thecoop Nov 3, 2025
ec0efaf
Support choosing the downsampling method in data stream lifecycle (#1…
gmarouli Nov 3, 2025
60b89a8
Increase timeout for searchable snapshots in ILM tests (#137514)
nielsbauman Nov 3, 2025
ebca69f
Revert "Re-enable some performance updates to ES|QL" (#136781) (#137520)
craigtaverner Nov 3, 2025
846593c
DiskBBQ - Panama support for 4 bits symmetric quantization (#137510)
tteofili Nov 3, 2025
da8b9c6
[ML] Skip dataframes when disabled (#137220)
prwhelan Nov 3, 2025
b54cd8e
Mute org.elasticsearch.xpack.ilm.CCRIndexLifecycleIT testBasicCCRAndI…
elasticsearchmachine Nov 3, 2025
b29af0f
Mute org.elasticsearch.xpack.ilm.CCRIndexLifecycleIT testCcrAndIlmWit…
elasticsearchmachine Nov 3, 2025
4f3ff81
Fix the test dimensions for bit element_type (#137523)
thecoop Nov 3, 2025
1b74ec0
Add competitive sort tests to MapperTestCase (#137437)
romseygeek Nov 3, 2025
9795d0f
We don't need a separate search impl here
thecoop Nov 3, 2025
9473216
Field caps transport changes to return for each original expression w…
piergm Nov 3, 2025
490a2d5
Copy ES819TSDBDocValuesConsumer into tests for version 0 bwc tests (#…
parkertimmins Nov 3, 2025
2047c9a
ESQL: Add support for exponential_histogram in code generation (#137459)
JonasKunz Nov 3, 2025
20ce72d
Unmute FullClusterRestartIT tests (#137254)
ldematte Nov 3, 2025
c925aa0
Clean up `TransportResizeAction` (#137471)
DaveCTurner Nov 3, 2025
e330b42
Merge branch 'main' into int-hnsw-bfloat16
thecoop Nov 3, 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
5 changes: 4 additions & 1 deletion server/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -465,8 +465,11 @@
org.elasticsearch.index.codec.vectors.es818.ES818HnswBinaryQuantizedVectorsFormat,
org.elasticsearch.index.codec.vectors.diskbbq.ES920DiskBBQVectorsFormat,
org.elasticsearch.index.codec.vectors.diskbbq.next.ESNextDiskBBQVectorsFormat,
org.elasticsearch.index.codec.vectors.es93.ES93BinaryQuantizedVectorsFormat,
org.elasticsearch.index.codec.vectors.es93.ES93FlatVectorFormat,
org.elasticsearch.index.codec.vectors.es93.ES93HnswVectorsFormat,
org.elasticsearch.index.codec.vectors.es93.ES93ScalarQuantizedVectorsFormat,
org.elasticsearch.index.codec.vectors.es93.ES93HnswScalarQuantizedVectorsFormat,
org.elasticsearch.index.codec.vectors.es93.ES93BinaryQuantizedVectorsFormat,
org.elasticsearch.index.codec.vectors.es93.ES93HnswBinaryQuantizedVectorsFormat;

provides org.apache.lucene.codecs.Codec
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

package org.elasticsearch.index.codec.vectors;

import org.apache.lucene.backward_codecs.lucene99.Lucene99ScalarQuantizedVectorsReader;
import org.apache.lucene.codecs.hnsw.FlatFieldVectorsWriter;
import org.apache.lucene.codecs.hnsw.FlatVectorScorerUtil;
import org.apache.lucene.codecs.hnsw.FlatVectorsFormat;
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the "Elastic License
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
* Public License v 1"; you may not use this file except in compliance with, at
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
*/

package org.elasticsearch.index.codec.vectors.es93;

import org.apache.lucene.codecs.KnnVectorsFormat;
import org.apache.lucene.codecs.KnnVectorsReader;
import org.apache.lucene.codecs.KnnVectorsWriter;
import org.apache.lucene.codecs.hnsw.FlatVectorsFormat;
import org.apache.lucene.codecs.hnsw.FlatVectorsReader;
import org.apache.lucene.index.ByteVectorValues;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.FloatVectorValues;
import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.index.SegmentWriteState;
import org.apache.lucene.search.AcceptDocs;
import org.apache.lucene.search.KnnCollector;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.hnsw.OrdinalTranslatedKnnCollector;
import org.apache.lucene.util.hnsw.RandomVectorScorer;

import java.io.IOException;
import java.util.Map;

import static org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapper.MAX_DIMS_COUNT;

public class ES93FlatVectorFormat extends KnnVectorsFormat {

static final String NAME = "ES93FlatVectorFormat";

private final FlatVectorsFormat format;

/**
* Sole constructor
*/
public ES93FlatVectorFormat() {
super(NAME);
format = new ES93GenericFlatVectorsFormat();
}

public ES93FlatVectorFormat(ES93GenericFlatVectorsFormat.ElementType elementType) {
super(NAME);
assert elementType != ES93GenericFlatVectorsFormat.ElementType.BIT : "ES815BitFlatVectorFormat should be used for bits";
format = new ES93GenericFlatVectorsFormat(elementType, false);
}

@Override
public KnnVectorsWriter fieldsWriter(SegmentWriteState state) throws IOException {
return format.fieldsWriter(state);
}

@Override
public KnnVectorsReader fieldsReader(SegmentReadState state) throws IOException {
return new ES93FlatVectorReader(format.fieldsReader(state));
}

@Override
public int getMaxDimensions(String fieldName) {
return MAX_DIMS_COUNT;
}

static class ES93FlatVectorReader extends KnnVectorsReader {

private final FlatVectorsReader reader;

ES93FlatVectorReader(FlatVectorsReader reader) {
super();
this.reader = reader;
}

@Override
public void checkIntegrity() throws IOException {
reader.checkIntegrity();
}

@Override
public FloatVectorValues getFloatVectorValues(String field) throws IOException {
return reader.getFloatVectorValues(field);
}

@Override
public ByteVectorValues getByteVectorValues(String field) throws IOException {
return reader.getByteVectorValues(field);
}

@Override
public void search(String field, float[] target, KnnCollector knnCollector, AcceptDocs acceptDocs) throws IOException {
collectAllMatchingDocs(knnCollector, acceptDocs, reader.getRandomVectorScorer(field, target));
}

private void collectAllMatchingDocs(KnnCollector knnCollector, AcceptDocs acceptDocs, RandomVectorScorer scorer)
throws IOException {
OrdinalTranslatedKnnCollector collector = new OrdinalTranslatedKnnCollector(knnCollector, scorer::ordToDoc);
Bits acceptedOrds = scorer.getAcceptOrds(acceptDocs.bits());
for (int i = 0; i < scorer.maxOrd(); i++) {
if (acceptedOrds == null || acceptedOrds.get(i)) {
collector.collect(i, scorer.score(i));
collector.incVisitedCount(1);
}
}
assert collector.earlyTerminated() == false;
}

@Override
public void search(String field, byte[] target, KnnCollector knnCollector, AcceptDocs acceptDocs) throws IOException {
collectAllMatchingDocs(knnCollector, acceptDocs, reader.getRandomVectorScorer(field, target));
}

@Override
public Map<String, Long> getOffHeapByteSize(FieldInfo fieldInfo) {
return reader.getOffHeapByteSize(fieldInfo);
}

@Override
public void close() throws IOException {
reader.close();
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the "Elastic License
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
* Public License v 1"; you may not use this file except in compliance with, at
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
*/

package org.elasticsearch.index.codec.vectors.es93;

import org.apache.lucene.codecs.KnnVectorsReader;
import org.apache.lucene.codecs.KnnVectorsWriter;
import org.apache.lucene.codecs.hnsw.FlatVectorsFormat;
import org.apache.lucene.codecs.lucene104.Lucene104ScalarQuantizedVectorsFormat;
import org.apache.lucene.codecs.lucene99.Lucene99HnswVectorsReader;
import org.apache.lucene.codecs.lucene99.Lucene99HnswVectorsWriter;
import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.index.SegmentWriteState;
import org.elasticsearch.index.codec.vectors.AbstractHnswVectorsFormat;

import java.io.IOException;
import java.util.concurrent.ExecutorService;

public class ES93HnswScalarQuantizedVectorsFormat extends AbstractHnswVectorsFormat {

static final String NAME = "ES93HnswScalarQuantizedVectorsFormat";

/** The format for storing, reading, merging vectors on disk */
private final FlatVectorsFormat flatVectorsFormat;

public ES93HnswScalarQuantizedVectorsFormat() {
super(NAME);
this.flatVectorsFormat = new ES93ScalarQuantizedFlatVectorsFormat(
Lucene104ScalarQuantizedVectorsFormat.ScalarEncoding.SEVEN_BIT,
ES93GenericFlatVectorsFormat.ElementType.STANDARD,
false
);
}

public ES93HnswScalarQuantizedVectorsFormat(
int maxConn,
int beamWidth,
Lucene104ScalarQuantizedVectorsFormat.ScalarEncoding encoding,
ES93GenericFlatVectorsFormat.ElementType elementType,
boolean useDirectIO
) {
super(NAME, maxConn, beamWidth);
this.flatVectorsFormat = new ES93ScalarQuantizedFlatVectorsFormat(encoding, elementType, useDirectIO);
}

public ES93HnswScalarQuantizedVectorsFormat(
int maxConn,
int beamWidth,
Lucene104ScalarQuantizedVectorsFormat.ScalarEncoding encoding,
ES93GenericFlatVectorsFormat.ElementType elementType,
boolean useDirectIO,
int numMergeWorkers,
ExecutorService mergeExec
) {
super(NAME, maxConn, beamWidth, numMergeWorkers, mergeExec);
this.flatVectorsFormat = new ES93ScalarQuantizedFlatVectorsFormat(encoding, elementType, useDirectIO);
}

@Override
protected FlatVectorsFormat flatVectorsFormat() {
return flatVectorsFormat;
}

@Override
public KnnVectorsWriter fieldsWriter(SegmentWriteState state) throws IOException {
return new Lucene99HnswVectorsWriter(
state,
maxConn,
beamWidth,
flatVectorsFormat.fieldsWriter(state),
numMergeWorkers,
mergeExec,
0
);
}

@Override
public KnnVectorsReader fieldsReader(SegmentReadState state) throws IOException {
return new Lucene99HnswVectorsReader(state, flatVectorsFormat.fieldsReader(state));
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the "Elastic License
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
* Public License v 1"; you may not use this file except in compliance with, at
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
*/

package org.elasticsearch.index.codec.vectors.es93;

import org.apache.lucene.codecs.hnsw.FlatVectorScorerUtil;
import org.apache.lucene.codecs.hnsw.FlatVectorsFormat;
import org.apache.lucene.codecs.hnsw.FlatVectorsReader;
import org.apache.lucene.codecs.hnsw.FlatVectorsWriter;
import org.apache.lucene.codecs.lucene104.Lucene104ScalarQuantizedVectorScorer;
import org.apache.lucene.codecs.lucene104.Lucene104ScalarQuantizedVectorsFormat;
import org.apache.lucene.codecs.lucene104.Lucene104ScalarQuantizedVectorsReader;
import org.apache.lucene.codecs.lucene104.Lucene104ScalarQuantizedVectorsWriter;
import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.index.SegmentWriteState;

import java.io.IOException;

import static org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapper.MAX_DIMS_COUNT;

public class ES93ScalarQuantizedFlatVectorsFormat extends FlatVectorsFormat {

static final String NAME = "ES93ScalarQuantizedFlatVectorsFormat";

static final Lucene104ScalarQuantizedVectorScorer flatVectorScorer = new Lucene104ScalarQuantizedVectorScorer(
FlatVectorScorerUtil.getLucene99FlatVectorsScorer()
);

private final Lucene104ScalarQuantizedVectorsFormat.ScalarEncoding encoding;
private final FlatVectorsFormat rawVectorFormat;

public ES93ScalarQuantizedFlatVectorsFormat(
Lucene104ScalarQuantizedVectorsFormat.ScalarEncoding encoding,
ES93GenericFlatVectorsFormat.ElementType elementType,
boolean useDirectIO
) {
super(NAME);
assert elementType != ES93GenericFlatVectorsFormat.ElementType.BIT : "BIT should not be used with scalar quantization";
this.encoding = encoding;
this.rawVectorFormat = new ES93GenericFlatVectorsFormat(elementType, useDirectIO);
}

@Override
public int getMaxDimensions(String fieldName) {
return MAX_DIMS_COUNT;
}

@Override
public String toString() {
return NAME
+ "(name="
+ NAME
+ ", encoding="
+ encoding
+ ", flatVectorScorer="
+ flatVectorScorer
+ ", rawVectorFormat="
+ rawVectorFormat
+ ")";
}

@Override
public FlatVectorsWriter fieldsWriter(SegmentWriteState state) throws IOException {
return new Lucene104ScalarQuantizedVectorsWriter(state, encoding, rawVectorFormat.fieldsWriter(state), flatVectorScorer) {
};
}

@Override
public FlatVectorsReader fieldsReader(SegmentReadState state) throws IOException {
return new Lucene104ScalarQuantizedVectorsReader(state, rawVectorFormat.fieldsReader(state), flatVectorScorer);
}
}
Loading