SPARK-15206: rebase to pick up hotfix for the PSpark test error

xwu0226 · xwu0226 · commit 9c184ba18aa6 · 2016-05-20T08:05:03.000-07:00
diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/AggregationQuerySuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/AggregationQuerySuite.scala
@@ -959,7 +959,7 @@ abstract class AggregationQuerySuite extends QueryTest with SQLTestUtils with Te
     }
   }
 
-  test("SPARK-15206: single distinct aggregate in having clause") {
+  test("SPARK-15206: single distinct aggregate function in having clause") {
     checkAnswer(
       sql(
         """
@@ -975,7 +975,7 @@ abstract class AggregationQuerySuite extends QueryTest with SQLTestUtils with Te
     )
   }
 
-  test("SPARK-15206: multiple distinct aggregates in having clause") {
+  test("SPARK-15206: multiple distinct aggregate function in having clause") {
     checkAnswer(
       sql(
         """

Original file line number	Diff line number	Diff line change
`@@ -959,7 +959,7 @@ abstract class AggregationQuerySuite extends QueryTest with SQLTestUtils with Te`
`959`	`959`	`}`
`960`	`960`	`}`
`961`	`961`
`962`		`- test("SPARK-15206: single distinct aggregate in having clause") {`
	`962`	`+ test("SPARK-15206: single distinct aggregate function in having clause") {`
`963`	`963`	`checkAnswer(`
`964`	`964`	`sql(`
`965`	`965`	`"""`
`@@ -975,7 +975,7 @@ abstract class AggregationQuerySuite extends QueryTest with SQLTestUtils with Te`
`975`	`975`	`)`
`976`	`976`	`}`
`977`	`977`
`978`		`- test("SPARK-15206: multiple distinct aggregates in having clause") {`
	`978`	`+ test("SPARK-15206: multiple distinct aggregate function in having clause") {`
`979`	`979`	`checkAnswer(`
`980`	`980`	`sql(`
`981`	`981`	`"""`