Keep attribute

kanoshiou · kanoshiou · commit 1a8dadc77330 · 2025-04-17T22:09:26.000+08:00
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session/EsqlSession.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session/EsqlSession.java
@@ -626,7 +626,7 @@ static PreAnalysisResult fieldNames(LogicalPlan parsed, Set<String> enrichPolicy
                 p.forEachExpression(UnresolvedNamePattern.class, up -> {
                     var ua = new UnresolvedAttribute(up.source(), up.name());
                     referencesBuilder.add(ua);
-                    if (p instanceof Keep) {
+                    if (p instanceof Keep || p instanceof Drop) {
                         keepCommandRefsBuilder.add(ua);
                     }
                 });

Original file line number	Diff line number	Diff line change
`@@ -626,7 +626,7 @@ static PreAnalysisResult fieldNames(LogicalPlan parsed, Set<String> enrichPolicy`
`626`	`626`	`p.forEachExpression(UnresolvedNamePattern.class, up -> {`
`627`	`627`	`var ua = new UnresolvedAttribute(up.source(), up.name());`
`628`	`628`	`referencesBuilder.add(ua);`
`629`		`- if (p instanceof Keep) {`
	`629`	`+ if (p instanceof Keep \|\| p instanceof Drop) {`
`630`	`630`	`keepCommandRefsBuilder.add(ua);`
`631`	`631`	`}`
`632`	`632`	`});`