Tries to exclude NO_FIELDS from the union type cleaning

ncordon · ncordon · commit 21ac430b7935 · 2025-09-03T13:57:56.000+02:00
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/analysis/Analyzer.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/analysis/Analyzer.java
@@ -1962,7 +1962,7 @@ private static LogicalPlan planWithoutSyntheticAttributes(LogicalPlan plan) {
 
             for (Attribute attr : output) {
                 // Do not let the synthetic union type field attributes end up in the final output.
-                if (attr.synthetic()) {
+                if (attr.synthetic() && attr.name().equals(Analyzer.NO_FIELDS_NAME) == false) {
                     continue;
                 }
                 newOutput.add(attr);

Original file line number	Diff line number	Diff line change
`@@ -1962,7 +1962,7 @@ private static LogicalPlan planWithoutSyntheticAttributes(LogicalPlan plan) {`
`1962`	`1962`
`1963`	`1963`	`for (Attribute attr : output) {`
`1964`	`1964`	`// Do not let the synthetic union type field attributes end up in the final output.`
`1965`		`- if (attr.synthetic()) {`
	`1965`	`+ if (attr.synthetic() && attr.name().equals(Analyzer.NO_FIELDS_NAME) == false) {`
`1966`	`1966`	`continue;`
`1967`	`1967`	`}`
`1968`	`1968`	`newOutput.add(attr);`