[SPARK-45880][SQL] Make the like pattern semantics used in all commands consistent
#43751
There are no files selected for viewing
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -108,26 +108,84 @@ object StringUtils extends Logging { | |
| // scalastyle:on caselocale | ||
|
|
||
| /** | ||
| * get Wildcard that represent matching "all" | ||
| */ | ||
| def getMatchAllWildcard: String = { | ||
| if (SQLConf.get.legacyUseStarAndVerticalBarAsWildcardsInLikePattern) { | ||
| "*" | ||
| } else { | ||
| "%" | ||
| } | ||
| } | ||
|
|
||
| def filterPattern(names: Seq[String], pattern: String): Seq[String] = { | ||
| if (SQLConf.get.legacyUseStarAndVerticalBarAsWildcardsInLikePattern) { | ||
| legacyFilterPattern(names, pattern) | ||
| } else { | ||
| filterBySQLLikePattern(names, pattern) | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * This legacy utility can be used for filtering pattern in the "Like" of | ||
| * "Show Tables / Functions" DDL. | ||
| * @param names the names list to be filtered | ||
| * @param pattern the filter pattern, only '*' and '|' are allowed as wildcards, others will | ||
| * follow regular expression convention, case insensitive match and white spaces | ||
| * on both ends will be ignored | ||
| * @return the filtered names list in order | ||
| */ | ||
| def legacyFilterPattern(names: Seq[String], pattern: String): Seq[String] = { | ||
| val funcNames = scala.collection.mutable.SortedSet.empty[String] | ||
| pattern.trim().split("\\|").foreach { subPattern => | ||
| try { | ||
| val regex = ("(?i)" + subPattern.replaceAll("\\*", ".*")).r | ||
| funcNames ++= names.filter { name => regex.pattern.matcher(name).matches() } | ||
| } catch { | ||
| case _: PatternSyntaxException => | ||
| } | ||
| } | ||
| funcNames.toSeq | ||
| } | ||
|
|
||
| /** | ||
| * This utility can be used for filtering pattern in the "Like" of "Show Tables / Functions" DDL. | ||
| * @param names the names list to be filtered | ||
| * @param pattern the filter pattern, same as SQL type `like` expressions: | ||
| * '%' for any character(s), and '_' for a single character | ||
| * @return the filtered names list | ||
| */ | ||
| def filterBySQLLikePattern(names: Seq[String], pattern: String): Seq[String] = { | ||
| try { | ||
| val p = Pattern.compile(likePatternToRegExp(pattern), Pattern.CASE_INSENSITIVE) | ||
| names.filter { name => p.matcher(name).matches() } | ||
| } catch { | ||
| case _: PatternSyntaxException => Seq.empty[String] | ||
| } | ||
| } | ||
|
|
||
| private[util] def likePatternToRegExp(pattern: String): String = { | ||
|
Contributor
Author
There was a problem hiding this comment. Follow the implementation logic of hive: |
||
| val regExp = new StringBuilder() | ||
|
|
||
| var index = 0 | ||
| while (index < pattern.length) { | ||
| val cur = pattern.charAt(index) | ||
| cur match { | ||
| // Make a special case for "\\_" and "\\%" | ||
| case '\\' if (index + 1 < pattern.length() | ||
| && (pattern.charAt(index + 1) == '_' || pattern.charAt(index + 1) == '%')) => | ||
| regExp += pattern.charAt(index + 1) | ||
| index = index + 1 | ||
| case '_' => regExp ++= "." | ||
| case '%' => regExp ++= ".*?" | ||
| case _ => regExp ++= Pattern.quote(Character.toString(cur)) | ||
| } | ||
| index = index + 1 | ||
| } | ||
|
|
||
| regExp.result() | ||
| } | ||
|
|
||
| /** | ||
| * A string concatenator for plan strings. Uses length from a configured value, and | ||
| * prints a warning the first time a plan is truncated. | ||
|
|
||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Before:
After:
