Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
ab3f000
Add first test + some skaffolding
alex-spies Jun 16, 2025
6efc938
Improve naming in pushGeneratingPlanPastProjectAndOrderBy
alex-spies Jun 16, 2025
c11e139
Sketch out algorithm
alex-spies Jun 16, 2025
c2c401b
Implement algo
alex-spies Jun 16, 2025
1d830ac
Fix first bug, lol
alex-spies Jun 16, 2025
9f30384
Fix another bug :)
alex-spies Jun 16, 2025
1ce823a
Merge remote-tracking branch 'upstream/main' into pushdown-lu-join-pa…
alex-spies Jun 17, 2025
83978b0
Remove redundant capability
alex-spies Jun 17, 2025
4610340
Add comment to EsqlProject
alex-spies Jun 17, 2025
2d6bfd8
Merge remote-tracking branch 'upstream/main' into pushdown-lu-join-pa…
alex-spies Jun 17, 2025
896d406
Update test expectations
alex-spies Jun 17, 2025
1056e37
Do not apply to INLINESTATS
alex-spies Jun 17, 2025
1dd89d1
Start splitting LogicalPlanOptimizerTests
alex-spies Jun 17, 2025
ce38db5
Move new test to its own class
alex-spies Jun 17, 2025
ac13587
Add first optimizer test
alex-spies Jun 17, 2025
21b7bde
Add first edge case optimizer tests
alex-spies Jun 17, 2025
a9f3ac3
Update docs/changelog/129503.yaml
alex-spies Jun 17, 2025
4de2fc2
Merge remote-tracking branch 'upstream/main' into pushdown-lu-join-pa…
alex-spies Jun 17, 2025
c04ca94
Update 129503.yaml
alex-spies Jun 17, 2025
b42e30a
Merge remote-tracking branch 'upstream/main' into pushdown-lu-join-pa…
alex-spies Jun 20, 2025
ffa8b99
Implement feedback
alex-spies Jun 20, 2025
0512094
Validation for Project
alex-spies Jun 20, 2025
50f864d
Fix visibility
alex-spies Jun 20, 2025
3ece38e
Fix validation
alex-spies Jun 20, 2025
d5ba763
Improve readability
alex-spies Jun 20, 2025
c8edad4
Spotless
alex-spies Jun 20, 2025
dc5c91e
Add more complex unit test
alex-spies Jun 20, 2025
1f82f93
More spec tests
alex-spies Jun 20, 2025
fb13584
Make tests respect Project's invariant
alex-spies Jun 23, 2025
2b02b6f
Merge remote-tracking branch 'upstream/main' into pushdown-lu-join-pa…
alex-spies Jun 23, 2025
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix validation
  • Loading branch information
alex-spies committed Jun 20, 2025
commit 3ece38e5e74fd5a33847e2da185fd4fe67dc6d63
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
import org.elasticsearch.xpack.esql.core.expression.Attribute;
import org.elasticsearch.xpack.esql.core.expression.Expressions;
import org.elasticsearch.xpack.esql.core.expression.NamedExpression;
import org.elasticsearch.xpack.esql.core.expression.UnresolvedNamedExpression;
import org.elasticsearch.xpack.esql.core.tree.NodeInfo;
import org.elasticsearch.xpack.esql.core.tree.Source;
import org.elasticsearch.xpack.esql.expression.UnresolvedNamePattern;
import org.elasticsearch.xpack.esql.expression.function.Functions;
import org.elasticsearch.xpack.esql.io.stream.PlanStreamInput;

Expand All @@ -39,9 +41,11 @@ public Project(Source source, LogicalPlan child, List<? extends NamedExpression>

private boolean validateProjections(List<? extends NamedExpression> projections) {
for (NamedExpression ne: projections) {
if (ne instanceof Alias as && (as.child() instanceof Attribute == false)) {
return false;
} else if (ne instanceof Attribute == false) {
if (ne instanceof Alias as) {
if (as.child() instanceof Attribute == false) {
return false;
}
} else if (ne instanceof Attribute == false && ne instanceof UnresolvedNamedExpression == false) {
return false;
}
}
Expand Down