You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2014/12/30 21:07:26 UTC
spark git commit: [SPARK-5002][SQL] Using ascending by default when
not specify order in order by
Repository: spark
Updated Branches:
refs/heads/master 63b84b7d6 -> daac22130
[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 <wa...@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
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/daac2213
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/daac2213
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/daac2213
Branch: refs/heads/master
Commit: daac221302e0cf71a7b7bda31625134cf7b9dce1
Parents: 63b84b7
Author: wangfei <wa...@huawei.com>
Authored: Tue Dec 30 12:07:24 2014 -0800
Committer: Michael Armbrust <mi...@databricks.com>
Committed: Tue Dec 30 12:07:24 2014 -0800
----------------------------------------------------------------------
.../main/scala/org/apache/spark/sql/catalyst/SqlParser.scala | 8 ++------
.../src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala | 7 +++++++
2 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/daac2213/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 d4fc9bb..66860a4 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
http://git-wip-us.apache.org/repos/asf/spark/blob/daac2213/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 ddf4776..add4e21 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
@@ -987,6 +987,13 @@ class SQLQuerySuite extends QueryTest with BeforeAndAfterAll {
)
}
+ test("oder by asc by default when not specify ascending and descending") {
+ checkAnswer(
+ sql("SELECT a, b FROM testData2 ORDER BY a desc, b"),
+ Seq((3, 1), (3, 2), (2, 1), (2,2), (1, 1), (1, 2))
+ )
+ }
+
test("Supporting relational operator '<=>' in Spark SQL") {
val nullCheckData1 = TestData(1,"1") :: TestData(2,null) :: Nil
val rdd1 = sparkContext.parallelize((0 to 1).map(i => nullCheckData1(i)))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org