Skip to content

[SPARK-2049] [sql] Avg function may cause overflow #978

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 2 commits into from
Closed

[SPARK-2049] [sql] Avg function may cause overflow #978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1153f75
do best to avoid overflowing in function avg().
egraldlo Jun 5, 2014
d414cd7
fommatting issues
egraldlo Jun 5, 2014
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
8 changes: 4 additions & 4 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 @@ -214,10 +214,10 @@ case class Average(child: Expression) extends PartialAggregate with trees.UnaryN
override def toString = s"AVG($child)"

override def asPartial: SplitEvaluation = {
val partialSum = Alias(Sum(child), "PartialSum")()
val partialCount = Alias(Count(child), "PartialCount")()
val castedSum = Cast(Sum(partialSum.toAttribute), dataType)
val castedCount = Cast(Sum(partialCount.toAttribute), dataType)
val partialSum = Alias(Sum(Cast(child, dataType)), "PartialSum")()
val partialCount = Alias(Cast(Count(child), dataType), "PartialCount")()
val castedSum = Sum(partialSum.toAttribute)
val castedCount = Sum(partialCount.toAttribute)

SplitEvaluation(
Divide(castedSum, castedCount),
Expand Down
6 changes: 6 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,12 @@ class SQLQuerySuite extends QueryTest {
2.0)
}

test("average overflow test") {
checkAnswer(
sql("SELECT AVG(a),b FROM testData1 group by b"),
Seq((2147483645.0,1),(2.0,2)))
}

test("count") {
checkAnswer(
sql("SELECT COUNT(*) FROM testData2"),
Expand Down
11 changes: 11 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/TestData.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,17 @@ object TestData {
(1 to 100).map(i => TestData(i, i.toString)))
testData.registerAsTable("testData")

case class TestData1(a: Int, b: Int)
val testData1: SchemaRDD =
TestSQLContext.sparkContext.parallelize(
TestData1(2147483644, 1) ::
TestData1(1, 2) ::
TestData1(2147483645, 1) ::
TestData1(2, 2) ::
TestData1(2147483646, 1) ::
TestData1(3, 2) :: Nil)
testData1.registerAsTable("testData1")

case class TestData2(a: Int, b: Int)
val testData2: SchemaRDD =
TestSQLContext.sparkContext.parallelize(
Expand Down