ESQL: Push down StartsWith and EndsWith functions to Lucene #123381
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ivancea
added
>enhancement
Team:Analytics
|
Hi @ivancea, I've created a changelog YAML for you. |
|
Pinging @elastic/es-analytical-engine (Team:Analytics) |
astefan
reviewed
Feb 27, 2025
There was a problem hiding this comment.
This is a good start in terms of testing this, but the tests are the bare minimum.
Let's make this functionality more robust by having stronger tests, please. For CSV (notice also the _index metadata which is a feature of pushable attributes):
from employees | where starts_with(first_name, "A") | keep first_name, last_name | where ends_with(last_name, "g")from employees* metadata _index | where starts_with(first_name::keyword, "A") | keep first_name, last_name, _index | where ends_with(last_name::keyword, "g") and starts_with(_index, "e")from e* metadata _index | where starts_with(first_name::keyword, "A") | keep first_name, last_name, languages.long, _index | where ends_with(last_name::keyword, "g") and starts_with(_index, "e")from e* metadata _index | where starts_with(first_name::keyword, "A") | keep first_name, last_name, languages.long, _index | where ends_with(last_name::keyword, "g") and ends_with(_index, "e")from employees metadata _index | where starts_with(first_name, "A") | keep first_name, last_name, languages.long, _index | where ends_with(_index, "s") and (ends_with(last_name, "e") or ends_with(last_name, "m")from employees metadata _index | where starts_with(first_name, "A") | keep first_name, last_name, languages.long, _index | where ends_with(_index, "s") and not (ends_with(last_name, "e") or ends_with(last_name, "m")
For unit testing, please look at PhysicalPlanOptimizerTests.testPushAndInequalitiesFilter and make sure that the EsQueryExec that gets created includes the actual wildcard query in its proper form. Please, also use a query with two statements so we can see the bool query getting created as well.
ivancea
changed the title
|
@astefan Just added some extra CSV tests with some combinations, with and without _index and wildcards. |
idegtiarenko
approved these changes
Mar 11, 2025
astefan
reviewed
Mar 11, 2025
| @@ -1132,6 +1132,45 @@ public void testPushMultipleBinaryLogicFilters() { | |||
| assertThat(rq.to(), nullValue()); | |||
| } | |||
|
|
|||
| public void testPushMultipleFunctions() { | |||
There was a problem hiding this comment.
Please, add as a javadoc the expected physicalplan tree. I know some methods in this class do not have this, but I (or we) try to have this consistent throughout the class. Thanks.
astefan
approved these changes
Mar 11, 2025
This was referenced Mar 11, 2025
ivancea
added a commit
to ivancea/elasticsearch
that referenced
this pull request
Mar 11, 2025
…123381) Fixes elastic#123067 Just like WildcardLike and RLike, some functions can be converted to Lucene queries. Here it's those two, which are nearly identical to WildcardLike This, like some other functions, needs a FoldContext. I'm using the static method for this here, but it's fixed in elastic#123398, which I kept separated as it changes many files
ivancea
added a commit
to ivancea/elasticsearch
that referenced
this pull request
Mar 11, 2025
…123381) Fixes elastic#123067 Just like WildcardLike and RLike, some functions can be converted to Lucene queries. Here it's those two, which are nearly identical to WildcardLike This, like some other functions, needs a FoldContext. I'm using the static method for this here, but it's fixed in elastic#123398, which I kept separated as it changes many files
elasticsearchmachine
pushed a commit
that referenced
this pull request
Mar 11, 2025
…#124583) Fixes #123067 Just like WildcardLike and RLike, some functions can be converted to Lucene queries. Here it's those two, which are nearly identical to WildcardLike This, like some other functions, needs a FoldContext. I'm using the static method for this here, but it's fixed in #123398, which I kept separated as it changes many files
elasticsearchmachine
pushed a commit
that referenced
this pull request
Mar 11, 2025
…#124582) Fixes #123067 Just like WildcardLike and RLike, some functions can be converted to Lucene queries. Here it's those two, which are nearly identical to WildcardLike This, like some other functions, needs a FoldContext. I'm using the static method for this here, but it's fixed in #123398, which I kept separated as it changes many files
albertzaharovits
pushed a commit
to albertzaharovits/elasticsearch
that referenced
this pull request
Mar 13, 2025
…123381) Fixes elastic#123067 Just like WildcardLike and RLike, some functions can be converted to Lucene queries. Here it's those two, which are nearly identical to WildcardLike This, like some other functions, needs a FoldContext. I'm using the static method for this here, but it's fixed in elastic#123398, which I kept separated as it changes many files
jfreden
pushed a commit
to jfreden/elasticsearch
that referenced
this pull request
Mar 13, 2025
…123381) Fixes elastic#123067 Just like WildcardLike and RLike, some functions can be converted to Lucene queries. Here it's those two, which are nearly identical to WildcardLike This, like some other functions, needs a FoldContext. I'm using the static method for this here, but it's fixed in elastic#123398, which I kept separated as it changes many files
ivancea
added a commit
to ivancea/elasticsearch
that referenced
this pull request
Mar 14, 2025
…123381) Fixes elastic#123067 Just like WildcardLike and RLike, some functions can be converted to Lucene queries. Here it's those two, which are nearly identical to WildcardLike This, like some other functions, needs a FoldContext. I'm using the static method for this here, but it's fixed in elastic#123398, which I kept separated as it changes many files
|
Also backporting to 8.18 in #124871 |
ivancea
added a commit
that referenced
this pull request
Mar 17, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #123067
Just like WildcardLike and RLike, some functions can be converted to Lucene queries. Here it's those two, which are nearly identical to WildcardLike
This, like some other functions, needs a FoldContext. I'm using the static one for this here, but it's fixed in #123398, which I kept separated as it changes many files