Repository: spark Updated Branches: refs/heads/master 0acb32a3f -> 14c7236dc
[SPARK-14004][SQL][MINOR] AttributeReference and Alias should only use the first qualifier to generate SQL strings ## What changes were proposed in this pull request? Current implementations of `AttributeReference.sql` and `Alias.sql` joins all available qualifiers, which is logically wrong. But this implementation mistake doesn't cause any real SQL generation bugs though, since there is always at most one qualifier for any given `AttributeReference` or `Alias`. This PR fixes this issue by only picking the first qualifiers. ## How was this patch tested? (Please explain how this patch was tested. E.g. unit tests, integration tests, manual tests) Existing tests should be enough. Author: Cheng Lian <l...@databricks.com> Closes #11820 from liancheng/spark-14004-single-qualifier. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/14c7236d Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/14c7236d Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/14c7236d Branch: refs/heads/master Commit: 14c7236dc63fe362f052175886e9ad700419bc63 Parents: 0acb32a Author: Cheng Lian <l...@databricks.com> Authored: Sat Mar 19 00:22:17 2016 +0800 Committer: Cheng Lian <l...@databricks.com> Committed: Sat Mar 19 00:22:17 2016 +0800 ---------------------------------------------------------------------- .../spark/sql/catalyst/expressions/namedExpressions.scala | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/14c7236d/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/namedExpressions.scala ---------------------------------------------------------------------- diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/namedExpressions.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/namedExpressions.scala index 271ef33..8c63cce 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/namedExpressions.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/namedExpressions.scala @@ -183,8 +183,7 @@ case class Alias(child: Expression, name: String)( } override def sql: String = { - val qualifiersString = - if (qualifiers.isEmpty) "" else qualifiers.map(quoteIdentifier).mkString("", ".", ".") + val qualifiersString = if (qualifiers.isEmpty) "" else qualifiers.head + "." s"${child.sql} AS $qualifiersString${quoteIdentifier(name)}" } } @@ -299,8 +298,7 @@ case class AttributeReference( override def simpleString: String = s"$name#${exprId.id}: ${dataType.simpleString}" override def sql: String = { - val qualifiersString = - if (qualifiers.isEmpty) "" else qualifiers.map(quoteIdentifier).mkString("", ".", ".") + val qualifiersString = if (qualifiers.isEmpty) "" else qualifiers.head + "." s"$qualifiersString${quoteIdentifier(name)}" } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
