Hisoka-X commented on code in PR #41554:
URL: https://github.com/apache/spark/pull/41554#discussion_r1288781752
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/DeduplicateRelations.scala:
##########
@@ -220,7 +220,51 @@ object DeduplicateRelations extends Rule[LogicalPlan] {
if (attrMap.isEmpty) {
planWithNewChildren
} else {
- planWithNewChildren.rewriteAttrs(attrMap)
+ def rewriteAttrsMatchWithSubPlan(
+ attrs: Seq[Attribute],
+ attrMap: AttributeMap[Attribute],
+ planOutput: Seq[Attribute]): Seq[Attribute] = {
+ val canRewriteAttrs = attrMap.filter(a =>
planOutput.contains(a._2))
+ attrs.map(attr => canRewriteAttrs.getOrElse(attr, attr))
+ }
+
+ def rewriteOrderMatchWithSubPlan(
+ attrs: Seq[SortOrder],
+ attrMap: AttributeMap[Attribute],
+ planOutput: Seq[Attribute]): Seq[SortOrder] = {
+ val canRewriteAttrs = attrMap.filter(a =>
planOutput.contains(a._2))
+ attrs.filter(_.child.isInstanceOf[Attribute]).map(attr => {
+ if
(canRewriteAttrs.contains(attr.child.asInstanceOf[Attribute])) {
+ attr.copy(child =
canRewriteAttrs(attr.child.asInstanceOf[Attribute]))
+ } else {
+ attr
+ }
+ })
+ }
+
+ planWithNewChildren match {
+ case c: CoGroup =>
+ // SPARK-43781: CoGroup is a special case, as it has different
output attributes
+ // from its children. We need to update the output attributes
of CoGroup manually.
+ val newLeftAttr = c.leftAttr.map(attr =>
attrMap.getOrElse(attr, attr))
Review Comment:
oh, if you mean the leftAttr should same to rightAttr and left/right group.
I would say yes. Maybe we should add `rewriteAttrsMatchWithSubPlan` to
newLeftAttr. After code refactoring, invoke `rewriteAttrsMatchWithSubPlan` not
a big deal. So I add it back.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
