Fix cherry pick

Author: carlosdelest

server/src/main/java/org/elasticsearch/index/mapper/BlockDocValuesReader.java

@@ -30,7 +30,6 @@
 import org.elasticsearch.index.mapper.BlockLoader.IntBuilder;
 import org.elasticsearch.index.mapper.BlockLoader.LongBuilder;
 import org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapper;
-import org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapper.ElementType;
 import org.elasticsearch.index.mapper.vectors.VectorEncoderDecoder;
 import org.elasticsearch.search.fetch.StoredFieldsSpec;
 
@@ -530,39 +529,31 @@ public Builder builder(BlockFactory factory, int expectedCount) {
 
         @Override
         public AllReader reader(LeafReaderContext context) throws IOException {
-            switch (fieldType.getElementType()) {
-                case FLOAT -> {
-                    FloatVectorValues floatVectorValues = context.reader().getFloatVectorValues(fieldName);
-                    if (floatVectorValues != null) {
-                        if (fieldType.isNormalized()) {
-                            return new FloatDenseVectorNormalizedValuesBlockReader(
-                                floatVectorValues,
-                                dimensions,
-                                context.reader().getNumericDocValues(fieldType.name() + COSINE_MAGNITUDE_FIELD_SUFFIX)
-                            );
-                        }
-                        return new FloatDenseVectorValuesBlockReader(floatVectorValues, dimensions);
-                    }
-                }
-                case BYTE -> {
-                    ByteVectorValues byteVectorValues = context.reader().getByteVectorValues(fieldName);
-                    if (byteVectorValues != null) {
-                        return new ByteDenseVectorValuesBlockReader(byteVectorValues, dimensions);
-                    }
+            FloatVectorValues floatVectorValues = context.reader().getFloatVectorValues(fieldName);
+            if (floatVectorValues != null) {
+                if (fieldType.isNormalized()) {
+                    return new FloatDenseVectorNormalizedValuesBlockReader(
+                        floatVectorValues,
+                        dimensions,
+                        context.reader().getNumericDocValues(fieldType.name() + COSINE_MAGNITUDE_FIELD_SUFFIX)
+                    );
                 }
+                return new FloatDenseVectorValuesBlockReader(floatVectorValues, dimensions);
             }
+
             return new ConstantNullsReader();
         }
     }
 
-    private static class DenseVectorValuesBlockReader extends BlockDocValuesReader {
-        private final FloatVectorValues floatVectorValues;
-        private final KnnVectorValues.DocIndexIterator iterator;
-        private final int dimensions;
+    private abstract static class DenseVectorValuesBlockReader<T extends KnnVectorValues> extends BlockDocValuesReader {
 
-        DenseVectorValuesBlockReader(FloatVectorValues floatVectorValues, int dimensions) {
-            this.floatVectorValues = floatVectorValues;
-            iterator = floatVectorValues.iterator();
+        protected final T vectorValues;
+        protected final KnnVectorValues.DocIndexIterator iterator;
+        protected final int dimensions;
+
+        DenseVectorValuesBlockReader(T vectorValues, int dimensions) {
+            this.vectorValues = vectorValues;
+            iterator = vectorValues.iterator();
             this.dimensions = dimensions;
         }
 
@@ -587,18 +578,15 @@ private void read(int doc, BlockLoader.FloatBuilder builder) throws IOException
                 builder.appendNull();
             } else if (iterator.docID() == doc || iterator.advance(doc) == doc) {
                 builder.beginPositionEntry();
-                float[] floats = floatVectorValues.vectorValue(iterator.index());
-                assert floats.length == dimensions
-                    : "unexpected dimensions for vector value; expected " + dimensions + " but got " + floats.length;
-                for (float aFloat : floats) {
-                    builder.appendFloat(aFloat);
-                }
+                appendDoc(builder);
                 builder.endPositionEntry();
             } else {
                 builder.appendNull();
             }
         }
 
+        protected abstract void appendDoc(BlockLoader.FloatBuilder builder) throws IOException;
+
         @Override
         public int docId() {
             return iterator.docID();
@@ -657,26 +645,6 @@ public String toString() {
         }
     }
 
-    private static class ByteDenseVectorValuesBlockReader extends DenseVectorValuesBlockReader<ByteVectorValues> {
-        ByteDenseVectorValuesBlockReader(ByteVectorValues floatVectorValues, int dimensions) {
-            super(floatVectorValues, dimensions);
-        }
-
-        protected void appendDoc(BlockLoader.FloatBuilder builder) throws IOException {
-            byte[] bytes = vectorValues.vectorValue(iterator.index());
-            assert bytes.length == dimensions
-                : "unexpected dimensions for vector value; expected " + dimensions + " but got " + bytes.length;
-            for (byte aFloat : bytes) {
-                builder.appendFloat(aFloat);
-            }
-        }
-
-        @Override
-        public String toString() {
-            return "BlockDocValuesReader.ByteDenseVectorValuesBlockReader";
-        }
-    }
-
     public static class BytesRefsFromOrdsBlockLoader extends DocValuesBlockLoader {
         private final String fieldName;
 

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/DenseVectorFieldTypeIT.java

@@ -216,8 +216,7 @@ public void setup() throws IOException {
                 if (similarity == DenseVectorFieldMapper.VectorSimilarity.DOT_PRODUCT) {
                     // Normalize the vector
                     float magnitude = DenseVector.getMagnitude(vector);
-                        vector.replaceAll(number -> number.floatValue() / magnitude);
-                    }
+                    vector.replaceAll(number -> number.floatValue() / magnitude);
                 }
                 docs[i] = prepareIndex("test").setId("" + i).setSource("id", String.valueOf(i), "vector", vector);
                 indexedVectors.put(i, vector);

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/KnnFunctionIT.java

@@ -35,7 +35,6 @@
 import static org.elasticsearch.index.IndexMode.LOOKUP;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.elasticsearch.xpack.esql.DenseVectorFieldTypeIT.ALL_DENSE_VECTOR_INDEX_TYPES;
-import static org.elasticsearch.xpack.esql.DenseVectorFieldTypeIT.NON_QUANTIZED_DENSE_VECTOR_INDEX_TYPES;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.Matchers.lessThanOrEqualTo;
 
@@ -54,9 +53,6 @@ public static Iterable<Object[]> parameters() throws Exception {
         for (String indexType : ALL_DENSE_VECTOR_INDEX_TYPES) {
             params.add(new Object[] { DenseVectorFieldMapper.ElementType.FLOAT, indexType });
         }
-        for (String indexType : NON_QUANTIZED_DENSE_VECTOR_INDEX_TYPES) {
-            params.add(new Object[] { DenseVectorFieldMapper.ElementType.BYTE, indexType });
-        }
 
         // Remove flat index types, as knn does not do a top k for flat
         params.removeIf(param -> param[1] != null && ((String) param[1]).contains("flat"));