ESQL: Fix for overzealous validation in case of invalid mapped fields

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/plan/QueryPlan.java

@@ -16,6 +16,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
@@ -79,6 +80,17 @@ public AttributeSet references() {
     // pass Object.class as a type token to pick Collections of expressions not just expressions
     //
 
+    public <E extends Expression> PlanType transformExpressionsOnlyUsingParent(
+        Class<E> typeToken,
+        BiFunction<Expression, Expression, ? extends Expression> rule
+    ) {
+        return transformPropertiesOnly(Object.class, e -> doTransformExpression(e, exp -> exp.transformDownUsingParent(typeToken, rule)));
+    }
+
+    public PlanType transformExpressionsOnlyUsingParent(BiFunction<Expression, Expression, ? extends Expression> rule) {
+        return transformPropertiesOnly(Object.class, e -> doTransformExpression(e, exp -> exp.transformDownUsingParent(rule)));
+    }
+
     public PlanType transformExpressionsOnly(Function<Expression, ? extends Expression> rule) {
         return transformPropertiesOnly(Object.class, e -> doTransformExpression(e, exp -> exp.transformDown(rule)));
     }

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/tree/Node.java

@@ -14,6 +14,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
+import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -172,6 +173,24 @@ protected void doCollectFirst(Predicate<? super T> predicate, List<T> matches) {
     // transform the node itself and its children
     //
 
+    @SuppressWarnings("unchecked")
+    public <E extends T> T transformDownUsingParent(Class<E> typeToken, BiFunction<? super T, ? super T, ? extends T> rule) {
+        return transformDownUsingParent((t, parent) -> (typeToken.isInstance(t) ? rule.apply((E) t, parent) : t), null);
+    }
+
+    @SuppressWarnings("unchecked")
+    public T transformDownUsingParent(BiFunction<? super T, ? super T, ? extends T> rule) {
+        return transformDownUsingParent(rule, null);
+    }
+
+    @SuppressWarnings("unchecked")
+    public T transformDownUsingParent(BiFunction<? super T, ? super T, ? extends T> rule, T parent) {
+        T root = rule.apply((T) this, parent);
+        Node<T> node = this.equals(root) ? this : root;
+
+        return node.transformChildren(child -> child.transformDownUsingParent(rule, (T) node));
+    }
+
     @SuppressWarnings("unchecked")
     public T transformDown(Function<? super T, ? extends T> rule) {
         T root = rule.apply((T) this);
@@ -186,6 +205,23 @@ public <E extends T> T transformDown(Class<E> typeToken, Function<E, ? extends T
         return transformDown((t) -> (typeToken.isInstance(t) ? rule.apply((E) t) : t));
     }
 
+    @SuppressWarnings("unchecked")
+    public <E extends T> T transformUpUsingParent(Class<E> typeToken, BiFunction<? super T, ? super T, ? extends T> rule) {
+        return transformUpUsingParent((t, parent) -> (typeToken.isInstance(t) ? rule.apply((E) t, parent) : t), null);
+    }
+
+    @SuppressWarnings("unchecked")
+    public T transformUpUsingParent(BiFunction<? super T, ? super T, ? extends T> rule) {
+        return transformUpUsingParent(rule, null);
+    }
+
+    @SuppressWarnings("unchecked")
+    public T transformUpUsingParent(BiFunction<? super T, ? super T, ? extends T> rule, T parent) {
+        T transformed = transformChildren(child -> child.transformUpUsingParent(rule, (T) this));
+        T node = this.equals(transformed) ? (T) this : transformed;
+        return rule.apply(node, parent);
+    }
+
     @SuppressWarnings("unchecked")
     public T transformUp(Function<? super T, ? extends T> rule) {
         T transformed = transformChildren(child -> child.transformUp(rule));

x-pack/plugin/esql/qa/testFixtures/src/main/resources/union_types.csv-spec

@@ -1015,3 +1015,17 @@ client_ip:ip | event_duration:long |    message:keyword    |    @timestamp:keywo
 ;
 
 # Once INLINESTATS supports expressions in agg functions and groups, convert the group in the inlinestats
+
+multiIndexNoUnionRename
+// TODO: union types not really required, this is only needed because csv tests currently can't load more than one
+// index/csv.
+required_capability: union_types
+FROM sample_data, sample_data_ts_long
+| RENAME message AS event_message
+| SORT client_ip ASC
+| LIMIT 1
+;
+
+@timestamp:null          | client_ip:ip | event_duration:long | event_message:keyword
+2023-10-23T13:33:34.937Z | 172.21.0.5   |             1232382 | Disconnected
+;