More tests

Author: nik9000

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

@@ -824,16 +824,14 @@ NamedAnalyzer normalizer() {
         @Override
         public BlockLoader blockLoader(BlockLoaderContext blContext) {
             if (hasDocValues() && (blContext.fieldExtractPreference() != FieldExtractPreference.STORED || isSyntheticSourceEnabled())) {
-                return switch (blContext.blockLoaderFunctionConfig()) {
-                    case null -> new BytesRefsFromOrdsBlockLoader(name());
-                    case BlockLoaderFunctionConfig.Named named -> switch (named.name()) {
-                        case "LENGTH" -> new Utf8CodePointsFromOrdsBlockLoader(named.warnings(), name());
-                        default -> throw new UnsupportedOperationException("unknown fusion config [" + named.name() + "]");
-                    };
-                    default -> throw new UnsupportedOperationException(
-                        "unknown fusion config [" + blContext.blockLoaderFunctionConfig() + "]"
-                    );
-                };
+                BlockLoaderFunctionConfig cfg = blContext.blockLoaderFunctionConfig();
+                if (cfg == null) {
+                    return new BytesRefsFromOrdsBlockLoader(name());
+                }
+                if (cfg.function() == BlockLoaderFunctionConfig.Function.LENGTH) {
+                    return new Utf8CodePointsFromOrdsBlockLoader(((BlockLoaderFunctionConfig.JustWarnings) cfg).warnings(), name());
+                }
+                throw new UnsupportedOperationException("unknown fusion config [" + cfg.function() + "]");
             }
             if (blContext.blockLoaderFunctionConfig() != null) {
                 throw new UnsupportedOperationException("function fusing only supported for doc values");
@@ -863,7 +861,7 @@ public Builder builder(BlockFactory factory, int expectedCount) {
         @Override
         public boolean supportsBlockLoaderConfig(BlockLoaderFunctionConfig config, FieldExtractPreference preference) {
             if (hasDocValues() && (preference != FieldExtractPreference.STORED || isSyntheticSourceEnabled())) {
-                return config.name().equals("LENGTH");
+                return config.function() == BlockLoaderFunctionConfig.Function.LENGTH;
             }
             return false;
         }

server/src/main/java/org/elasticsearch/index/mapper/blockloader/BlockLoaderFunctionConfig.java

@@ -22,21 +22,16 @@ public interface BlockLoaderFunctionConfig {
     /**
      * Name used in descriptions.
      */
-    String name();
+    Function function();
 
-    record Named(String name, Warnings warnings) implements BlockLoaderFunctionConfig {
-        @Override
-        public int hashCode() {
-            return name.hashCode();
-        }
+    record JustWarnings(Function function, Warnings warnings) implements BlockLoaderFunctionConfig {}
 
-        @Override
-        public boolean equals(Object o) {
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            Named named = (Named) o;
-            return name.equals(named.name);
-        }
+    enum Function {
+        LENGTH,
+        V_COSINE,
+        V_DOT_PRODUCT,
+        V_HAMMING,
+        V_L1NORM,
+        V_L2NORM,
     }
 }

server/src/main/java/org/elasticsearch/index/mapper/blockloader/docvalues/DenseVectorBlockLoaderProcessor.java

@@ -112,7 +112,7 @@ public void process(byte[] vector, BlockLoader.DoubleBuilder builder) {
 
         @Override
         public String name() {
-            return config.similarityFunction().toString();
+            return config.similarityFunction().function().toString();
         }
     }
 }

server/src/main/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapper.java

@@ -2855,31 +2855,34 @@ public BlockLoader blockLoader(MappedFieldType.BlockLoaderContext blContext) {
                 return BlockLoader.CONSTANT_NULLS;
             }
 
-            BlockLoaderFunctionConfig functionConfig = blContext.blockLoaderFunctionConfig();
+            BlockLoaderFunctionConfig cfg = blContext.blockLoaderFunctionConfig();
             if (indexed) {
-                if (functionConfig == null) {
+                if (cfg == null) {
                     return new DenseVectorBlockLoader<>(
                         name(),
                         dims,
                         this,
                         new DenseVectorBlockLoaderProcessor.DenseVectorLoaderProcessor()
                     );
-                } else if (functionConfig instanceof VectorSimilarityFunctionConfig similarityConfig) {
-                    if (getElementType() == ElementType.BYTE || getElementType() == ElementType.BIT) {
-                        similarityConfig = similarityConfig.forByteVector();
-                    }
-                    return new DenseVectorBlockLoader<>(
-                        name(),
-                        dims,
-                        this,
-                        new DenseVectorBlockLoaderProcessor.DenseVectorSimilarityProcessor(similarityConfig)
-                    );
-                } else {
-                    throw new UnsupportedOperationException("Unknown block loader function config: " + functionConfig.getClass());
                 }
+                return switch (cfg.function()) {
+                    case V_COSINE, V_DOT_PRODUCT, V_HAMMING, V_L1NORM, V_L2NORM -> {
+                        VectorSimilarityFunctionConfig similarityConfig = (VectorSimilarityFunctionConfig) cfg;
+                        if (getElementType() == ElementType.BYTE || getElementType() == ElementType.BIT) {
+                            similarityConfig = similarityConfig.forByteVector();
+                        }
+                        yield new DenseVectorBlockLoader<>(
+                            name(),
+                            dims,
+                            this,
+                            new DenseVectorBlockLoaderProcessor.DenseVectorSimilarityProcessor(similarityConfig)
+                        );
+                    }
+                    default -> throw new UnsupportedOperationException("Unknown block loader function config: " + cfg.function());
+                };
             }
 
-            if (functionConfig != null) {
+            if (cfg != null) {
                 throw new IllegalArgumentException(
                     "Field ["
                         + name()
@@ -2908,7 +2911,10 @@ public boolean supportsBlockLoaderConfig(BlockLoaderFunctionConfig config, Field
             }
 
             if (indexed) {
-                return config instanceof VectorSimilarityFunctionConfig;
+                return switch (config.function()) {
+                    case V_COSINE, V_DOT_PRODUCT, V_HAMMING, V_L1NORM, V_L2NORM -> true;
+                    default -> false;
+                };
             }
             return false;
         }
@@ -3387,6 +3393,8 @@ public interface SimilarityFunction {
         float calculateSimilarity(float[] leftVector, float[] rightVector);
 
         float calculateSimilarity(byte[] leftVector, byte[] rightVector);
+
+        BlockLoaderFunctionConfig.Function function();
     }
 
     /**
@@ -3416,8 +3424,8 @@ public VectorSimilarityFunctionConfig forByteVector() {
         }
 
         @Override
-        public String name() {
-            return similarityFunction.toString();
+        public Function function() {
+            return similarityFunction.function();
         }
 
         public byte[] vectorAsBytes() {

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/type/FunctionEsField.java

@@ -79,6 +79,6 @@ public Exact getExactInfo() {
          * is a `FunctionEsField` which *looks* pushable without
          * the inexact match.
          */
-        return new Exact(false, "merged with " + functionConfig.name());
+        return new Exact(false, "merged with " + functionConfig.function());
     }
 }