Github user gatorsmile commented on a diff in the pull request:
https://github.com/apache/spark/pull/18023#discussion_r126606893
--- Diff:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala
---
@@ -1260,26 +1260,51 @@ class AstBuilder(conf: SQLConf) extends
SqlBaseBaseVisitor[AnyRef] with Logging
CaseWhen(branches, Option(ctx.elseExpression).map(expression))
}
+ private def canApplyRegex(ctx: ParserRuleContext): Boolean =
withOrigin(ctx) {
+ var parent = ctx.getParent
+ while (parent != null) {
+ if (parent.isInstanceOf[NamedExpressionContext]) return true
+ parent = parent.getParent
+ }
+ return false
+ }
+
/**
- * Create a dereference expression. The return type depends on the type
of the parent, this can
- * either be a [[UnresolvedAttribute]] (if the parent is an
[[UnresolvedAttribute]]), or an
- * [[UnresolvedExtractValue]] if the parent is some expression.
+ * Create a dereference expression. The return type depends on the type
of the parent.
+ * If the parent is an [[UnresolvedAttribute]], it can be a
[[UnresolvedAttribute]] or
+ * a [[UnresolvedRegex]] for regex quoted in ``; if the parent is some
other expression,
+ * it can be [[UnresolvedExtractValue]].
*/
override def visitDereference(ctx: DereferenceContext): Expression =
withOrigin(ctx) {
val attr = ctx.fieldName.getText
expression(ctx.base) match {
- case UnresolvedAttribute(nameParts) =>
- UnresolvedAttribute(nameParts :+ attr)
+ case unresolved_attr @ UnresolvedAttribute(nameParts) =>
+ ctx.fieldName.getStart.getText match {
+ case escapedIdentifier(columnNameRegex)
+ if SQLConf.get.supportQuotedRegexColumnName &&
canApplyRegex(ctx) =>
+ UnresolvedRegex(columnNameRegex, Some(unresolved_attr.name),
+ SQLConf.get.caseSensitiveAnalysis)
+ case _ =>
+ UnresolvedAttribute(nameParts :+ attr)
+ }
case e =>
UnresolvedExtractValue(e, Literal(attr))
}
}
/**
- * Create an [[UnresolvedAttribute]] expression.
+ * Create an [[UnresolvedAttribute]] expression or a [[UnresolvedRegex]]
if it is a regex
+ * quoted in ``
*/
override def visitColumnReference(ctx: ColumnReferenceContext):
Expression = withOrigin(ctx) {
- UnresolvedAttribute.quoted(ctx.getText)
+ ctx.getStart.getText match {
+ case escapedIdentifier(columnNameRegex)
+ if SQLConf.get.supportQuotedRegexColumnName && canApplyRegex(ctx)
=>
+ UnresolvedRegex(columnNameRegex, None,
SQLConf.get.caseSensitiveAnalysis)
--- End diff --
The same here
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
