Skip to content

[SPARK-6145][SQL] fix ORDER BY on nested fields #4904

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
cloud-fan wants to merge 5 commits into from
Closed

[SPARK-6145][SQL] fix ORDER BY on nested fields #4904

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8d6b324
fix 6145 completely
cloud-fan Mar 6, 2015
e383154
handle special cases
cloud-fan Mar 6, 2015
187d97e
feedback for marmbrus
cloud-fan Mar 7, 2015
eab0b43
fix hive tests caused by a mistake
cloud-fan Mar 8, 2015
7b56fb9
minor enhance
cloud-fan Mar 16, 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
Prev Previous commit
Next Next commit
feedback for marmbrus
  • Loading branch information
@cloud-fan
cloud-fan committed Mar 7, 2015
commit 187d97e0b35c351188f60781419e744a8fc5c060
13 changes: 12 additions & 1 deletion 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 @@ -256,11 +256,22 @@ class Analyzer(catalog: Catalog,

case q: LogicalPlan =>
logTrace(s"Attempting to resolve ${q.simpleString}")
q transformExpressionsUp {
q transformExpressionsUp {
case u @ UnresolvedAttribute(name) if resolver(name, VirtualColumn.groupingIdName) &&
q.isInstanceOf[GroupingAnalytics] =>
// Resolve the virtual column GROUPING__ID for the operator GroupingAnalytics
q.asInstanceOf[GroupingAnalytics].gid
case u @ UnresolvedAttribute(name) if q.isInstanceOf[Sort] =>
val s = q.asInstanceOf[Sort]
val input = s.child match {
case Project(list, c) => list.filter {
case Alias(g: GetField, _) => false
case Alias(g: GetItem, _) => false
case _ => true
}.map(_.toAttribute)
case _ => s.child.flatMap(_.output)
}
s.resolve(name, input, resolver).getOrElse(u)
case u @ UnresolvedAttribute(name) =>
// Leave unchanged if resolution fails. Hopefully will be resolved next round.
val result = q.resolveChildren(name, resolver).getOrElse(u)
Expand Down
2 changes: 1 addition & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/LogicalPlan.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ abstract class LogicalPlan extends QueryPlan[LogicalPlan] with Logging {
}

/** Performs attribute resolution given a name and a sequence of possible attributes. */
protected def resolve(
def resolve(
name: String,
input: Seq[Attribute],
resolver: Resolver): Option[NamedExpression] = {
Expand Down
13 changes: 0 additions & 13 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicOperators.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

package org.apache.spark.sql.catalyst.plans.logical

import org.apache.spark.sql.catalyst.analysis.Resolver
import org.apache.spark.sql.catalyst.expressions._
import org.apache.spark.sql.catalyst.plans._
import org.apache.spark.sql.types._
Expand Down Expand Up @@ -153,18 +152,6 @@ case class Sort(
global: Boolean,
child: LogicalPlan) extends UnaryNode {
override def output = child.output

override def resolveChildren(name: String, resolver: Resolver) = {
val input = child match {
case Project(list, c) => list.filter {
case Alias(g: GetField, _) => false
case Alias(g: GetItem, _) => false
case _ => true
}.map(_.toAttribute)
case _ => child.flatMap(_.output)
}
resolve(name, input, resolver)
}
}

case class Aggregate(
Expand Down