beliefer commented on a change in pull request #31272:
URL: https://github.com/apache/spark/pull/31272#discussion_r562392837
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/StringUtils.scala
##########
@@ -60,10 +60,16 @@ object StringUtils extends Logging {
case c if c == escapeChar => fail("it is not allowed to end with the
escape character")
case '_' => out ++= "."
case '%' => out ++= ".*"
+ case '*' if filterPattern => out ++= ".*"
+ case '.' if filterPattern => out ++= "."
Review comment:
The title of this PR seems to support for SQL wildcard characters (% and
_) , why we added '*' and '.' ?
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/StringUtils.scala
##########
@@ -81,16 +87,16 @@ object StringUtils extends Logging {
/**
* 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, only '*' and '|' are allowed as
wildcards, others will
- * follow regular expression convention, case insensitive
match and white spaces
- * on both ends will be ignored
+ * @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 filterPattern(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
+ val regex = ("(?i)" + escapeLikeRegex(subPattern, '\\', true)).r
Review comment:
`escapeLikeRegex(subPattern.replaceAll("\\*", "%", '\\', true)` ?
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/StringUtils.scala
##########
@@ -81,16 +87,16 @@ object StringUtils extends Logging {
/**
* 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, only '*' and '|' are allowed as
wildcards, others will
- * follow regular expression convention, case insensitive
match and white spaces
- * on both ends will be ignored
+ * @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 filterPattern(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
+ val regex = ("(?i)" + escapeLikeRegex(subPattern, '\\', true)).r
Review comment:
`escapeLikeRegex(subPattern.replaceAll("\\*", "%", '\\', true)` ? so we
not need to change the behavior of `escapeLikeRegex`.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
