SPARK-45959

ahshahid · Nov 24, 2023 · 10a76ba · 10a76ba
1 parent 7716ee9
commit 10a76ba
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/internal/EasilyFlattenable.scala b/sql/core/src/main/scala/org/apache/spark/sql/internal/EasilyFlattenable.scala
@@ -44,12 +44,12 @@ private[sql] object EasilyFlattenable {
           }).map(_.toAttribute)).intersect(AttributeSet(child.output))
           if (tinkeredOrNewNamedExprs.exists(ne => ne.references.exists {
             case attr: AttributeReference => attribsReassignedInProj.contains(attr)
-          //  case u: UnresolvedAttribute => attribsReassignedInProj.exists(_.name == u.name)
+            case u: UnresolvedAttribute => attribsReassignedInProj.exists(_.name == u.name)
           } || ne.collectFirst{
             case u: UnresolvedFunction => u
-            case u: UnresolvedAttribute => u
             case ex if !ex.deterministic => ex
             case ex if ex.isInstanceOf[UserDefinedExpression] => ex
+            case u: UnresolvedAttribute => u
           }.nonEmpty)) {
             None
           } else {
@@ -62,13 +62,13 @@ private[sql] object EasilyFlattenable {
                   case al: Alias => al.child
                   case _ => x
                 }).getOrElse(attr)
-                /*
+
                 case u: UnresolvedAttribute => projList.find(
                   _.toAttribute.name == u.name).map(x => x match {
                   case al: Alias => al.child
                   case _ => x
                 }).getOrElse(u)
-               */
+
               }).asInstanceOf[NamedExpression]
             })
             Option(p.copy(projectList = remappedNewProjList))