aboutsummaryrefslogtreecommitdiff
path: root/sql/catalyst
diff options
context:
space:
mode:
authorwangfei <wangfei1@huawei.com>2014-12-30 12:07:24 -0800
committerMichael Armbrust <michael@databricks.com>2014-12-30 12:07:24 -0800
commitdaac221302e0cf71a7b7bda31625134cf7b9dce1 (patch)
tree30563d9eb77a077a53f30f40fb87779f510b7362 /sql/catalyst
parent63b84b7d6785a687dd7f4c0e2bb1e348800d30d8 (diff)
downloadspark-daac221302e0cf71a7b7bda31625134cf7b9dce1.tar.gz
spark-daac221302e0cf71a7b7bda31625134cf7b9dce1.tar.bz2
spark-daac221302e0cf71a7b7bda31625134cf7b9dce1.zip
[SPARK-5002][SQL] Using ascending by default when not specify order in order by
spark sql does not support ```SELECT a, b FROM testData2 ORDER BY a desc, b```. Author: wangfei <wangfei1@huawei.com> Closes #3838 from scwf/orderby and squashes the following commits: 114b64a [wangfei] remove nouse methods 48145d3 [wangfei] fix order, using asc by default
Diffstat (limited to 'sql/catalyst')
-rwxr-xr-xsql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala8
1 files changed, 2 insertions, 6 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 d4fc9bbfd3..66860a4c09 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
@@ -209,15 +209,11 @@ class SqlParser extends AbstractSparkSQLParser {
)
protected lazy val ordering: Parser[Seq[SortOrder]] =
- ( rep1sep(singleOrder, ",")
- | rep1sep(expression, ",") ~ direction.? ^^ {
- case exps ~ d => exps.map(SortOrder(_, d.getOrElse(Ascending)))
+ ( rep1sep(expression ~ direction.? , ",") ^^ {
+ case exps => exps.map(pair => SortOrder(pair._1, pair._2.getOrElse(Ascending)))
}
)
- protected lazy val singleOrder: Parser[SortOrder] =
- expression ~ direction ^^ { case e ~ o => SortOrder(e, o) }
-
protected lazy val direction: Parser[SortDirection] =
( ASC ^^^ Ascending
| DESC ^^^ Descending