Skip to content

[SPARK-10044][SQL]Fix bug AnalysisException in resolving reference for sorting with agg… #8234

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

[SPARK-10044][SQL]Fix bug AnalysisException in resolving reference for sorting with agg… #8234

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
e9fc16c
fix bug AnalysisException in resolving reference for sorting with agg…
chenghao-intel Aug 17, 2015
8688ed0
give unique name for internal alias
chenghao-intel Aug 17, 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: 5 additions & 4 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,12 +465,13 @@ class Analyzer(

// Find aggregate expressions and evaluate them early, since they can't be evaluated in a
// Sort.
val (withAggsRemoved, aliasedAggregateList) = newOrdering.map {
case aggOrdering if aggOrdering.collect { case a: AggregateExpression => a }.nonEmpty =>
val aliased = Alias(aggOrdering.child, "_aggOrdering")()
val (withAggsRemoved, aliasedAggregateList) = newOrdering.zipWithIndex.map {
case (aggOrdering, idx)
if aggOrdering.collect { case a: AggregateExpression => a }.nonEmpty =>
Copy link
Contributor Author

@chenghao-intel chenghao-intel Aug 17, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This causes exception with ambiguous references for _aggOrdering

val aliased = Alias(aggOrdering.child, s"${aggOrdering.toString}_$idx")()
(aggOrdering.copy(child = aliased.toAttribute), Some(aliased))

case other => (other, None)
case (other, _) => (other, None)
}.unzip

val missing = missingAttr ++ aliasedAggregateList.flatten
Expand Down
18 changes: 18 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 @@ -23,6 +23,7 @@ import org.apache.spark.AccumulatorSuite
import org.apache.spark.sql.catalyst.analysis.FunctionRegistry
import org.apache.spark.sql.catalyst.DefaultParserDialect
import org.apache.spark.sql.catalyst.errors.DialectException
import org.apache.spark.sql.catalyst.expressions.Literal
import org.apache.spark.sql.execution.aggregate
import org.apache.spark.sql.functions._
import org.apache.spark.sql.test.SharedSQLContext
Expand Down Expand Up @@ -1625,4 +1626,21 @@ class SQLQuerySuite extends QueryTest with SharedSQLContext {
checkAnswer(sql("select count(num) from 1one"), Row(10))
}
}

test("SPARK-10044: resolving reference for sorting with aggregation") {
withTempTable("mytable") {
sqlContext.sparkContext.parallelize(1 to 10).map(i => (i, i.toString))
.toDF("key", "value")
.registerTempTable("mytable")
checkAnswer(sql(
"""select max(value) as _aggOrdering_0 from mytable group by key % 2
|order by max(concat(value,",", key)), min(substr(value, 0, 4))
|""".stripMargin), Row("8") :: Row("9") :: Nil)

checkAnswer(
sqlContext.table("mytable").groupBy($"key" % 2).agg(max($"value"))
.orderBy(max(concat($"value", lit(","), $"key")), min(substring($"value", 0, 4))),
Row(0, "8") :: Row(1, "9") :: Nil)
}
}
}