Aravind-Suresh commented on code in PR #10897:
URL: https://github.com/apache/pinot/pull/10897#discussion_r1228964194
##########
pinot-common/src/main/java/org/apache/pinot/common/utils/RegexpPatternConverterUtils.java:
##########
@@ -64,24 +71,42 @@ public static String likeToRegexpLike(String likePattern) {
break;
}
- String escaped = escapeMetaCharacters(likePattern.substring(start, end));
- StringBuilder sb = new StringBuilder(escaped.length() + 2);
+ likePattern = likePattern.substring(start, end);
+ StringBuilder sb = new StringBuilder();
sb.append(prefix);
- sb.append(escaped);
- sb.append(suffix);
+ // handling SQL wildcards by replacing them with corresponding regex
equivalents
+ // we ignore them if the SQL wildcards are escaped
int i = 0;
- while (i < sb.length()) {
- char c = sb.charAt(i);
+ boolean isPrevCharBackSlash = false;
+ while (i < likePattern.length()) {
+ char c = likePattern.charAt(i);
if (c == '_') {
- sb.replace(i, i + 1, ".");
+ sb.append(isPrevCharBackSlash ? c : ".");
} else if (c == '%') {
- sb.replace(i, i + 1, ".*");
- i++;
+ sb.append(isPrevCharBackSlash ? c : ".*");
+ } else if (REGEXP_METACHARACTERS.contains(String.valueOf(c))) {
+ sb.append('\\').append(c);
+ } else {
+ if (isPrevCharBackSlash) {
+ // this means the previous character is a \
+ // but it was not used for escaping SQL wildcards
+ // so let's escape this \ in the output
+ // this case is separately handled outside of the meta characters
list
+ sb.append('\\');
Review Comment:
We can't merge this in line 89 as this requires look-ahead at the next
character - we could do that as well, but instead of look-ahead, we look-back
here. So if c = '\\', we don't know if it should be escaped or not. We should
escape it if the next character is not a SQL wildcard. So, this cannot be
merged with line 89 where we escape every meta character (this is why '\\' was
removed from the meta characters list).
Let me know if I'm missing something here.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
