[ESQL] Migrate PropagateEquals optimization #106627
Conversation
elasticsearchmachine
added
the
Team:Analytics
|
Pinging @elastic/es-analytical-engine (Team:Analytics) |
| @@ -42,11 +54,35 @@ private static LessThan lessThanOf(Expression left, Expression right) { | |||
| return new LessThan(EMPTY, left, right, null); | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
These mirror the functions of the same name in TestUtils, except these return the ESQL versions of the relevant expressions. In the future, it may be worth refactoring these into an EsqlTestUtils class, or maybe just inlining them as they're very small. For now, I think duplicating them like this is fine.
| public void testEliminateRangeByEqualsOutsideInterval() { | ||
| FieldAttribute fa = getFieldAttribute(); | ||
| Equals eq1 = equalsOf(fa, new Literal(EMPTY, 10, DataTypes.INTEGER)); | ||
| Range r = rangeOf(fa, ONE, false, new Literal(EMPTY, 10, DataTypes.INTEGER), false); |
There was a problem hiding this comment.
Even though we don't have explicit ranges in ES|QL, these tests seemed worth keeping, in case optimization (current or future) rewrite other comparisons into Ranges.
x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/OptimizerRules.java
Show resolved
Hide resolved
There was a problem hiding this comment.
It's looking good Mark.
I think there are two more tests in OptimizerRulesTests that use this rule and can be moved, not necessarily because we have this kind of support (1<a<2) but for completeness sake. Besides, I won't be surprised if in the near future we add support for that sort of between binary operator.
The methods are testEliminateRangeByEqualsInInterval and testEliminateRangeByNullEqualsInInterval.
|
@astefan ah, cool. I'll migrate those tests over, then merge this. Thanks for the review, and also thank you @alex-spies ! |
Relates to #105217
This copies the PropagateEquals logical optimization into ESQL, following the pattern established in #106499. I've copied the optimization rule into the ESQL version of
OptimizerRules, and the tests intoOpitmizerRulesTests, and changed the imports &c to point to the appropriate ESQL classes instead of their QL counterparts.I expect to have several more PRs following this pattern, for the remaining logical optimizations that touch the binary comparison logic. I'm intending to make separate PRs for each, in the interest of making them easier to review.