Skip to content

InMemoryRelation.withOutput fix #2

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

Merged
merged 1 commit into from
Oct 1, 2025
Merged

InMemoryRelation.withOutput fix #2

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
13 changes: 3 additions & 10 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/SortOrder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,16 +130,9 @@ object SortOrder {
}

val effectiveRequiredOrdering = requiredOrdering.filterNot { requiredOrder =>
constantProvidedOrdering.exists {
case s @ SortOrder(alias: Alias, Constant, _, _) =>
val providedOrder = s.copy(child = alias.toAttribute)
providedOrder.satisfies(requiredOrder)
case providedOrder =>
providedOrder.satisfies(requiredOrder)
}
// constantProvidedOrdering.exists { providedOrder =>
// providedOrder.satisfies(requiredOrder)
// }
constantProvidedOrdering.exists { providedOrder =>
providedOrder.satisfies(requiredOrder)
}
}

if (effectiveRequiredOrdering.length > nonConstantProvidedOrdering.length) {
Expand Down
14 changes: 3 additions & 11 deletions ...alyst/src/main/scala/org/apache/spark/sql/catalyst/plans/AliasAwareOutputExpression.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,16 +128,8 @@ trait AliasAwareQueryOutputOrdering[T <: QueryPlan[T]]
}
}
}
newOrdering.takeWhile(_.isDefined).flatten.toSeq ++ outputExpressions.filter {
case Alias(child, _) => child.foldable
case expr => expr.foldable
}.map(SortOrder(_, Constant))
// newOrdering.takeWhile(_.isDefined).flatten.toSeq ++ outputExpressions.flatMap {
// case alias @ Alias(child, _) if child.foldable =>
// Some(SortOrder(alias.toAttribute, Constant))
// case expr if expr.foldable =>
// Some(SortOrder(expr, Constant))
// case _ => None
// }
newOrdering.takeWhile(_.isDefined).flatten.toSeq ++ outputExpressions.collect {
case a @ Alias(child, _) if child.foldable => SortOrder(a.toAttribute, Constant)
}
}
}
9 changes: 7 additions & 2 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/columnar/InMemoryRelation.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,8 +469,13 @@ case class InMemoryRelation(
}
}

def withOutput(newOutput: Seq[Attribute]): InMemoryRelation =
InMemoryRelation(newOutput, cacheBuilder, outputOrdering, statsOfPlanToCache)
def withOutput(newOutput: Seq[Attribute]): InMemoryRelation = {
val map = AttributeMap(output.zip(newOutput))
val newOutputOrdering = outputOrdering
.map(_.transform { case a: Attribute => map(a) })
.asInstanceOf[Seq[SortOrder]]
InMemoryRelation(newOutput, cacheBuilder, newOutputOrdering, statsOfPlanToCache)
}

override def newInstance(): this.type = {
InMemoryRelation(
Expand Down
11 changes: 2 additions & 9 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/V1Writes.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,16 +208,9 @@ object V1WritesUtils {
}

val effectiveRequiredOrdering = requiredOrdering.filterNot { requiredOrder =>
constantOutputOrdering.exists {
case s @ SortOrder(alias: Alias, Constant, _, _) =>
val outputOrder = s.copy(child = alias.toAttribute)
outputOrder.satisfies(outputOrder.copy(child = requiredOrder))
case outputOrder =>
outputOrder.satisfies(outputOrder.copy(child = requiredOrder))
constantOutputOrdering.exists { outputOrder =>
outputOrder.satisfies(outputOrder.copy(child = requiredOrder))
}
// constantOutputOrdering.exists { outputOrder =>
// outputOrder.satisfies(outputOrder.copy(child = requiredOrder))
// }
}

if (effectiveRequiredOrdering.length > nonConstantOutputOrdering.length) {
Expand Down