Enhance regex performance with duplicate wildcards #98176
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
elasticsearchmachine added v8.10.0 needs:triage 
slobodanadamovic added :Core/Infra/Core elasticsearchmachine removed the needs:triage 
| Pinging @elastic/es-core-infra (Team:Core/Infra) |
| Hi @slobodanadamovic, I've created a changelog YAML for you. |
ldematte approved these changes Aug 3, 2023
| assertFalse(Regex.simpleMatch("fff******ddd", "fffabcdd")); | ||
| } | ||
| | ||
| public void testArbitraryWildcardMatch() { |
There was a problem hiding this comment.
Nit: to cover all branches, consider adding a use case that explicitly use multiple wildcards at the end of the pattern (maybe to the test before this one), and a use case where you have multiple wildcards in multiple locations (like dd**dd**dd).
There was a problem hiding this comment.
Thanks for the suggestion. I've initially randomized the test which should cover dd****, ****dd and dd****dd cases but not dd**dd**dd. I've changed the test to be more explicit in testing all cases in a single run instead of depending on randomization.
…lasticsearch into sa-simple-regex-match
slobodanadamovic added the auto-merge-without-approval 
| @elasticmachine update branch |
| Failure seems unrelated and probably temporary: @elasticmachine run elasticsearch-ci/part-1 |
💚 Backport successful
|
slobodanadamovic added a commit to slobodanadamovic/elasticsearch that referenced this pull request Aug 4, 2023
This change avoids unnecessary substring allocations and recursion calls when more than two consecutive wildcards (`*`) are detected. Instead skipping and calling a method recursively, we now try to skip all consecutive `*` chars at once.
elasticsearchmachine pushed a commit that referenced this pull request Aug 4, 2023
This change avoids unnecessary substring allocations and recursion calls when more than two consecutive wildcards (`*`) are detected. Instead skipping and calling a method recursively, we now try to skip all consecutive `*` chars at once.
💚 All backports created successfully
Questions ?Please refer to the Backport tool documentation |
slobodanadamovic added a commit to slobodanadamovic/elasticsearch that referenced this pull request Aug 8, 2023
This change avoids unnecessary substring allocations and recursion calls when more than two consecutive wildcards (`*`) are detected. Instead skipping and calling a method recursively, we now try to skip all consecutive `*` chars at once. (cherry picked from commit 868df2a)
slobodanadamovic added a commit that referenced this pull request Aug 8, 2023
…98277) This change avoids unnecessary substring allocations and recursion calls when more than two consecutive wildcards (`*`) are detected. Instead skipping and calling a method recursively, we now try to skip all consecutive `*` chars at once.
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 participants
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.
This change avoids unnecessary substring allocations and recursion calls when more than two consecutive wildcards (
*) are detected. Instead skipping and calling a method recursively, we now try to skip all consecutive*chars at once.