leftovers

javanna · Sep 30, 2024 · 4cb00ed · 4cb00ed
1 parent f028bc5
commit 4cb00ed
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 18 deletions.
diff --git a/server/src/main/java/org/elasticsearch/search/internal/ExitableDirectoryReader.java b/server/src/main/java/org/elasticsearch/search/internal/ExitableDirectoryReader.java
@@ -668,20 +668,20 @@ protected FilterFloatVectorValues(FloatVectorValues in) {
             this.in = in;
         }
 
-        /*@Override
-        public int docID() {
-            return in.docID();
+        @Override
+        public DocIndexIterator iterator() {
+            return in.iterator();
         }
 
         @Override
-        public int nextDoc() throws IOException {
-            return in.nextDoc();
+        public float[] vectorValue(int ord) throws IOException {
+            return in.vectorValue(ord);
         }
 
         @Override
-        public int advance(int target) throws IOException {
-            return in.advance(target);
-        }*/
+        public FloatVectorValues copy() throws IOException {
+            return in.copy();
+        }
 
         @Override
         public int dimension() {
@@ -693,9 +693,5 @@ public int size() {
             return in.size();
         }
 
-        /*@Override
-        public float[] vectorValue() throws IOException {
-            return in.vectorValue();
-        }*/
     }
 }
diff --git a/...ava/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReaderTests.java b/...ava/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReaderTests.java
@@ -30,6 +30,7 @@
 import org.apache.lucene.index.FloatVectorValues;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.index.KnnVectorValues;
 import org.apache.lucene.index.LeafReader;
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.NoMergePolicy;
@@ -205,9 +206,9 @@ public void testKnnVectors() throws Exception {
         FloatVectorValues vectorValues = leafReader.getFloatVectorValues("fieldA");
         assertEquals(3, vectorValues.dimension());
         assertEquals(1, vectorValues.size());
-        // TODO
-        // assertEquals(0, vectorValues.nextDoc());
-        // assertNotNull(vectorValues.vectorValue());
+        KnnVectorValues.DocIndexIterator iterator = vectorValues.iterator();
+        assertEquals(0, iterator.nextDoc());
+        assertNotNull(vectorValues.vectorValue(iterator.index()));
 
         TopDocs topDocs = leafReader.searchNearestVectors("fieldA", new float[] { 1.0f, 1.0f, 1.0f }, 5, null, Integer.MAX_VALUE);
         assertNotNull(topDocs);
@@ -240,9 +241,9 @@ public void testKnnByteVectors() throws Exception {
         ByteVectorValues vectorValues = leafReader.getByteVectorValues("fieldA");
         assertEquals(3, vectorValues.dimension());
         assertEquals(1, vectorValues.size());
-        // TODO
-        // assertEquals(0, vectorValues.nextDoc());
-        // assertNotNull(vectorValues.vectorValue());
+        KnnVectorValues.DocIndexIterator iterator = vectorValues.iterator();
+        assertEquals(0, iterator.nextDoc());
+        assertNotNull(vectorValues.vectorValue(iterator.index()));
 
         TopDocs topDocs = leafReader.searchNearestVectors("fieldA", new byte[] { 1, 1, 1 }, 5, null, Integer.MAX_VALUE);
         assertNotNull(topDocs);