ESQL: introduce support for mapping-unavailable fields (Fork from #139417) #140463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

GalLalouche merged 52 commits into elastic:main from GalLalouche:feat/set_unmapped_nullify_keyword

Jan 12, 2026

...marks/src/main/java/org/elasticsearch/benchmark/_nightly/esql/QueryPlanningBenchmark.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -58,6 +58,7 @@ @@
     import static java.util.Collections.emptyMap;
     import static org.elasticsearch.xpack.esql.core.type.DataType.TEXT;
+    import static org.elasticsearch.xpack.esql.plan.QuerySettings.UNMAPPED_FIELDS;
     @Fork(1)
     @Warmup(iterations = 5)
@@ Expand Down Expand Up / @@ -119,7 +120,8 @@ public void setup() { @@
                     Map.of(),
                     new EnrichResolution(),
                     InferenceResolution.EMPTY,
-                    minimumVersion
+                    minimumVersion,
+                    UNMAPPED_FIELDS.defaultValue()
                 ),
                 new Verifier(new Metrics(functionRegistry), new XPackLicenseState(() -> 0L))
             );
@@ Expand Down @@

docs/changelog/140463.yaml

-Original file line number
+Diff line change
@@ -0,0 +1,5 @@
+    pr: 140463
+    summary: "Introduce support for mapping-unavailable fields (Fork from #139417)"
+    area: ES|QL
+    type: feature
+    issues: []

docs/reference/query-languages/esql/kibana/definition/settings/unmapped_fields.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

...plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/EsqlTestUtils.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -83,6 +83,7 @@ @@
     import org.elasticsearch.xpack.esql.analysis.AnalyzerSettings;
     import org.elasticsearch.xpack.esql.analysis.EnrichResolution;
     import org.elasticsearch.xpack.esql.analysis.MutableAnalyzerContext;
+    import org.elasticsearch.xpack.esql.analysis.UnmappedResolution;
     import org.elasticsearch.xpack.esql.analysis.Verifier;
     import org.elasticsearch.xpack.esql.core.expression.Alias;
     import org.elasticsearch.xpack.esql.core.expression.Attribute;
@@ Expand Down Expand Up / @@ -220,6 +221,7 @@ @@
     import static org.elasticsearch.xpack.esql.parser.ParserUtils.ParamClassification.IDENTIFIER;
     import static org.elasticsearch.xpack.esql.parser.ParserUtils.ParamClassification.PATTERN;
     import static org.elasticsearch.xpack.esql.parser.ParserUtils.ParamClassification.VALUE;
+    import static org.elasticsearch.xpack.esql.plan.QuerySettings.UNMAPPED_FIELDS;
     import static org.hamcrest.MatcherAssert.assertThat;
     import static org.hamcrest.Matchers.hasSize;
     import static org.hamcrest.Matchers.instanceOf;
@@ Expand Down Expand Up / @@ -546,6 +548,26 @@ public static MutableAnalyzerContext testAnalyzerContext( @@
             Map<String, IndexResolution> lookupResolution,
             EnrichResolution enrichResolution,
             InferenceResolution inferenceResolution
+        ) {
+            return testAnalyzerContext(
+                configuration,
+                functionRegistry,
+                indexResolutions,
+                lookupResolution,
+                enrichResolution,
+                inferenceResolution,
+                UNMAPPED_FIELDS.defaultValue()
+            );
+        }
+        public static MutableAnalyzerContext testAnalyzerContext(
+            Configuration configuration,
+            EsqlFunctionRegistry functionRegistry,
+            Map<IndexPattern, IndexResolution> indexResolutions,
+            Map<String, IndexResolution> lookupResolution,
+            EnrichResolution enrichResolution,
+            InferenceResolution inferenceResolution,
+            UnmappedResolution unmappedResolution
         ) {
             return new MutableAnalyzerContext(
                 configuration,
@@ Expand All / @@ -554,7 +576,8 @@ public static MutableAnalyzerContext testAnalyzerContext( @@
                 lookupResolution,
                 enrichResolution,
                 inferenceResolution,
-                randomMinimumVersion()
+                randomMinimumVersion(),
+                unmappedResolution
             );
         }
@@ Expand Down Expand Up / @@ -1212,6 +1235,23 @@ static BytesReference randomTsId() { @@
             return routingPathFields.buildHash();
         }
+        // lifted from org.elasticsearch.http.HttpClientStatsTrackerTests
+        public static String randomizeCase(String s) {
+            final char[] chars = s.toCharArray();
+            for (int i = 0; i < chars.length; i++) {
+                chars[i] = randomizeCase(chars[i]);
+            }
+            return new String(chars);
+        }
+        private static char randomizeCase(char c) {
+            return switch (between(1, 3)) {
+                case 1 -> Character.toUpperCase(c);
+                case 2 -> Character.toLowerCase(c);
+                default -> c;
+            };
+        }
         public static WildcardLike wildcardLike(Expression left, String exp) {
             return new WildcardLike(EMPTY, left, new WildcardPattern(exp), false);
         }
@@ Expand Down @@

...tFixtures/src/main/java/org/elasticsearch/xpack/esql/analysis/MutableAnalyzerContext.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -31,9 +31,19 @@ public MutableAnalyzerContext( @@
             Map<String, IndexResolution> lookupResolution,
             EnrichResolution enrichResolution,
             InferenceResolution inferenceResolution,
-            TransportVersion minimumVersion
+            TransportVersion minimumVersion,
+            UnmappedResolution unmappedResolution
         ) {
-            super(configuration, functionRegistry, indexResolution, lookupResolution, enrichResolution, inferenceResolution, minimumVersion);
+            super(
+                configuration,
+                functionRegistry,
+                indexResolution,
+                lookupResolution,
+                enrichResolution,
+                inferenceResolution,
+                minimumVersion,
+                unmappedResolution
+            );
             this.currentVersion = minimumVersion;
         }
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ESQL: introduce support for mapping-unavailable fields (Fork from #139417) #140463

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!