Renam

Author: nik9000

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
-    FusedExpression tryFuse(SearchStats stats);
+    FusedBlockLoaderExpression tryFuse(SearchStats stats);
 
     /**
-     * Fused load configuration.
+     * Expression "fused" to the block loader.
      * @param field the field whose load we're fusing into
-     * @param config the fusion configuration
+     * @param config the expression's configuration
      */
-    record FusedExpression(FieldAttribute field, BlockLoaderFunctionConfig config) {}
+    record FusedBlockLoaderExpression(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 FusedExpression tryFuse(SearchStats stats) {
+    public FusedBlockLoaderExpression 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 FusedExpression(f, new BlockLoaderFunctionConfig.Named("LENGTH", warnings));
+            return new FusedBlockLoaderExpression(f, new BlockLoaderFunctionConfig.Named("LENGTH", warnings));
         }
         return null;
     }

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 FusedExpression tryFuse(SearchStats stats) {
+    public final FusedBlockLoaderExpression 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 FusedExpression tryFuse(SearchStats stats) {
             vectorArray[i] = ((Number) vectorList.get(i)).floatValue();
         }
 
-        return new FusedExpression(field, new DenseVectorFieldMapper.VectorSimilarityFunctionConfig(getSimilarityFunction(), vectorArray));
+        return new FusedBlockLoaderExpression(field, new DenseVectorFieldMapper.VectorSimilarityFunctionConfig(getSimilarityFunction(), vectorArray));
     }
 
     interface VectorValueProvider extends Releasable {

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/local/FuseExpressionToFieldLoad.java

@@ -49,7 +49,7 @@ protected LogicalPlan rule(LogicalPlan plan, LocalLogicalOptimizerContext contex
             Map<Attribute.IdIgnoringWrapper, Attribute> addedAttrs = new HashMap<>();
             LogicalPlan transformedPlan = plan.transformExpressionsOnly(Expression.class, e -> {
                 if (e instanceof BlockLoaderExpression ble) {
-                    BlockLoaderExpression.FusedExpression fuse = ble.tryFuse(context.searchStats());
+                    BlockLoaderExpression.FusedBlockLoaderExpression fuse = ble.tryFuse(context.searchStats());
                     if (fuse != null) {
                         return replaceFieldsForFieldTransformations(e, addedAttrs, fuse);
                     }
@@ -85,7 +85,7 @@ protected LogicalPlan rule(LogicalPlan plan, LocalLogicalOptimizerContext contex
     private static Expression replaceFieldsForFieldTransformations(
         Expression e,
         Map<Attribute.IdIgnoringWrapper, Attribute> addedAttrs,
-        BlockLoaderExpression.FusedExpression fuse
+        BlockLoaderExpression.FusedBlockLoaderExpression fuse
     ) {
         // Change the similarity function to a reference of a transformation on the field
         FunctionEsField functionEsField = new FunctionEsField(fuse.field().field(), e.dataType(), fuse.config());