Share better

Author: nik9000

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/analysis/Analyzer.java

@@ -72,6 +72,7 @@
 import org.elasticsearch.xpack.esql.index.EsIndex;
 import org.elasticsearch.xpack.esql.index.IndexResolution;
 import org.elasticsearch.xpack.esql.inference.ResolvedInference;
+import org.elasticsearch.xpack.esql.optimizer.rules.logical.SubstituteSurrogateExpressions;
 import org.elasticsearch.xpack.esql.parser.ParsingException;
 import org.elasticsearch.xpack.esql.plan.IndexPattern;
 import org.elasticsearch.xpack.esql.plan.logical.Aggregate;
@@ -1617,6 +1618,7 @@ private LogicalPlan doRule(LogicalPlan plan) {
         }
 
         private Expression resolveConvertFunction(ConvertFunction convert, List<FieldAttribute> unionFieldAttributes) {
+            Expression convertExpression = (Expression) convert;
             if (convert.field() instanceof FieldAttribute fa && fa.field() instanceof InvalidMappedField imf) {
                 HashMap<TypeResolutionKey, Expression> typeResolutions = new HashMap<>();
                 Set<DataType> supportedTypes = convert.supportedTypes();
@@ -1643,9 +1645,11 @@ private Expression resolveConvertFunction(ConvertFunction convert, List<FieldAtt
                     return createIfDoesNotAlreadyExist(fa, resolvedField, unionFieldAttributes);
                 }
             } else if (convert.field() instanceof AbstractConvertFunction subConvert) {
-                return convert.replaceChildren(Collections.singletonList(resolveConvertFunction(subConvert, unionFieldAttributes)));
+                return convertExpression.replaceChildren(
+                    Collections.singletonList(resolveConvertFunction(subConvert, unionFieldAttributes))
+                );
             }
-            return (Expression) convert;
+            return convertExpression;
         }
 
         private Expression createIfDoesNotAlreadyExist(
@@ -1693,19 +1697,13 @@ private Expression typeSpecificConvert(ConvertFunction convert, Source source, D
                 originalFieldAttr.id(),
                 true
             );
-            Expression e = convert.replaceChildren(Collections.singletonList(resolvedAttr));
+            Expression e = ((Expression) convert).replaceChildren(Collections.singletonList(resolvedAttr));
             /*
              * Resolve surrogates immediately because these type specific conversions are serialized
              * and SurrogateExpressions are expected to be resolved on the coordinating node. At least,
              * TO_IP is expected to be resolved there.
              */
-            if (e instanceof SurrogateExpression s) {
-                Expression surrogate = s.surrogate();
-                if (surrogate != null) {
-                    return surrogate;
-                }
-            }
-            return e;
+            return SubstituteSurrogateExpressions.rule(e);
         }
     }
 

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

@@ -10,7 +10,6 @@
 import org.elasticsearch.xpack.esql.core.expression.Expression;
 import org.elasticsearch.xpack.esql.core.type.DataType;
 
-import java.util.List;
 import java.util.Set;
 
 /**
@@ -26,6 +25,4 @@ public interface ConvertFunction {
      * The types that {@link #field()} can have.
      */
     Set<DataType> supportedTypes();
-
-    Expression replaceChildren(List<Expression> newChildren);
 }

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

@@ -9,6 +9,7 @@
 
 import org.elasticsearch.xpack.esql.core.expression.Expression;
 import org.elasticsearch.xpack.esql.expression.SurrogateExpression;
+import org.elasticsearch.xpack.esql.expression.function.scalar.math.Exp;
 import org.elasticsearch.xpack.esql.optimizer.LogicalOptimizerContext;
 
 /**
@@ -22,6 +23,13 @@ public SubstituteSurrogateExpressions() {
 
     @Override
     protected Expression rule(Expression e, LogicalOptimizerContext ctx) {
+        return rule(e);
+    }
+
+    /**
+     * Perform the actual substitution.
+     */
+    public static Expression rule(Expression e) {
         if (e instanceof SurrogateExpression s) {
             Expression surrogate = s.surrogate();
             if (surrogate != null) {