peter-toth commented on a change in pull request #29053:
URL: https://github.com/apache/spark/pull/29053#discussion_r452842236
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/PropagateEmptyRelation.scala
##########
@@ -50,8 +50,25 @@ object PropagateEmptyRelation extends Rule[LogicalPlan] with
PredicateHelper wit
override def conf: SQLConf = SQLConf.get
def apply(plan: LogicalPlan): LogicalPlan = plan transformUp {
- case p: Union if p.children.forall(isEmptyLocalRelation) =>
- empty(p)
+ case p @ Union(children) if children.exists(isEmptyLocalRelation) =>
+ val newChildren = children.filterNot(isEmptyLocalRelation)
+ if (newChildren.isEmpty) {
+ empty(p)
+ } else {
+ val newFirstChild = if (newChildren.head eq children.head) {
Review comment:
I've changed it to my version in the latest commit. @maropu please let
me know if yours with `sameOutput` would be better.
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/PropagateEmptyRelation.scala
##########
@@ -50,8 +50,25 @@ object PropagateEmptyRelation extends Rule[LogicalPlan] with
PredicateHelper wit
override def conf: SQLConf = SQLConf.get
def apply(plan: LogicalPlan): LogicalPlan = plan transformUp {
- case p: Union if p.children.forall(isEmptyLocalRelation) =>
- empty(p)
+ case p @ Union(children) if children.exists(isEmptyLocalRelation) =>
+ val newChildren = children.filterNot(isEmptyLocalRelation)
+ if (newChildren.isEmpty) {
+ empty(p)
+ } else {
Review comment:
Ok, added.
##########
File path:
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/PropagateEmptyRelationSuite.scala
##########
@@ -67,6 +68,28 @@ class PropagateEmptyRelationSuite extends PlanTest {
comparePlans(optimized, correctAnswer)
}
+ test("remove empty relation children from Union") {
Review comment:
Fixed, thanks.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
