diff options
| author | Reynold Xin <rxin@databricks.com> | 2015-06-10 18:58:01 +0800 |
|---|---|---|
| committer | Cheng Lian <lian@databricks.com> | 2015-06-10 18:58:01 +0800 |
| commit | e90035e676e492de840f44b61b330db526313019 (patch) | |
| tree | 27cbda1933e0481988c2f0fb8b6c0af5cf1ed8c7 /sql | |
| parent | 57c60c5be7aa731ca1a6966f4285eb02f481eb71 (diff) | |
| download | spark-e90035e676e492de840f44b61b330db526313019.tar.gz spark-e90035e676e492de840f44b61b330db526313019.tar.bz2 spark-e90035e676e492de840f44b61b330db526313019.zip | |
[SPARK-7886] Added unit test for HAVING aggregate pushdown.
This is a followup to #6712.
Author: Reynold Xin <rxin@databricks.com>
Closes #6739 from rxin/6712-followup and squashes the following commits:
fd9acfb [Reynold Xin] [SPARK-7886] Added unit test for HAVING aggregate pushdown.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala | 7 | ||||
| -rw-r--r-- | sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala | 1 |
2 files changed, 7 insertions, 1 deletions
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 5babc4332c..3ca5ff347d 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 @@ -38,6 +38,13 @@ class SQLQuerySuite extends QueryTest with BeforeAndAfterAll with SQLTestUtils { import sqlContext.implicits._ import sqlContext.sql + test("having clause") { + Seq(("one", 1), ("two", 2), ("three", 3), ("one", 5)).toDF("k", "v").registerTempTable("hav") + checkAnswer( + sql("SELECT k, sum(v) FROM hav GROUP BY k HAVING sum(v) > 2"), + Row("one", 6) :: Row("three", 3) :: Nil) + } + test("SPARK-6743: no columns from cache") { Seq( (83, 0, 38), diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala index 041483ebfb..ca4b80b51b 100644 --- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala +++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala @@ -1307,7 +1307,6 @@ https://cwiki.apache.org/confluence/display/Hive/Enhanced+Aggregation%2C+Cube%2C HiveParser.DecimalLiteral) /* Case insensitive matches */ - val COALESCE = "(?i)COALESCE".r val COUNT = "(?i)COUNT".r val SUM = "(?i)SUM".r val AND = "(?i)AND".r |