Apache Lucene open-source search software
Use FieldInfo vector similarity in knn readers (#13237)
Benjamin Trent69172b14ce88
diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene90/Lucene90HnswVectorsReader.java b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene90/Lucene90HnswVectorsReader.javaindex b72224d9b48..d48817f54bd 100644--- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene90/Lucene90HnswVectorsReader.java+++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene90/Lucene90HnswVectorsReader.java@@ -158,7 +158,7 @@ public final class Lucene90HnswVectorsReader extends KnnVectorsReader {throw new CorruptIndexException("Invalid field number: " + fieldNumber, meta);}- FieldEntry fieldEntry = readField(meta);+ FieldEntry fieldEntry = readField(meta, info);validateFieldEntry(info, fieldEntry);fields.put(info.name, fieldEntry);}@@ -200,9 +200,18 @@ public final class Lucene90HnswVectorsReader extends KnnVectorsReader {return VectorSimilarityFunction.values()[similarityFunctionId];}- private FieldEntry readField(DataInput input) throws IOException {+ private FieldEntry readField(IndexInput input, FieldInfo info) throws IOException {VectorSimilarityFunction similarityFunction = readSimilarityFunction(input);- return new FieldEntry(input, similarityFunction);+ if (similarityFunction != info.getVectorSimilarityFunction()) {+ throw new IllegalStateException(+ "Inconsistent vector similarity function for field=\""+ + info.name+ + "\"; "+ + similarityFunction+ + " != "+ + info.getVectorSimilarityFunction());+ }+ return new FieldEntry(input, info.getVectorSimilarityFunction());}@Overridediff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene91/Lucene91HnswVectorsReader.java b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene91/Lucene91HnswVectorsReader.javaindex 48063d5761f..e0210c9b19a 100644--- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene91/Lucene91HnswVectorsReader.java+++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene91/Lucene91HnswVectorsReader.java@@ -150,7 +150,7 @@ public final class Lucene91HnswVectorsReader extends KnnVectorsReader {if (info == null) {throw new CorruptIndexException("Invalid field number: " + fieldNumber, meta);}- FieldEntry fieldEntry = readField(meta);+ FieldEntry fieldEntry = readField(meta, info);validateFieldEntry(info, fieldEntry);fields.put(info.name, fieldEntry);}@@ -192,9 +192,18 @@ public final class Lucene91HnswVectorsReader extends KnnVectorsReader {return VectorSimilarityFunction.values()[similarityFunctionId];}- private FieldEntry readField(DataInput input) throws IOException {+ private FieldEntry readField(IndexInput input, FieldInfo info) throws IOException {VectorSimilarityFunction similarityFunction = readSimilarityFunction(input);- return new FieldEntry(input, similarityFunction);+ if (similarityFunction != info.getVectorSimilarityFunction()) {+ throw new IllegalStateException(+ "Inconsistent vector similarity function for field=\""+ + info.name+ + "\"; "+ + similarityFunction+ + " != "+ + info.getVectorSimilarityFunction());+ }+ return new FieldEntry(input, info.getVectorSimilarityFunction());}@Overridediff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene92/Lucene92HnswVectorsReader.java b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene92/Lucene92HnswVectorsReader.javaindex cbf80cc0c97..a7aa241f42d 100644--- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene92/Lucene92HnswVectorsReader.java+++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene92/Lucene92HnswVectorsReader.java@@ -149,7 +149,7 @@ public final class Lucene92HnswVectorsReader extends KnnVectorsReader {if (info == null) {throw new CorruptIndexException("Invalid field number: " + fieldNumber, meta);}- FieldEntry fieldEntry = readField(meta);+ FieldEntry fieldEntry = readField(meta, info);validateFieldEntry(info, fieldEntry);fields.put(info.name, fieldEntry);}@@ -191,9 +191,18 @@ public final class Lucene92HnswVectorsReader extends KnnVectorsReader {return VectorSimilarityFunction.values()[similarityFunctionId];}- private FieldEntry readField(IndexInput input) throws IOException {+ private FieldEntry readField(IndexInput input, FieldInfo info) throws IOException {VectorSimilarityFunction similarityFunction = readSimilarityFunction(input);- return new FieldEntry(input, similarityFunction);+ if (similarityFunction != info.getVectorSimilarityFunction()) {+ throw new IllegalStateException(+ "Inconsistent vector similarity function for field=\""+ + info.name+ + "\"; "+ + similarityFunction+ + " != "+ + info.getVectorSimilarityFunction());+ }+ return new FieldEntry(input, info.getVectorSimilarityFunction());}@Overridediff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene94/Lucene94HnswVectorsReader.java b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene94/Lucene94HnswVectorsReader.javaindex 1a54fff5913..5daec83629f 100644--- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene94/Lucene94HnswVectorsReader.java+++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene94/Lucene94HnswVectorsReader.java@@ -150,7 +150,7 @@ public final class Lucene94HnswVectorsReader extends KnnVectorsReader {if (info == null) {throw new CorruptIndexException("Invalid field number: " + fieldNumber, meta);}- FieldEntry fieldEntry = readField(meta);+ FieldEntry fieldEntry = readField(meta, info);validateFieldEntry(info, fieldEntry);fields.put(info.name, fieldEntry);}@@ -208,10 +208,19 @@ public final class Lucene94HnswVectorsReader extends KnnVectorsReader {return VectorEncoding.values()[encodingId];}- private FieldEntry readField(IndexInput input) throws IOException {+ private FieldEntry readField(IndexInput input, FieldInfo info) throws IOException {VectorEncoding vectorEncoding = readVectorEncoding(input);VectorSimilarityFunction similarityFunction = readSimilarityFunction(input);- return new FieldEntry(input, vectorEncoding, similarityFunction);+ if (similarityFunction != info.getVectorSimilarityFunction()) {+ throw new IllegalStateException(+ "Inconsistent vector similarity function for field=\""+ + info.name+ + "\"; "+ + similarityFunction+ + " != "+ + info.getVectorSimilarityFunction());+ }+ return new FieldEntry(input, vectorEncoding, info.getVectorSimilarityFunction());}@Overridediff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene95/Lucene95HnswVectorsReader.java b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene95/Lucene95HnswVectorsReader.javaindex 9c00c5ef93c..d0063f9da17 100644--- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene95/Lucene95HnswVectorsReader.java+++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene95/Lucene95HnswVectorsReader.java@@ -162,7 +162,7 @@ public final class Lucene95HnswVectorsReader extends KnnVectorsReader implementsif (info == null) {throw new CorruptIndexException("Invalid field number: " + fieldNumber, meta);}- FieldEntry fieldEntry = readField(meta);+ FieldEntry fieldEntry = readField(meta, info);validateFieldEntry(info, fieldEntry);fields.put(info.name, fieldEntry);}@@ -220,10 +220,19 @@ public final class Lucene95HnswVectorsReader extends KnnVectorsReader implementsreturn VectorEncoding.values()[encodingId];}- private FieldEntry readField(IndexInput input) throws IOException {+ private FieldEntry readField(IndexInput input, FieldInfo info) throws IOException {VectorEncoding vectorEncoding = readVectorEncoding(input);VectorSimilarityFunction similarityFunction = readSimilarityFunction(input);- return new FieldEntry(input, vectorEncoding, similarityFunction);+ if (similarityFunction != info.getVectorSimilarityFunction()) {+ throw new IllegalStateException(+ "Inconsistent vector similarity function for field=\""+ + info.name+ + "\"; "+ + similarityFunction+ + " != "+ + info.getVectorSimilarityFunction());+ }+ return new FieldEntry(input, vectorEncoding, info.getVectorSimilarityFunction());}@Overridediff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene99/Lucene99FlatVectorsReader.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene99/Lucene99FlatVectorsReader.javaindex 365883f18b8..81ea9b07023 100644--- a/lucene/core/src/java/org/apache/lucene/codecs/lucene99/Lucene99FlatVectorsReader.java+++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene99/Lucene99FlatVectorsReader.java@@ -143,7 +143,7 @@ public final class Lucene99FlatVectorsReader extends FlatVectorsReader {if (info == null) {throw new CorruptIndexException("Invalid field number: " + fieldNumber, meta);}- FieldEntry fieldEntry = readField(meta);+ FieldEntry fieldEntry = readField(meta, info);validateFieldEntry(info, fieldEntry);fields.put(info.name, fieldEntry);}@@ -183,10 +183,19 @@ public final class Lucene99FlatVectorsReader extends FlatVectorsReader {}}- private FieldEntry readField(IndexInput input) throws IOException {+ private FieldEntry readField(IndexInput input, FieldInfo info) throws IOException {VectorEncoding vectorEncoding = readVectorEncoding(input);VectorSimilarityFunction similarityFunction = readSimilarityFunction(input);- return new FieldEntry(input, vectorEncoding, similarityFunction);+ if (similarityFunction != info.getVectorSimilarityFunction()) {+ throw new IllegalStateException(+ "Inconsistent vector similarity function for field=\""+ + info.name+ + "\"; "+ + similarityFunction+ + " != "+ + info.getVectorSimilarityFunction());+ }+ return new FieldEntry(input, vectorEncoding, info.getVectorSimilarityFunction());}@Overridediff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene99/Lucene99HnswVectorsReader.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene99/Lucene99HnswVectorsReader.javaindex efb51c963e0..198740cb06f 100644--- a/lucene/core/src/java/org/apache/lucene/codecs/lucene99/Lucene99HnswVectorsReader.java+++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene99/Lucene99HnswVectorsReader.java@@ -153,7 +153,7 @@ public final class Lucene99HnswVectorsReader extends KnnVectorsReaderif (info == null) {throw new CorruptIndexException("Invalid field number: " + fieldNumber, meta);}- FieldEntry fieldEntry = readField(meta);+ FieldEntry fieldEntry = readField(meta, info);validateFieldEntry(info, fieldEntry);fields.put(info.name, fieldEntry);}@@ -200,10 +200,19 @@ public final class Lucene99HnswVectorsReader extends KnnVectorsReaderreturn VectorEncoding.values()[encodingId];}- private FieldEntry readField(IndexInput input) throws IOException {+ private FieldEntry readField(IndexInput input, FieldInfo info) throws IOException {VectorEncoding vectorEncoding = readVectorEncoding(input);VectorSimilarityFunction similarityFunction = readSimilarityFunction(input);- return new FieldEntry(input, vectorEncoding, similarityFunction);+ if (similarityFunction != info.getVectorSimilarityFunction()) {+ throw new IllegalStateException(+ "Inconsistent vector similarity function for field=\""+ + info.name+ + "\"; "+ + similarityFunction+ + " != "+ + info.getVectorSimilarityFunction());+ }+ return new FieldEntry(input, vectorEncoding, info.getVectorSimilarityFunction());}@Overridediff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene99/Lucene99ScalarQuantizedVectorsReader.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene99/Lucene99ScalarQuantizedVectorsReader.javaindex f85f21dd62a..96bef956a3f 100644--- a/lucene/core/src/java/org/apache/lucene/codecs/lucene99/Lucene99ScalarQuantizedVectorsReader.java+++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene99/Lucene99ScalarQuantizedVectorsReader.java@@ -108,7 +108,7 @@ public final class Lucene99ScalarQuantizedVectorsReader extends FlatVectorsReadeif (info == null) {throw new CorruptIndexException("Invalid field number: " + fieldNumber, meta);}- FieldEntry fieldEntry = readField(meta);+ FieldEntry fieldEntry = readField(meta, info);validateFieldEntry(info, fieldEntry);fields.put(info.name, fieldEntry);}@@ -236,10 +236,19 @@ public final class Lucene99ScalarQuantizedVectorsReader extends FlatVectorsReadereturn size;}- private FieldEntry readField(IndexInput input) throws IOException {+ private FieldEntry readField(IndexInput input, FieldInfo info) throws IOException {VectorEncoding vectorEncoding = readVectorEncoding(input);VectorSimilarityFunction similarityFunction = readSimilarityFunction(input);- return new FieldEntry(input, vectorEncoding, similarityFunction);+ if (similarityFunction != info.getVectorSimilarityFunction()) {+ throw new IllegalStateException(+ "Inconsistent vector similarity function for field=\""+ + info.name+ + "\"; "+ + similarityFunction+ + " != "+ + info.getVectorSimilarityFunction());+ }+ return new FieldEntry(input, vectorEncoding, info.getVectorSimilarityFunction());}@Override