Skip to content

Apache Lucene open-source search software

Add the ability to pass DataAccessHints in Lucene104ScalarQuantizedVectorsReader (#15891)

Navneet Vermaa714adee2000
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 635f2fcbb15..85ef77209cc 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -336,6 +336,8 @@ Other
* GITHUB#15867: Use IllegalCallerException to signal wrong caller in internal classes
(VectorizationProvider, TestSecrets). (Uwe Schindler)
+* GITHUB#15891: Add the ability to pass DataAccessHints in Lucene104ScalarQuantizedVectorsReader (Navneet Verma)
+
======================= Lucene 10.4.0 =======================
API Changes
diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene104/Lucene104ScalarQuantizedVectorsReader.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene104/Lucene104ScalarQuantizedVectorsReader.java
index 9097768689c..4954cffc648 100644
--- a/lucene/core/src/java/org/apache/lucene/codecs/lucene104/Lucene104ScalarQuantizedVectorsReader.java
+++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene104/Lucene104ScalarQuantizedVectorsReader.java
@@ -24,6 +24,7 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
+import java.util.stream.Stream;
import org.apache.lucene.codecs.CodecUtil;
import org.apache.lucene.codecs.KnnVectorsReader;
import org.apache.lucene.codecs.hnsw.FlatVectorsReader;
@@ -73,12 +74,22 @@ public class Lucene104ScalarQuantizedVectorsReader extends FlatVectorsReader
private final Lucene104ScalarQuantizedVectorScorer vectorScorer;
public static final int EXHAUSTIVE_BULK_SCORE_ORDS = 64;
- /** Sole constructor */
public Lucene104ScalarQuantizedVectorsReader(
SegmentReadState state,
FlatVectorsReader rawVectorsReader,
Lucene104ScalarQuantizedVectorScorer vectorsScorer)
throws IOException {
+ // Quantized vectors are accessed randomly from their node ID stored in the HNSW
+ // graph.
+ this(state, rawVectorsReader, vectorsScorer, DataAccessHint.RANDOM);
+ }
+
+ public Lucene104ScalarQuantizedVectorsReader(
+ SegmentReadState state,
+ FlatVectorsReader rawVectorsReader,
+ Lucene104ScalarQuantizedVectorScorer vectorsScorer,
+ DataAccessHint accessHint)
+ throws IOException {
super(vectorsScorer);
this.vectorScorer = vectorsScorer;
this.rawVectorsReader = rawVectorsReader;
@@ -105,16 +116,18 @@ public class Lucene104ScalarQuantizedVectorsReader extends FlatVectorsReader
} finally {
CodecUtil.checkFooter(meta, priorE);
}
+
+ final IOContext.FileOpenHint[] hints =
+ Stream.of(FileTypeHint.DATA, FileDataHint.KNN_VECTORS, accessHint)
+ .filter(Objects::nonNull)
+ .toArray(IOContext.FileOpenHint[]::new);
quantizedVectorData =
openDataInput(
state,
versionMeta,
VECTOR_DATA_EXTENSION,
Lucene104ScalarQuantizedVectorsFormat.VECTOR_DATA_CODEC_NAME,
- // Quantized vectors are accessed randomly from their node ID stored in the HNSW
- // graph.
- state.context.withHints(
- FileTypeHint.DATA, FileDataHint.KNN_VECTORS, DataAccessHint.RANDOM));
+ state.context.withHints(hints));
} catch (Throwable t) {
IOUtils.closeWhileSuppressingExceptions(t, this);
throw t;