Fix build error

dungba88 · Nov 8, 2024 · 972dbfb · 972dbfb
1 parent b97aadb
commit 972dbfb
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 17 deletions.
diff --git a/...codecs/src/test/org/apache/lucene/backward_codecs/lucene95/Lucene95HnswVectorsWriter.java b/...codecs/src/test/org/apache/lucene/backward_codecs/lucene95/Lucene95HnswVectorsWriter.java
@@ -450,7 +450,7 @@ public void mergeOneField(FieldInfo fieldInfo, MergeState mergeState) throws IOE
                     new OffHeapByteVectorValues.DenseOffHeapVectorValues(
                         fieldInfo.getVectorDimension(),
                         docsWithField.cardinality(),
-                        vectorDataInput,
+                        vectorDataInput.toRandomAccessInput(),
                         byteSize,
                         defaultFlatVectorScorer,
                         fieldInfo.getVectorSimilarityFunction()));
@@ -462,7 +462,7 @@ public void mergeOneField(FieldInfo fieldInfo, MergeState mergeState) throws IOE
                     new OffHeapFloatVectorValues.DenseOffHeapVectorValues(
                         fieldInfo.getVectorDimension(),
                         docsWithField.cardinality(),
-                        vectorDataInput,
+                        vectorDataInput.toRandomAccessInput(),
                         byteSize,
                         defaultFlatVectorScorer,
                         fieldInfo.getVectorSimilarityFunction()));

diff --git a/lucene/benchmark-jmh/src/java/org/apache/lucene/benchmark/jmh/VectorScorerBenchmark.java b/lucene/benchmark-jmh/src/java/org/apache/lucene/benchmark/jmh/VectorScorerBenchmark.java
@@ -98,7 +98,7 @@ public float binaryDotProductMemSeg() throws IOException {
   static KnnVectorValues vectorValues(
       int dims, int size, IndexInput in, VectorSimilarityFunction sim) throws IOException {
     return new OffHeapByteVectorValues.DenseOffHeapVectorValues(
-        dims, size, in.slice("test", 0, in.length()), dims, new ThrowingFlatVectorScorer(), sim);
+        dims, size, in.toRandomAccessInput(), dims, new ThrowingFlatVectorScorer(), sim);
   }
 
   static final class ThrowingFlatVectorScorer implements FlatVectorsScorer {

diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene99/Lucene99FlatVectorsWriter.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene99/Lucene99FlatVectorsWriter.java
@@ -303,7 +303,7 @@ public CloseableRandomVectorScorerSupplier mergeOneFieldToIndex(
                     new OffHeapByteVectorValues.DenseOffHeapVectorValues(
                         fieldInfo.getVectorDimension(),
                         docsWithField.cardinality(),
-                        finalVectorDataInput,
+                        finalVectorDataInput.toRandomAccessInput(),
                         fieldInfo.getVectorDimension() * Byte.BYTES,
                         vectorsScorer,
                         fieldInfo.getVectorSimilarityFunction()));
@@ -313,7 +313,7 @@ public CloseableRandomVectorScorerSupplier mergeOneFieldToIndex(
                     new OffHeapFloatVectorValues.DenseOffHeapVectorValues(
                         fieldInfo.getVectorDimension(),
                         docsWithField.cardinality(),
-                        finalVectorDataInput,
+                        finalVectorDataInput.toRandomAccessInput(),
                         fieldInfo.getVectorDimension() * Float.BYTES,
                         vectorsScorer,
                         fieldInfo.getVectorSimilarityFunction()));

diff --git a/...core/src/java/org/apache/lucene/codecs/lucene99/Lucene99ScalarQuantizedVectorsWriter.java b/...core/src/java/org/apache/lucene/codecs/lucene99/Lucene99ScalarQuantizedVectorsWriter.java
@@ -524,7 +524,7 @@ private ScalarQuantizedCloseableRandomVectorScorerSupplier mergeOneFieldToIndex(
                   compress,
                   fieldInfo.getVectorSimilarityFunction(),
                   vectorsScorer,
-                  quantizationDataInput)));
+                  quantizationDataInput.toRandomAccessInput())));
     } finally {
       if (success == false) {
         IOUtils.closeWhileHandlingException(tempQuantizedVectorData, quantizationDataInput);

diff --git a/lucene/core/src/java/org/apache/lucene/store/IndexInput.java b/lucene/core/src/java/org/apache/lucene/store/IndexInput.java
@@ -152,6 +152,14 @@ protected String getFullSliceDescription(String sliceDescription) {
     }
   }
 
+  /** Convert this IndexInput a RandomAccessInput. */
+  public RandomAccessInput toRandomAccessInput() throws IOException {
+    if (this instanceof RandomAccessInput) {
+      return (RandomAccessInput) this;
+    }
+    return randomAccessSlice(0, length());
+  }
+
   /**
    * Creates a random-access slice of this index input, with the given offset and length.
    *
@@ -214,6 +222,15 @@ public void prefetch(long offset, long length) throws IOException {
           slice.prefetch(offset, length);
         }
 
+        @Override
+        public Object clone() {
+          try {
+            return super.clone();
+          } catch (CloneNotSupportedException e) {
+            throw new Error("This cannot happen: Failing to clone RandomAccessInput", e);
+          }
+        }
+
         @Override
         public String toString() {
           return "RandomAccessInput(" + IndexInput.this.toString() + ")";

diff --git a/...ava21/org/apache/lucene/internal/vectorization/Lucene99MemorySegmentByteVectorScorer.java b/...ava21/org/apache/lucene/internal/vectorization/Lucene99MemorySegmentByteVectorScorer.java
@@ -25,6 +25,7 @@
 import org.apache.lucene.store.FilterIndexInput;
 import org.apache.lucene.store.IndexInput;
 import org.apache.lucene.store.MemorySegmentAccessInput;
+import org.apache.lucene.store.RandomAccessInput;
 import org.apache.lucene.util.hnsw.RandomVectorScorer;
 
 abstract sealed class Lucene99MemorySegmentByteVectorScorer
@@ -40,8 +41,14 @@ abstract sealed class Lucene99MemorySegmentByteVectorScorer
    * returned.
    */
   public static Optional<Lucene99MemorySegmentByteVectorScorer> create(
-      VectorSimilarityFunction type, IndexInput input, KnnVectorValues values, byte[] queryVector) {
+      VectorSimilarityFunction type,
+      RandomAccessInput slice,
+      KnnVectorValues values,
+      byte[] queryVector) {
     assert values instanceof ByteVectorValues;
+    if (!(slice instanceof IndexInput input)) {
+      return Optional.empty();
+    }
     input = FilterIndexInput.unwrapOnlyTest(input);
     if (!(input instanceof MemorySegmentAccessInput msInput)) {
       return Optional.empty();

diff --git a/...g/apache/lucene/internal/vectorization/Lucene99MemorySegmentByteVectorScorerSupplier.java b/...g/apache/lucene/internal/vectorization/Lucene99MemorySegmentByteVectorScorerSupplier.java
@@ -25,6 +25,7 @@
 import org.apache.lucene.store.FilterIndexInput;
 import org.apache.lucene.store.IndexInput;
 import org.apache.lucene.store.MemorySegmentAccessInput;
+import org.apache.lucene.store.RandomAccessInput;
 import org.apache.lucene.util.hnsw.RandomVectorScorer;
 import org.apache.lucene.util.hnsw.RandomVectorScorerSupplier;
 
@@ -42,8 +43,11 @@ public abstract sealed class Lucene99MemorySegmentByteVectorScorerSupplier
    * optional is returned.
    */
   static Optional<RandomVectorScorerSupplier> create(
-      VectorSimilarityFunction type, IndexInput input, KnnVectorValues values) {
+      VectorSimilarityFunction type, RandomAccessInput slice, KnnVectorValues values) {
     assert values instanceof ByteVectorValues;
+    if (!(slice instanceof IndexInput input)) {
+      return Optional.empty();
+    }
     input = FilterIndexInput.unwrapOnlyTest(input);
     if (!(input instanceof MemorySegmentAccessInput msInput)) {
       return Optional.empty();

diff --git a/lucene/core/src/java21/org/apache/lucene/store/MemorySegmentIndexInput.java b/lucene/core/src/java21/org/apache/lucene/store/MemorySegmentIndexInput.java
@@ -232,6 +232,12 @@ public void readLongs(long[] dst, int offset, int length) throws IOException {
     }
   }
 
+  @Override
+  public void readFloats(long pos, float[] dst, int offset, int len) throws IOException {
+    seek(pos);
+    readFloats(dst, offset, len);
+  }
+
   @Override
   public void readFloats(float[] dst, int offset, int length) throws IOException {
     try {

diff --git a/lucene/core/src/test/org/apache/lucene/codecs/hnsw/TestFlatVectorScorer.java b/lucene/core/src/test/org/apache/lucene/codecs/hnsw/TestFlatVectorScorer.java
@@ -178,18 +178,13 @@ public void testCheckFloatDimensions() throws IOException {
   ByteVectorValues byteVectorValues(int dims, int size, IndexInput in, VectorSimilarityFunction sim)
       throws IOException {
     return new OffHeapByteVectorValues.DenseOffHeapVectorValues(
-        dims, size, in.slice("byteValues", 0, in.length()), dims, flatVectorsScorer, sim);
+        dims, size, in.toRandomAccessInput(), dims, flatVectorsScorer, sim);
   }
 
   FloatVectorValues floatVectorValues(
       int dims, int size, IndexInput in, VectorSimilarityFunction sim) throws IOException {
     return new OffHeapFloatVectorValues.DenseOffHeapVectorValues(
-        dims,
-        size,
-        in.slice("floatValues", 0, in.length()),
-        dims * Float.BYTES,
-        flatVectorsScorer,
-        sim);
+        dims, size, in.toRandomAccessInput(), dims * Float.BYTES, flatVectorsScorer, sim);
   }
 
   /** Concatenates float arrays as byte[]. */

diff --git a/lucene/core/src/test/org/apache/lucene/internal/vectorization/TestVectorScorer.java b/lucene/core/src/test/org/apache/lucene/internal/vectorization/TestVectorScorer.java
@@ -381,13 +381,13 @@ public void testWithFloatValues() throws IOException {
   KnnVectorValues vectorValues(int dims, int size, IndexInput in, VectorSimilarityFunction sim)
       throws IOException {
     return new OffHeapByteVectorValues.DenseOffHeapVectorValues(
-        dims, size, in.slice("byteValues", 0, in.length()), dims, MEMSEG_SCORER, sim);
+        dims, size, in.toRandomAccessInput(), dims, MEMSEG_SCORER, sim);
   }
 
   KnnVectorValues floatVectorValues(int dims, int size, IndexInput in, VectorSimilarityFunction sim)
       throws IOException {
     return new OffHeapFloatVectorValues.DenseOffHeapVectorValues(
-        dims, size, in.slice("floatValues", 0, in.length()), dims, MEMSEG_SCORER, sim);
+        dims, size, in.toRandomAccessInput(), dims, MEMSEG_SCORER, sim);
   }
 
   // creates the vector based on the given ordinal, which is reproducible given the ord and dims