Remove the scorer on FlatVectorsReader

Author: thecoop

lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene99/Lucene99ScalarQuantizedVectorsReader.java

@@ -66,13 +66,14 @@ final class Lucene99ScalarQuantizedVectorsReader extends FlatVectorsReader
   private final IntObjectHashMap<FieldEntry> fields = new IntObjectHashMap<>();
   private final IndexInput quantizedVectorData;
   private final FlatVectorsReader rawVectorsReader;
+  private final FlatVectorsScorer vectorScorer;
   private final FieldInfos fieldInfos;
 
   Lucene99ScalarQuantizedVectorsReader(
       SegmentReadState state, FlatVectorsReader rawVectorsReader, FlatVectorsScorer scorer)
       throws IOException {
-    super(scorer);
     this.rawVectorsReader = rawVectorsReader;
+    this.vectorScorer = scorer;
     this.fieldInfos = state.fieldInfos;
     int versionMeta = -1;
     String metaFileName =

lucene/core/src/java/org/apache/lucene/codecs/hnsw/FlatVectorsReader.java

@@ -40,21 +40,6 @@
  */
 public abstract class FlatVectorsReader extends KnnVectorsReader implements Accountable {
 
-  /** Scorer for flat vectors */
-  protected final FlatVectorsScorer vectorScorer;
-
-  /** Sole constructor */
-  protected FlatVectorsReader(FlatVectorsScorer vectorsScorer) {
-    this.vectorScorer = vectorsScorer;
-  }
-
-  /**
-   * @return the {@link FlatVectorsScorer} for this reader.
-   */
-  public FlatVectorsScorer getFlatVectorScorer() {
-    return vectorScorer;
-  }
-
   @Override
   public void search(String field, float[] target, KnnCollector knnCollector, AcceptDocs acceptDocs)
       throws IOException {

lucene/core/src/java/org/apache/lucene/codecs/lucene102/Lucene102BinaryQuantizedVectorsReader.java

@@ -70,7 +70,6 @@ class Lucene102BinaryQuantizedVectorsReader extends FlatVectorsReader {
       FlatVectorsReader rawVectorsReader,
       Lucene102BinaryFlatVectorsScorer vectorsScorer)
       throws IOException {
-    super(vectorsScorer);
     this.vectorScorer = vectorsScorer;
     this.rawVectorsReader = rawVectorsReader;
     int versionMeta = -1;

lucene/core/src/java/org/apache/lucene/codecs/lucene99/Lucene99FlatVectorsFormat.java

@@ -92,7 +92,7 @@ public FlatVectorsWriter fieldsWriter(SegmentWriteState state) throws IOExceptio
 
   @Override
   public FlatVectorsReader fieldsReader(SegmentReadState state) throws IOException {
-    return new Lucene99FlatVectorsReader(state, vectorsScorer);
+    return new Lucene99FlatVectorsReader(state);
   }
 
   @Override

lucene/core/src/java/org/apache/lucene/codecs/lucene99/Lucene99FlatVectorsReader.java

@@ -24,7 +24,6 @@
 import java.util.Map;
 import org.apache.lucene.codecs.CodecUtil;
 import org.apache.lucene.codecs.hnsw.FlatVectorsReader;
-import org.apache.lucene.codecs.hnsw.FlatVectorsScorer;
 import org.apache.lucene.codecs.lucene95.OffHeapByteVectorValues;
 import org.apache.lucene.codecs.lucene95.OffHeapFloatVectorValues;
 import org.apache.lucene.codecs.lucene95.OrdToDocDISIReaderConfiguration;
@@ -63,9 +62,7 @@ public final class Lucene99FlatVectorsReader extends FlatVectorsReader {
   private final FieldInfos fieldInfos;
   private final IOContext dataContext;
 
-  public Lucene99FlatVectorsReader(SegmentReadState state, FlatVectorsScorer scorer)
-      throws IOException {
-    super(scorer);
+  public Lucene99FlatVectorsReader(SegmentReadState state) throws IOException {
     int versionMeta = readMetadata(state);
     this.fieldInfos = state.fieldInfos;
     // Flat formats are used to randomly access vectors from their node ID that is stored