Add names back

Author: nik9000

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

@@ -19,6 +19,11 @@
  * transforming loaded values into blocks.
  */
 public interface BlockLoaderFunctionConfig {
+    /**
+     * Name used in descriptions.
+     */
+    String name();
+
     record Named(String name, Warnings warnings) implements BlockLoaderFunctionConfig {
         @Override
         public int hashCode() {

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

@@ -3199,6 +3199,11 @@ public VectorSimilarityFunctionConfig forByteVector() {
             return this;
         }
 
+        @Override
+        public String name() {
+            return similarityFunction.toString();
+        }
+
         public byte[] vectorAsBytes() {
             assert vectorAsBytes != null : "vectorAsBytes is null, call forByteVector() first";
             return vectorAsBytes;

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/blockloader/BlockLoaderExpression.java

@@ -45,12 +45,12 @@ public interface BlockLoaderExpression {
      * "fusing" the expression into the load. Or null if the fusion isn't possible.
      */
     @Nullable
-    Fuse tryFuse(SearchStats stats);
+    FusedExpression tryFuse(SearchStats stats);
 
     /**
      * Fused load configuration.
      * @param field the field whose load we're fusing into
      * @param config the fusion configuration
      */
-    record Fuse(FieldAttribute field, BlockLoaderFunctionConfig config) {}
+    record FusedExpression(FieldAttribute field, BlockLoaderFunctionConfig config) {}
 }

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/Length.java

@@ -98,13 +98,13 @@ public ExpressionEvaluator.Factory toEvaluator(ToEvaluator toEvaluator) {
     }
 
     @Override
-    public Fuse tryFuse(SearchStats stats) {
+    public FusedExpression tryFuse(SearchStats stats) {
         if (field instanceof FieldAttribute f) {
             if (stats.hasDocValues(f.fieldName()) == false) {
                 return null;
             }
             BlockLoaderWarnings warnings = new BlockLoaderWarnings(DriverContext.WarningsMode.COLLECT, source());
-            return new Fuse(f, new BlockLoaderFunctionConfig.Named("LENGTH", warnings));
+            return new FusedExpression(f, new BlockLoaderFunctionConfig.Named("LENGTH", warnings));
         }
         return null;
     }

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/vector/CosineSimilarity.java

@@ -40,6 +40,11 @@ public float calculateSimilarity(byte[] leftVector, byte[] rightVector) {
         public float calculateSimilarity(float[] leftVector, float[] rightVector) {
             return VectorUtil.cosine(leftVector, rightVector);
         }
+
+        @Override
+        public String toString() {
+            return "Cosine";
+        }
     };
 
     @FunctionInfo(

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/vector/DotProduct.java

@@ -41,6 +41,11 @@ public float calculateSimilarity(byte[] leftVector, byte[] rightVector) {
         public float calculateSimilarity(float[] leftVector, float[] rightVector) {
             return VectorUtil.dotProduct(leftVector, rightVector);
         }
+
+        @Override
+        public String toString() {
+            return "DotProduct";
+        }
     };
 
     @FunctionInfo(

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/vector/Hamming.java

@@ -36,6 +36,11 @@ public float calculateSimilarity(byte[] leftVector, byte[] rightVector) {
         public float calculateSimilarity(float[] leftVector, float[] rightVector) {
             throw new UnsupportedOperationException("Hamming distance is not supported for float vectors");
         }
+
+        @Override
+        public String toString() {
+            return "Hamming";
+        }
     };
     public static final DenseVectorFieldMapper.SimilarityFunction EVALUATOR_SIMILARITY_FUNCTION =
         new DenseVectorFieldMapper.SimilarityFunction() {
@@ -56,6 +61,11 @@ public float calculateSimilarity(float[] leftVector, float[] rightVector) {
                 }
                 return Hamming.calculateSimilarity(a, b);
             }
+
+            @Override
+            public String toString() {
+                return "Hamming";
+            }
         };
 
     @FunctionInfo(

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/vector/L1Norm.java

@@ -49,6 +49,11 @@ public float calculateSimilarity(float[] leftVector, float[] rightVector) {
             }
             return result;
         }
+
+        @Override
+        public String toString() {
+            return "L1Norm";
+        }
     };
 
     @FunctionInfo(

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/vector/L2Norm.java

@@ -37,6 +37,11 @@ public float calculateSimilarity(byte[] leftVector, byte[] rightVector) {
         public float calculateSimilarity(float[] leftVector, float[] rightVector) {
             return (float) Math.sqrt(VectorUtil.squareDistance(leftVector, rightVector));
         }
+
+        @Override
+        public String toString() {
+            return "L1Norm";
+        }
     };
 
     @FunctionInfo(

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/vector/VectorSimilarityFunction.java

@@ -208,7 +208,7 @@ public void close() {
     }
 
     @Override
-    public final Fuse tryFuse(SearchStats stats) {
+    public final FusedExpression tryFuse(SearchStats stats) {
         // Bail if we're not directly comparing a field with a literal.
         Literal literal;
         FieldAttribute field;
@@ -233,7 +233,7 @@ public final Fuse tryFuse(SearchStats stats) {
             vectorArray[i] = ((Number) vectorList.get(i)).floatValue();
         }
 
-        return new Fuse(field, new DenseVectorFieldMapper.VectorSimilarityFunctionConfig(getSimilarityFunction(), vectorArray));
+        return new FusedExpression(field, new DenseVectorFieldMapper.VectorSimilarityFunctionConfig(getSimilarityFunction(), vectorArray));
     }
 
     interface VectorValueProvider extends Releasable {