Skip to content

[SPARK-9592] [SQL] Fix Last function implemented based on AggregateExpression1. #8172

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
yhuai wants to merge 2 commits into from
Closed

[SPARK-9592] [SQL] Fix Last function implemented based on AggregateExpression1. #8172

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
af87086
Fix last.
yhuai Aug 13, 2015
b28c42a
Regression test.
yhuai Aug 13, 2015
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: 7 additions & 2 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 @@ -650,6 +650,7 @@ case class FirstFunction(expr: Expression, base: AggregateExpression1) extends A
var result: Any = null

override def update(input: InternalRow): Unit = {
// We ignore null values.
if (result == null) {
result = expr.eval(input)
}
Expand Down Expand Up @@ -679,10 +680,14 @@ case class LastFunction(expr: Expression, base: AggregateExpression1) extends Ag
var result: Any = null

override def update(input: InternalRow): Unit = {
result = input
val value = expr.eval(input)
// We ignore null values.
if (value != null) {
result = value
}
}

override def eval(input: InternalRow): Any = {
if (result != null) expr.eval(result.asInstanceOf[InternalRow]) else null
result
}
}
15 changes: 15 additions & 0 deletions sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/AggregationQuerySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,21 @@ abstract class AggregationQuerySuite extends QueryTest with SQLTestUtils with Be
Row(0, null, 1, 1, null, 0) :: Nil)
}

test("test Last implemented based on AggregateExpression1") {
// TODO: Remove this test once we remove AggregateExpression1.
import org.apache.spark.sql.functions._
val df = Seq((1, 1), (2, 2), (3, 3)).toDF("i", "j").repartition(1)
withSQLConf(
SQLConf.SHUFFLE_PARTITIONS.key -> "1",
SQLConf.USE_SQL_AGGREGATE2.key -> "false") {

checkAnswer(
df.groupBy("i").agg(last("j")),
df
)
}
}

test("error handling") {
withSQLConf("spark.sql.useAggregate2" -> "false") {
val errorMessage = intercept[AnalysisException] {
Expand Down