Apache Lucene open-source search software
Modify `testMergeCosineWithNonUnitVectors` to avoid flat reader accessor (#16681)
John Maurice15f6f15cfc95
diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene104/TestLucene104HnswScalarQuantizedVectorsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene104/TestLucene104HnswScalarQuantizedVectorsFormat.javaindex fb0f88e2290..c2f4f4584e8 100644--- a/lucene/core/src/test/org/apache/lucene/codecs/lucene104/TestLucene104HnswScalarQuantizedVectorsFormat.java+++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene104/TestLucene104HnswScalarQuantizedVectorsFormat.java@@ -29,7 +29,7 @@ import org.apache.lucene.codecs.Codec;import org.apache.lucene.codecs.FilterCodec;import org.apache.lucene.codecs.KnnVectorsFormat;import org.apache.lucene.codecs.KnnVectorsReader;-import org.apache.lucene.codecs.hnsw.FlatVectorsReader;+import org.apache.lucene.codecs.hnsw.FlatVectorScorerUtil;import org.apache.lucene.codecs.hnsw.FlatVectorsScorer;import org.apache.lucene.codecs.lucene99.Lucene99HnswVectorsFormat;import org.apache.lucene.codecs.lucene99.Lucene99HnswVectorsReader;@@ -169,10 +169,8 @@ public class TestLucene104HnswScalarQuantizedVectorsFormat extends BaseKnnVectorLeafReader r = getOnlyLeafReader(reader);SegmentReader segmentReader = (SegmentReader) FilterLeafReader.unwrap(r);FieldInfo fieldInfo = r.getFieldInfos().fieldInfo("f");- Lucene99HnswVectorsReader hnswReader =- (Lucene99HnswVectorsReader) segmentReader.getVectorReader().unwrapReaderForField("f");- FlatVectorsReader flatReader = hnswReader.getFlatVectorsReader();- QuantizedVectorsReader quantizedReader = (QuantizedVectorsReader) flatReader;+ QuantizedVectorsReader quantizedReader =+ (QuantizedVectorsReader) segmentReader.getVectorReader().unwrapReaderForField("f");SegmentWriteState writeState =new SegmentWriteState(InfoStream.getDefault(),@@ -182,7 +180,9 @@ public class TestLucene104HnswScalarQuantizedVectorsFormat extends BaseKnnVectornull,IOContext.DEFAULT);KnnVectorValues quantizedValues = quantizedReader.getQuantizedVectorValues("f");- FlatVectorsScorer searchScorer = flatReader.getFlatVectorScorer("f");+ FlatVectorsScorer searchScorer =+ new Lucene104ScalarQuantizedVectorScorer(+ FlatVectorScorerUtil.getLucene99FlatVectorsScorer());try (CloseableRandomVectorScorerSupplier mergeScorers =quantizedReader.getRandomVectorScorerSupplierForMerge(fieldInfo, writeState)) {FloatVectorValues rawValues = r.getFloatVectorValues("f");