aboutsummaryrefslogtreecommitdiff
path: root/sql/hive/src/test/scala
diff options
context:
space:
mode:
authorCheng Lian <lian@databricks.com>2016-07-25 09:42:39 -0700
committerReynold Xin <rxin@databricks.com>2016-07-25 09:42:39 -0700
commit7ea6d282b925819ddb3874a67b3c9da8cc41f131 (patch)
tree5f343ac3f05a2659593d73ccd9b28575447a6d16 /sql/hive/src/test/scala
parent79826f3c7936ee27457d030c7115d5cac69befd7 (diff)
downloadspark-7ea6d282b925819ddb3874a67b3c9da8cc41f131.tar.gz
spark-7ea6d282b925819ddb3874a67b3c9da8cc41f131.tar.bz2
spark-7ea6d282b925819ddb3874a67b3c9da8cc41f131.zip
[SPARK-16703][SQL] Remove extra whitespace in SQL generation for window functions
## What changes were proposed in this pull request? This PR fixes a minor formatting issue of `WindowSpecDefinition.sql` when no partitioning expressions are present. Before: ```sql ( ORDER BY `a` ASC ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) ``` After: ```sql (ORDER BY `a` ASC ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) ``` ## How was this patch tested? New test case added in `ExpressionSQLBuilderSuite`. Author: Cheng Lian <lian@databricks.com> Closes #14334 from liancheng/window-spec-sql-format.
Diffstat (limited to 'sql/hive/src/test/scala')
-rw-r--r--sql/hive/src/test/scala/org/apache/spark/sql/catalyst/ExpressionSQLBuilderSuite.scala35
1 files changed, 33 insertions, 2 deletions
diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/catalyst/ExpressionSQLBuilderSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/catalyst/ExpressionSQLBuilderSuite.scala
index c8bf20d13b..fef726c5d8 100644
--- a/sql/hive/src/test/scala/org/apache/spark/sql/catalyst/ExpressionSQLBuilderSuite.scala
+++ b/sql/hive/src/test/scala/org/apache/spark/sql/catalyst/ExpressionSQLBuilderSuite.scala
@@ -20,8 +20,7 @@ package org.apache.spark.sql.catalyst
import java.sql.Timestamp
import org.apache.spark.sql.catalyst.dsl.expressions._
-import org.apache.spark.sql.catalyst.expressions.{If, Literal}
-
+import org.apache.spark.sql.catalyst.expressions.{If, Literal, SpecifiedWindowFrame, WindowSpecDefinition}
class ExpressionSQLBuilderSuite extends SQLBuilderTest {
test("literal") {
@@ -79,4 +78,36 @@ class ExpressionSQLBuilderSuite extends SQLBuilderTest {
checkSQL(-'a.int, "(-`a`)")
checkSQL(-('a.int + 'b.int), "(-(`a` + `b`))")
}
+
+ test("window specification") {
+ val frame = SpecifiedWindowFrame.defaultWindowFrame(
+ hasOrderSpecification = true,
+ acceptWindowFrame = true
+ )
+
+ checkSQL(
+ WindowSpecDefinition('a.int :: Nil, Nil, frame),
+ s"(PARTITION BY `a` $frame)"
+ )
+
+ checkSQL(
+ WindowSpecDefinition('a.int :: 'b.string :: Nil, Nil, frame),
+ s"(PARTITION BY `a`, `b` $frame)"
+ )
+
+ checkSQL(
+ WindowSpecDefinition(Nil, 'a.int.asc :: Nil, frame),
+ s"(ORDER BY `a` ASC $frame)"
+ )
+
+ checkSQL(
+ WindowSpecDefinition(Nil, 'a.int.asc :: 'b.string.desc :: Nil, frame),
+ s"(ORDER BY `a` ASC, `b` DESC $frame)"
+ )
+
+ checkSQL(
+ WindowSpecDefinition('a.int :: 'b.string :: Nil, 'c.int.asc :: 'd.string.desc :: Nil, frame),
+ s"(PARTITION BY `a`, `b` ORDER BY `c` ASC, `d` DESC $frame)"
+ )
+ }
}