Improved performance of comma and AND/OR removal regular expressions. #317
Conversation
This file contains 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
|
Changing the SqlContextImpl implementation to a method reference has reduced coverage, but has no impact on the code. |
shout-star
approved these changes
Nov 5, 2023
shout-star
deleted the
feature/Improved_performance_of_comma_and_and_removal_regexp
branch
ota-meshi
reviewed
Nov 6, 2023
| @@ -75,13 +75,12 @@ public boolean contains(final Object o) { | |||
| } | |||
|
|
|||
| /** where句の直後にくるANDやORを除外するための正規表現 */ | |||
| protected static final Pattern WHERE_CLAUSE_PATTERN = Pattern | |||
| .compile("(?i)(?<clause>(^|\\s+)(WHERE\\s+(--.*|/\\*[^(/\\*|\\*/)]+?\\*/\\s*)*\\s*))(AND\\s+|OR\\s+)"); | |||
| protected static final Pattern WHERE_CLAUSE_PATTERN = Pattern.compile( | |||
There was a problem hiding this comment.
[^(/\\*|\\*/)]
I think this is probably not what was intended. A character class accepts only one character. Also, grouping using parentheses is not possible.
This means it is equivalent to [^()|*/\\].
There was a problem hiding this comment.
Since the next + quantifier is non-greedy (?), we can probably replace it with [\\s\\S] (match all), but I haven't tried it so I don't know 😅
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.
Revised regular expressions to remove commas and AND/OR to avoid unnecessary backtracking.