elastic · GalLalouche · Mar 27, 2026 · Dec 18, 2025 · Jan 21, 2026 · Jan 22, 2026
diff --git a/...marks/src/main/java/org/elasticsearch/benchmark/_nightly/esql/QueryPlanningBenchmark.java b/...marks/src/main/java/org/elasticsearch/benchmark/_nightly/esql/QueryPlanningBenchmark.java
@@ -54,7 +54,6 @@
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import static java.util.Collections.emptyMap;
@@ -108,7 +107,7 @@ public void setup() {
             mapping.put("field" + i, new EsField("field-" + i, TEXT, emptyMap(), true, EsField.TimeSeriesFieldType.NONE));
         }
 
-        var esIndex = new EsIndex("test", mapping, Map.of("test", IndexMode.STANDARD), Map.of(), Map.of(), Set.of());
+        var esIndex = new EsIndex("test", mapping, Map.of("test", IndexMode.STANDARD), Map.of(), Map.of(), Map.of());
 
         var functionRegistry = new EsqlFunctionRegistry();
         parser = new EsqlParser(new EsqlConfig(functionRegistry));

diff --git a/benchmarks/src/main/java/org/elasticsearch/benchmark/esql/ViewResolutionBenchmarkBase.java b/benchmarks/src/main/java/org/elasticsearch/benchmark/esql/ViewResolutionBenchmarkBase.java
@@ -167,7 +167,7 @@ public void setup() {
             String name = "col" + i;
             mapping.put(name, new EsField(name, KEYWORD, emptyMap(), true, EsField.TimeSeriesFieldType.NONE));
         }
-        EsIndex esIndex = new EsIndex("test", mapping, Map.of("test", IndexMode.STANDARD), Map.of(), Map.of(), Set.of());
+        EsIndex esIndex = new EsIndex("test", mapping, Map.of("test", IndexMode.STANDARD), Map.of(), Map.of(), Map.of());
 
         Configuration config = new Configuration(
             DateUtils.UTC,

diff --git a/docs/changelog/143693.yaml b/docs/changelog/143693.yaml
@@ -0,0 +1,7 @@
+area: ES|QL
+issues:
+ - 142004
+ - 141912
+pr: 143693
+summary: Type conflict resolution in unmapped-fields load
+type: feature
diff --git a/...c/main/resources/transport/definitions/referable/esql_potentially_unmapped_expression.csv b/...c/main/resources/transport/definitions/referable/esql_potentially_unmapped_expression.csv
@@ -0,0 +1 @@
+9332000
diff --git a/server/src/main/resources/transport/upper_bounds/9.4.csv b/server/src/main/resources/transport/upper_bounds/9.4.csv
@@ -1 +1 @@
-shard_routing_initialize_from_unassigned_xor_relocation,9331000
+esql_potentially_unmapped_expression,9332000
diff --git a/...src/main/java/org/elasticsearch/xpack/esql/qa/rest/generative/GenerativeForkRestTest.java b/...src/main/java/org/elasticsearch/xpack/esql/qa/rest/generative/GenerativeForkRestTest.java
@@ -18,7 +18,7 @@
 import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.APPROXIMATION_V5;
 import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.FORK_V9;
 import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.METRICS_GROUP_BY_ALL;
-import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.OPTIONAL_FIELDS_V2;
+import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.OPTIONAL_FIELDS_V3;
 import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.SUBQUERY_IN_FROM_COMMAND;
 import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.UNMAPPED_FIELDS;
 import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.VIEWS_WITH_BRANCHING;
@@ -66,7 +66,7 @@ protected void shouldSkipTest(String testName) throws IOException {
         // FORK is not supported with unmapped_fields="load", see https://github.com/elastic/elasticsearch/issues/142033
         assumeFalse(
             "FORK is not supported with unmapped_fields=\"load\"",
-            testCase.requiredCapabilities.contains(OPTIONAL_FIELDS_V2.capabilityName())
+            testCase.requiredCapabilities.contains(OPTIONAL_FIELDS_V3.capabilityName())
         );
 
         assumeFalse(

diff --git a/...n/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestsDataLoader.java b/...n/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestsDataLoader.java
@@ -107,6 +107,7 @@ public class CsvTestsDataLoader {
         new TestDataset("languages_mixed_numerics").withSetting("lookup-settings.json"),
         new TestDataset("ul_logs"),
         new TestDataset("sample_data"),
+        new TestDataset("sample_data").withIndex("cloned_sample_data"),
         new TestDataset("partial_mapping_sample_data"),
         new TestDataset("no_mapping_sample_data", "mapping-no_mapping_sample_data.json", "partial_mapping_sample_data.csv").withTypeMapping(
             Stream.of("timestamp", "client_ip", "event_duration").collect(toMap(k -> k, k -> "keyword"))

diff --git a/.../plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/TestAnalyzer.java b/.../plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/TestAnalyzer.java
@@ -49,7 +49,6 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
@@ -156,7 +155,7 @@ public TestAnalyzer addNoFieldsIndex() {
             Map.of(noFieldsIndexName, IndexMode.STANDARD),
             Map.of("", List.of(noFieldsIndexName)),
             Map.of("", List.of(noFieldsIndexName)),
-            Set.of()
+            Map.of()
         );
         addIndex(noFieldsIndexName, IndexResolution.valid(noFieldsIndex));
         return this;
@@ -770,7 +769,7 @@ public AnalyzerContext buildContext() {
      */
     public static IndexResolution loadMapping(String resource, String indexName, IndexMode indexMode) {
         return IndexResolution.valid(
-            new EsIndex(indexName, EsqlTestUtils.loadMapping(resource), Map.of(indexName, indexMode), Map.of(), Map.of(), Set.of())
+            new EsIndex(indexName, EsqlTestUtils.loadMapping(resource), Map.of(indexName, indexMode), Map.of(), Map.of(), Map.of())
         );
     }
 

diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/flattened.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/flattened.csv-spec
@@ -1,6 +1,6 @@
 flattened root fields
 required_capability: load_flattened_field
-required_capability: optional_fields_v2
+required_capability: optional_fields_v3
 
 SET unmapped_fields="load"\;
 FROM flattened_otel_logs
@@ -17,7 +17,7 @@ FROM flattened_otel_logs
 # Temporarily ignored since loading subfields of flattened type is not allowed
 flattened KEEP subfield-Ignore
 required_capability: load_flattened_field
-required_capability: optional_fields_v2
+required_capability: optional_fields_v3
 
 SET unmapped_fields="load"\;
 FROM flattened_otel_logs
@@ -42,7 +42,7 @@ FROM flattened_otel_logs
 # Temporarily ignored since loading subfields of flattened type is not allowed
 flattened DROP subfield-Ignore
 required_capability: load_flattened_field
-required_capability: optional_fields_v2
+required_capability: optional_fields_v3
 
 SET unmapped_fields="load"\;
 FROM flattened_otel_logs
@@ -68,7 +68,7 @@ FROM flattened_otel_logs
 # Temporarily ignored since loading subfields of flattened type is not allowed
 flattened DROP subfield after KEEP-Ignore
 required_capability: load_flattened_field
-required_capability: optional_fields_v2
+required_capability: optional_fields_v3
 
 SET unmapped_fields="load"\;
 FROM flattened_otel_logs
@@ -94,7 +94,7 @@ FROM flattened_otel_logs
 # Temporarily ignored since loading subfields of flattened type is not allowed
 flattened subfield with WHERE-Ignore
 required_capability: load_flattened_field
-required_capability: optional_fields_v2
+required_capability: optional_fields_v3
 
 SET unmapped_fields="load"\;
 FROM flattened_otel_logs
@@ -111,7 +111,7 @@ FROM flattened_otel_logs
 # Temporarily ignored since loading subfields of flattened type is not allowed
 flattened subfield with WHERE and KEEP *-Ignore
 required_capability: load_flattened_field
-required_capability: optional_fields_v2
+required_capability: optional_fields_v3
 
 SET unmapped_fields="load"\;
 FROM flattened_otel_logs
@@ -129,7 +129,7 @@ FROM flattened_otel_logs
 # Temporarily ignored since loading subfields of flattened type is not allowed
 flattened subfield with WHERE and KEEP specific subfields-Ignore
 required_capability: load_flattened_field
-required_capability: optional_fields_v2
+required_capability: optional_fields_v3
 
 SET unmapped_fields="load"\;
 FROM flattened_otel_logs
@@ -147,7 +147,7 @@ FROM flattened_otel_logs
 # Temporarily ignored since loading subfields of flattened type is not allowed
 flattened subfield with EVAL TO_UPPER-Ignore
 required_capability: load_flattened_field
-required_capability: optional_fields_v2
+required_capability: optional_fields_v3
 
 SET unmapped_fields="load"\;
 FROM flattened_otel_logs
@@ -173,7 +173,7 @@ FROM flattened_otel_logs
 # Temporarily ignored since loading subfields of flattened type is not allowed
 flattened subfield with EVAL LENGTH-Ignore
 required_capability: load_flattened_field
-required_capability: optional_fields_v2
+required_capability: optional_fields_v3
 
 SET unmapped_fields="load"\;
 FROM flattened_otel_logs
@@ -199,7 +199,7 @@ FROM flattened_otel_logs
 # Temporarily ignored since loading subfields of flattened type is not allowed
 SORT on flattened subfield-Ignore
 required_capability: load_flattened_field
-required_capability: optional_fields_v2
+required_capability: optional_fields_v3
 
 SET unmapped_fields="load"\;
 FROM flattened_otel_logs
@@ -224,7 +224,7 @@ FROM flattened_otel_logs
 # Temporarily ignored since loading subfields of flattened type is not allowed
 RENAME flattened subfield-Ignore
 required_capability: load_flattened_field
-required_capability: optional_fields_v2
+required_capability: optional_fields_v3
 
 SET unmapped_fields="load"\;
 FROM flattened_otel_logs
@@ -250,7 +250,7 @@ FROM flattened_otel_logs
 # Temporarily ignored since loading subfields of flattened type is not allowed
 flattened subfield with STATS count-Ignore
 required_capability: load_flattened_field
-required_capability: optional_fields_v2
+required_capability: optional_fields_v3
 
 SET unmapped_fields="load"\;
 FROM flattened_otel_logs
@@ -265,7 +265,7 @@ count(*):long | resource.attributes.agent.type:keyword
 # Temporarily ignored since loading subfields of flattened type is not allowed
 flattened subfield with STATS count_distinct-Ignore
 required_capability: load_flattened_field
-required_capability: optional_fields_v2
+required_capability: optional_fields_v3
 
 SET unmapped_fields="load"\;
 FROM flattened_otel_logs
@@ -280,7 +280,7 @@ count_distinct(resource.attributes.host.name):long
 # Temporarily ignored since loading subfields of flattened type is not allowed
 flattened subfield with INLINE STATS-Ignore
 required_capability: load_flattened_field
-required_capability: optional_fields_v2
+required_capability: optional_fields_v3
 
 SET unmapped_fields="load"\;
 FROM flattened_otel_logs
@@ -302,7 +302,7 @@ FROM flattened_otel_logs
 # Temporarily ignored since loading subfields of flattened type is not allowed
 flattened subfield with MV_EXPAND-Ignore
 required_capability: load_flattened_field
-required_capability: optional_fields_v2
+required_capability: optional_fields_v3
 
 SET unmapped_fields="load"\;
 FROM flattened_otel_logs
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		shard_routing_initialize_from_unassigned_xor_relocation,9331000
		esql_potentially_unmapped_expression,9332000