diff options
| author | Jacky Li <jacky.likun@gmail.com> | 2014-11-07 11:52:08 -0800 |
|---|---|---|
| committer | Michael Armbrust <michael@databricks.com> | 2014-11-07 11:52:28 -0800 |
| commit | 51ef8ab8eca15addc476f47e04ecc578e6e9682c (patch) | |
| tree | 6ab683eecaa7211678dca8ed9d07036710d535d0 /sql/catalyst | |
| parent | f1f1ae418031957256e7dac896e29d64c81bf1a4 (diff) | |
| download | spark-51ef8ab8eca15addc476f47e04ecc578e6e9682c.tar.gz spark-51ef8ab8eca15addc476f47e04ecc578e6e9682c.tar.bz2 spark-51ef8ab8eca15addc476f47e04ecc578e6e9682c.zip | |
[SQL] Modify keyword val location according to ordering
'DOUBLE' should be moved before 'ELSE' according to the ordering convension
Author: Jacky Li <jacky.likun@gmail.com>
Closes #3080 from jackylk/patch-5 and squashes the following commits:
3c11df7 [Jacky Li] [SQL] Modify keyword val location according to ordering
(cherry picked from commit 68609c51ad1ab2def302df3c4a1c0bc1ec6e1075)
Signed-off-by: Michael Armbrust <michael@databricks.com>
Diffstat (limited to 'sql/catalyst')
| -rwxr-xr-x | sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala | 2 |
1 files changed, 1 insertions, 1 deletions
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 5e613e0f18..affef276c2 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 @@ -55,10 +55,10 @@ class SqlParser extends AbstractSparkSQLParser { protected val DECIMAL = Keyword("DECIMAL") protected val DESC = Keyword("DESC") protected val DISTINCT = Keyword("DISTINCT") + protected val DOUBLE = Keyword("DOUBLE") protected val ELSE = Keyword("ELSE") protected val END = Keyword("END") protected val EXCEPT = Keyword("EXCEPT") - protected val DOUBLE = Keyword("DOUBLE") protected val FALSE = Keyword("FALSE") protected val FIRST = Keyword("FIRST") protected val FROM = Keyword("FROM") |