diff options
| author | Liang-Chi Hsieh <viirya@gmail.com> | 2015-04-16 17:50:20 -0700 |
|---|---|---|
| committer | Michael Armbrust <michael@databricks.com> | 2015-04-16 17:50:20 -0700 |
| commit | 1e43851d6455f65b850ea0327d0e92f65395d23f (patch) | |
| tree | 02aa667acc861cf357bae14bddd9851a8718ef27 /sql/catalyst/src | |
| parent | d96608674f6c2ff3abb13c65d80c1a3872206710 (diff) | |
| download | spark-1e43851d6455f65b850ea0327d0e92f65395d23f.tar.gz spark-1e43851d6455f65b850ea0327d0e92f65395d23f.tar.bz2 spark-1e43851d6455f65b850ea0327d0e92f65395d23f.zip | |
[SPARK-6899][SQL] Fix type mismatch when using codegen with Average on DecimalType
JIRA https://issues.apache.org/jira/browse/SPARK-6899
Author: Liang-Chi Hsieh <viirya@gmail.com>
Closes #5517 from viirya/fix_codegen_average and squashes the following commits:
8ae5f65 [Liang-Chi Hsieh] Add the case of DecimalType.Unlimited to Average.
Diffstat (limited to 'sql/catalyst/src')
| -rw-r--r-- | sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/aggregates.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/aggregates.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/aggregates.scala index 14a855054b..f3830c6d3b 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/aggregates.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/aggregates.scala @@ -326,7 +326,7 @@ case class Average(child: Expression) extends PartialAggregate with trees.UnaryN override def asPartial: SplitEvaluation = { child.dataType match { - case DecimalType.Fixed(_, _) => + case DecimalType.Fixed(_, _) | DecimalType.Unlimited => // Turn the child to unlimited decimals for calculation, before going back to fixed val partialSum = Alias(Sum(Cast(child, DecimalType.Unlimited)), "PartialSum")() val partialCount = Alias(Count(child), "PartialCount")() |