Trying to fix failures

Author: GalLalouche

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

@@ -1464,8 +1464,7 @@ private Optional<Expression> convertHelper(
             if (typeResolutions.size() != imf.getTypesToIndices().size()) {
                 return Optional.empty();
             }
-            // If all mapped types were resolved, create a new FieldAttribute with the resolved MultiTypeEsField
-            MultiTypeEsField multiTypeEsField = resolvedMultiTypeEsField(imf, typeResolutions);
+            MultiTypeEsField multiTypeEsField = resolvedMultiTypeEsField(fa.fieldName(), imf, typeResolutions);
             return Optional.of(createIfDoesNotAlreadyExist(fa, fieldFinisher.apply(multiTypeEsField), unionFieldAttributes));
         }
 
@@ -1489,11 +1488,15 @@ private Expression createIfDoesNotAlreadyExist(
             }
         }
 
-        private MultiTypeEsField resolvedMultiTypeEsField(InvalidMappedField imf, HashMap<TypeResolutionKey, Expression> typeResolutions) {
+        private MultiTypeEsField resolvedMultiTypeEsField(
+            String fieldAttributeName,
+            InvalidMappedField imf,
+            HashMap<TypeResolutionKey, Expression> typeResolutions
+        ) {
             Map<String, Expression> typesToConversionExpressions = new HashMap<>();
             imf.getTypesToIndices().forEach((typeName, indexNames) -> {
                 DataType type = DataType.fromTypeName(typeName);
-                TypeResolutionKey key = new TypeResolutionKey(imf.getName(), type);
+                TypeResolutionKey key = new TypeResolutionKey(fieldAttributeName, type);
                 if (typeResolutions.containsKey(key)) {
                     typesToConversionExpressions.put(typeName, typeResolutions.get(key));
                 }

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/Insist.java

@@ -24,7 +24,7 @@
 import java.util.List;
 import java.util.OptionalInt;
 
-public final class Insist extends UnaryPlan {
+public class Insist extends UnaryPlan {
     public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(LogicalPlan.class, "INSIST", Insist::new);
 
     private final InsistParameters parameters;

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/tree/EsqlNodeSubclassTests.java

@@ -41,6 +41,7 @@
 import org.elasticsearch.xpack.esql.expression.function.scalar.string.Concat;
 import org.elasticsearch.xpack.esql.expression.predicate.fulltext.FullTextPredicate;
 import org.elasticsearch.xpack.esql.index.EsIndex;
+import org.elasticsearch.xpack.esql.plan.InsistParameters;
 import org.elasticsearch.xpack.esql.plan.logical.Dissect;
 import org.elasticsearch.xpack.esql.plan.logical.Grok;
 import org.elasticsearch.xpack.esql.plan.logical.LogicalPlan;
@@ -441,6 +442,9 @@ public void accept(Page page) {
             return randomInt();
         } else if (argClass == JoinType.class) {
             return JoinTypes.LEFT;
+        } else if (argClass == InsistParameters.class) {
+            // record class
+            return new InsistParameters(randomAlphaOfLength(16));
         }
 
         if (Expression.class == argClass) {