Repository: spark Updated Branches: refs/heads/master 8361078ef -> b328ac6c8
Revert "[SPARK-5244] [SQL] add coalesce() in sql parser" This reverts commit 812d3679f5f97df7b667cbc3365a49866ebc02d5. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/b328ac6c Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/b328ac6c Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/b328ac6c Branch: refs/heads/master Commit: b328ac6c8c489ef9abf850c45db5ad531da18d55 Parents: 8361078 Author: Josh Rosen <[email protected]> Authored: Wed Jan 21 14:27:43 2015 -0800 Committer: Josh Rosen <[email protected]> Committed: Wed Jan 21 14:27:43 2015 -0800 ---------------------------------------------------------------------- .../scala/org/apache/spark/sql/catalyst/SqlParser.scala | 2 -- .../src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala | 9 --------- 2 files changed, 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/b328ac6c/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala ---------------------------------------------------------------------- diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala index 4ca4e05..eaadbe9 100755 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala @@ -50,7 +50,6 @@ class SqlParser extends AbstractSparkSQLParser { protected val CACHE = Keyword("CACHE") protected val CASE = Keyword("CASE") protected val CAST = Keyword("CAST") - protected val COALESCE = Keyword("COALESCE") protected val COUNT = Keyword("COUNT") protected val DECIMAL = Keyword("DECIMAL") protected val DESC = Keyword("DESC") @@ -296,7 +295,6 @@ class SqlParser extends AbstractSparkSQLParser { { case s ~ p => Substring(s, p, Literal(Integer.MAX_VALUE)) } | (SUBSTR | SUBSTRING) ~ "(" ~> expression ~ ("," ~> expression) ~ ("," ~> expression) <~ ")" ^^ { case s ~ p ~ l => Substring(s, p, l) } - | COALESCE ~ "(" ~> repsep(expression, ",") <~ ")" ^^ { case exprs => Coalesce(exprs) } | SQRT ~ "(" ~> expression <~ ")" ^^ { case exp => Sqrt(exp) } | ABS ~ "(" ~> expression <~ ")" ^^ { case exp => Abs(exp) } | ident ~ ("(" ~> repsep(expression, ",")) <~ ")" ^^ http://git-wip-us.apache.org/repos/asf/spark/blob/b328ac6c/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala index 64648ba..03b44ca 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala @@ -86,15 +86,6 @@ class SQLQuerySuite extends QueryTest with BeforeAndAfterAll { setConf(SQLConf.CODEGEN_ENABLED, originalValue.toString) } - test("Add Parser of SQL COALESCE()") { - checkAnswer( - sql("""SELECT COALESCE(1, 2)"""), - 1) - checkAnswer( - sql("SELECT COALESCE(null, null, null)"), - null) - } - test("SPARK-3176 Added Parser of SQL LAST()") { checkAnswer( sql("SELECT LAST(n) FROM lowerCaseData"), --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
