dongjoon-hyun commented on a change in pull request #24911: [SPARK-28109][SQL]
Fix TRIM(type trimStr FROM str) returns incorrect value
URL: https://github.com/apache/spark/pull/24911#discussion_r295493357
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala
##########
@@ -1403,29 +1403,28 @@ class AstBuilder(conf: SQLConf) extends
SqlBaseBaseVisitor[AnyRef] with Logging
}
/**
- * Create a (windowed)/trim Function expression.
+ * Create a Trim expression.
+ */
+ override def visitTrim(ctx: TrimContext): Expression = withOrigin(ctx) {
+ val srcStr = expression(ctx.srcStr)
+ val trimStr = Option(ctx.trimStr).map(expression)
+ ctx.trimOption.getType match {
+ case SqlBaseParser.BOTH =>
+ StringTrim(srcStr, trimStr)
+ case SqlBaseParser.LEADING =>
+ StringTrimLeft(srcStr, trimStr)
+ case SqlBaseParser.TRAILING =>
+ StringTrimRight(srcStr, trimStr)
+ case other =>
+ throw new ParseException("Function trim doesn't support with " +
+ s"type $other. Please use BOTH, LEADING or TRAILING as trim type",
ctx)
+ }
+ }
+
+ /**
+ * Create a (windowed) Function expression.
*/
override def visitFunctionCall(ctx: FunctionCallContext): Expression =
withOrigin(ctx) {
- def replaceFunctions(
- funcID: FunctionIdentifier,
- ctx: FunctionCallContext): FunctionIdentifier = {
- val opt = ctx.trimOption
- if (opt != null) {
- if (ctx.qualifiedName.getText.toLowerCase(Locale.ROOT) != "trim") {
- throw new ParseException(s"The specified function
${ctx.qualifiedName.getText} " +
- s"doesn't support with option ${opt.getText}.", ctx)
- }
- opt.getType match {
- case SqlBaseParser.BOTH => funcID
- case SqlBaseParser.LEADING => funcID.copy(funcName = "ltrim")
- case SqlBaseParser.TRAILING => funcID.copy(funcName = "rtrim")
- case _ => throw new ParseException("Function trim doesn't support
with " +
- s"type ${opt.getType}. Please use BOTH, LEADING or TRAILING as
trim type", ctx)
- }
- } else {
- funcID
- }
- }
Review comment:
The old one was a hacky way.
----------------------------------------------------------------
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]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
