Skip to content

[SPARK-1915] [SQL] AverageFunction should not count if the evaluated value is null. #862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[SPARK-1915] [SQL] AverageFunction should not count if the evaluated value is null. #862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/aggregates.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,14 +281,17 @@ case class AverageFunction(expr: Expression, base: AggregateExpression)
private val sum = MutableLiteral(zero.eval(EmptyRow))
private val sumAsDouble = Cast(sum, DoubleType)

private val addFunction = Add(sum, Coalesce(Seq(expr, zero)))
private def addFunction(value: Any) = Add(sum, Literal(value))

override def eval(input: Row): Any =
sumAsDouble.eval(EmptyRow).asInstanceOf[Double] / count.toDouble

override def update(input: Row): Unit = {
count += 1
sum.update(addFunction, input)
val evaluatedExpr = expr.eval(input)
if (evaluatedExpr != null) {
count += 1
sum.update(addFunction(evaluatedExpr), input)
}
}
}

Expand Down
10 changes: 10 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/DslQuerySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,16 @@ class DslQuerySuite extends QueryTest {
2.0)
}

test("null average") {
checkAnswer(
testData3.groupBy()(Average('b)),
2.0)

checkAnswer(
testData3.groupBy()(Average('b), CountDistinct('b :: Nil)),
(2.0, 1) :: Nil)
}

test("count") {
checkAnswer(
testData2.groupBy()(Count(1)),
Expand Down