ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[SPARK-18147][SQL] do not fail for very complex aggregator result type

Browse source 
## What changes were proposed in this pull request?

~In `TypedAggregateExpression.evaluateExpression`, we may create `ReferenceToExpressions` with `CreateStruct`, and `CreateStruct` may generate too many codes and split them into several methods.  `ReferenceToExpressions` will replace `BoundReference` in `CreateStruct` with `LambdaVariable`, which can only be used as local variables and doesn't work if we split the generated code.~

It's already fixed by #15693 , this pr adds regression test

## How was this patch tested?

new test in `DatasetAggregatorSuite`

Author: Wenchen Fan <wenchen@databricks.com>

Closes #15807 from cloud-fan/typed-agg.
This commit is contained in:
Wenchen Fan 2016-11-10 13:03:59 +08:00
parent 3f62e1b5d9
commit 6021c95a3a
1 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
sql/core/src/test/scala/org/apache/spark/sql/DatasetAggregatorSuite.scala
View file

@ -134,6 +134,19 @@ object NullResultAgg extends Aggregator[AggData, AggData, AggData] {
override def outputEncoder: Encoder[AggData] = Encoders.product[AggData]
}
case class ComplexAggData(d1: AggData, d2: AggData)
object VeryComplexResultAgg extends Aggregator[Row, String, ComplexAggData] {
override def zero: String = ""
override def reduce(buffer: String, input: Row): String = buffer + input.getString(1)
override def merge(b1: String, b2: String): String = b1 + b2
override def finish(reduction: String): ComplexAggData = {
ComplexAggData(AggData(reduction.length, reduction), AggData(reduction.length, reduction))
}
override def bufferEncoder: Encoder[String] = Encoders.STRING
override def outputEncoder: Encoder[ComplexAggData] = Encoders.product[ComplexAggData]
}
class DatasetAggregatorSuite extends QueryTest with SharedSQLContext {
import testImplicits._
@ -312,4 +325,12 @@ class DatasetAggregatorSuite extends QueryTest with SharedSQLContext {
val ds3 = sql("SELECT 'Some String' AS b, 1279869254 AS a").as[AggData]
assert(ds3.select(NameAgg.toColumn).schema.head.nullable === true)
}
test("SPARK-18147: very complex aggregator result type") {
val df = Seq(1 -> "a", 2 -> "b", 2 -> "c").toDF("i", "j")
checkAnswer(
df.groupBy($"i").agg(VeryComplexResultAgg.toColumn),
Row(1, Row(Row(1, "a"), Row(1, "a"))) :: Row(2, Row(Row(2, "bc"), Row(2, "bc"))) :: Nil)
}
}