Skip to content

Disallow unmapped_fields=load with partial non-KEYWORD #144109

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.

Sign up for GitHub

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
alex-spies merged 59 commits into from
Mar 31, 2026
Merged

Disallow unmapped_fields=load with partial non-KEYWORD #144109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
90769e3
ESQL: disallow unmapped_fields=load with partial non-KEYWORD
shmuelhanoch Mar 12, 2026
d26b416
[CI] Auto commit changes from spotless
Mar 16, 2026
7c04f1d
Merge remote-tracking branch 'origin/main' into 143218-esql-unmapped-…
mouhc1ne Mar 24, 2026
d3b89b8
ESQL: disallow unmapped_fields=load with partial non-KEYWORD
shmuelhanoch Mar 12, 2026
a83ca15
Review fixes
shmuelhanoch Mar 24, 2026
8d2b3cf
Merge remote-tracking branch 'origin/main' into 143218-esql-unmapped-…
mouhc1ne Mar 25, 2026
cd3878e
Merge remote-tracking branch 'origin/main' into 143218-esql-unmapped-…
mouhc1ne Mar 26, 2026
f9b0281
Merge remote-tracking branch 'origin/main' into 143218-esql-unmapped-…
mouhc1ne Mar 26, 2026
fe38e14
Review fixes around tests:
shmuelhanoch Mar 26, 2026
b136452
Merge remote-tracking branch 'origin/main' into 143218-esql-unmapped-…
mouhc1ne Mar 26, 2026
d8ae10a
Merge remote-tracking branch 'fork-shmuel/143218-esql-unmapped-fields…
mouhc1ne Mar 26, 2026
7233c83
changes below
mouhc1ne Mar 26, 2026
1e1b19a
clean-up
mouhc1ne Mar 26, 2026
25f7c1f
changes below
mouhc1ne Mar 26, 2026
0a29dc2
Merge remote-tracking branch 'origin/main' into 143218-esql-unmapped-…
mouhc1ne Mar 26, 2026
b5d63e5
Merge remote-tracking branch 'origin/main' into 143218-esql-unmapped-…
mouhc1ne Mar 27, 2026
b24878e
Merge remote-tracking branch 'origin/main' into 143218-esql-unmapped-…
mouhc1ne Mar 27, 2026
02861aa
Fix issues that occurred after merge-conflict
mouhc1ne Mar 27, 2026
7937027
[CI] Auto commit changes from spotless
Mar 27, 2026
9f87886
Changes below:
mouhc1ne Mar 27, 2026
cbb59df
Merge remote-tracking branch 'origin/main' into 143218-esql-unmapped-…
mouhc1ne Mar 27, 2026
bc86417
Merge remote-tracking branch 'fork-shmuel/143218-esql-unmapped-fields…
mouhc1ne Mar 27, 2026
cb42da0
Merge remote-tracking branch 'origin/main' into 143218-esql-unmapped-…
mouhc1ne Mar 27, 2026
3e9e2df
Merge remote-tracking branch 'origin/main' into 143218-esql-unmapped-…
mouhc1ne Mar 28, 2026
289449e
Merge remote-tracking branch 'origin/main' into 143218-esql-unmapped-…
mouhc1ne Mar 28, 2026
3298e14
changes below:
mouhc1ne Mar 28, 2026
a4cede8
Merge remote-tracking branch 'origin/main' into 143218-esql-unmapped-…
mouhc1ne Mar 28, 2026
88b4b57
Changes below:
mouhc1ne Mar 28, 2026
e7eedf4
Merge remote-tracking branch 'origin/main' into 143218-esql-unmapped-…
mouhc1ne Mar 29, 2026
104625d
[CI] Auto commit changes from spotless
Mar 29, 2026
5922f3c
bug fixes
mouhc1ne Mar 29, 2026
68e261b
Merge remote-tracking branch 'fork-shmuel/143218-esql-unmapped-fields…
mouhc1ne Mar 29, 2026
865620d
Some more tests given review comments:
shmuelhanoch Mar 30, 2026
0a9c44f
ESQL: run partial-non-keyword check before unresolved-attribute bail-out
shmuelhanoch Mar 30, 2026
8b1b15f
More tests fixes:
shmuelhanoch Mar 30, 2026
3ea062f
Replace assertThat(plan, not(nullValue())) with structural assertions:
shmuelhanoch Mar 30, 2026
e0809f2
Merge branch 'main' into 143218-esql-unmapped-fields-load
shmuelhanoch Mar 30, 2026
b9c507a
Changes below:
mouhc1ne Mar 30, 2026
e0f1189
Merge remote-tracking branch 'origin/main' into 143218-esql-unmapped-…
mouhc1ne Mar 30, 2026
73c9a1f
Use field attributes for PUNK detection
mouhc1ne Mar 30, 2026
f818a16
Make verification flag RENAME of PUNKs
alex-spies Mar 30, 2026
ab35cef
Move tests VerifierTests->AnalyzerUnmappedTests
alex-spies Mar 30, 2026
d102ccd
Add rename/keep/drop tests
alex-spies Mar 30, 2026
40064ad
Fix golden test
alex-spies Mar 30, 2026
98bb0fb
Remove redunant verification, improve error msg
alex-spies Mar 30, 2026
8503f11
Simplify unrelated test expectations
alex-spies Mar 30, 2026
f04dea1
[CI] Auto commit changes from spotless
Mar 30, 2026
fd4ad0b
Use realistic EsIndexes in AnalyzerUnmappedTests
alex-spies Mar 30, 2026
b5a3a6c
Remove redundant test cases
alex-spies Mar 30, 2026
4c5038b
[CI] Auto commit changes from spotless
Mar 30, 2026
1fee7b8
Remove leftover
alex-spies Mar 30, 2026
7a1a802
More yaml tests
mouhc1ne Mar 30, 2026
f5c6ff8
Merge branch 'main' into 143218-esql-unmapped-fields-load
alex-spies Mar 31, 2026
28feedf
Iterate on yaml tests
alex-spies Mar 31, 2026
26ae9e4
Mute bug reproducers with KEEP
alex-spies Mar 31, 2026
c8d3648
Merge branch 'main' into 143218-esql-unmapped-fields-load
alex-spies Mar 31, 2026
75adf5c
Add more mutes
alex-spies Mar 31, 2026
bb4df87
Mute the yaml tests directly
alex-spies Mar 31, 2026
1c03b1f
Merge branch 'main' into 143218-esql-unmapped-fields-load
alex-spies Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...src/main/java/org/elasticsearch/xpack/esql/qa/rest/generative/GenerativeForkRestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.ESQL_WITHOUT_GROUPING;
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_V4;
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.OPTIONAL_FIELDS_V5;
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;
Expand Down Expand Up @@ -67,7 +67,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_V4.capabilityName())
testCase.requiredCapabilities.contains(OPTIONAL_FIELDS_V5.capabilityName())
);

assumeFalse(
Expand Down
30 changes: 15 additions & 15 deletions x-pack/plugin/esql/qa/testFixtures/src/main/resources/flattened.csv-spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
flattened root fields
required_capability: load_flattened_field
required_capability: optional_fields_v4
required_capability: optional_fields_v5

SET unmapped_fields="load"\;
FROM flattened_otel_logs
Expand All @@ -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_v4
required_capability: optional_fields_v5

SET unmapped_fields="load"\;
FROM flattened_otel_logs
Expand All @@ -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_v4
required_capability: optional_fields_v5

SET unmapped_fields="load"\;
FROM flattened_otel_logs
Expand All @@ -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_v4
required_capability: optional_fields_v5

SET unmapped_fields="load"\;
FROM flattened_otel_logs
Expand All @@ -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_v4
required_capability: optional_fields_v5

SET unmapped_fields="load"\;
FROM flattened_otel_logs
Expand All @@ -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_v4
required_capability: optional_fields_v5

SET unmapped_fields="load"\;
FROM flattened_otel_logs
Expand All @@ -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_v4
required_capability: optional_fields_v5

SET unmapped_fields="load"\;
FROM flattened_otel_logs
Expand All @@ -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_v4
required_capability: optional_fields_v5

SET unmapped_fields="load"\;
FROM flattened_otel_logs
Expand All @@ -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_v4
required_capability: optional_fields_v5

SET unmapped_fields="load"\;
FROM flattened_otel_logs
Expand All @@ -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_v4
required_capability: optional_fields_v5

SET unmapped_fields="load"\;
FROM flattened_otel_logs
Expand All @@ -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_v4
required_capability: optional_fields_v5

SET unmapped_fields="load"\;
FROM flattened_otel_logs
Expand All @@ -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_v4
required_capability: optional_fields_v5

SET unmapped_fields="load"\;
FROM flattened_otel_logs
Expand All @@ -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_v4
required_capability: optional_fields_v5

SET unmapped_fields="load"\;
FROM flattened_otel_logs
Expand All @@ -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_v4
required_capability: optional_fields_v5

SET unmapped_fields="load"\;
FROM flattened_otel_logs
Expand All @@ -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_v4
required_capability: optional_fields_v5

SET unmapped_fields="load"\;
FROM flattened_otel_logs
Expand Down
Loading
Loading