maropu commented on a change in pull request #29585:
URL: https://github.com/apache/spark/pull/29585#discussion_r493977794
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveUnion.scala
##########
@@ -18,17 +18,34 @@
package org.apache.spark.sql.catalyst.analysis
import org.apache.spark.sql.AnalysisException
-import org.apache.spark.sql.catalyst.expressions.{Alias, Literal}
+import org.apache.spark.sql.catalyst.expressions.{Alias, Attribute,
AttributeReference, Literal, NamedExpression}
import org.apache.spark.sql.catalyst.optimizer.CombineUnions
import org.apache.spark.sql.catalyst.plans.logical.{LogicalPlan, Project,
Union}
import org.apache.spark.sql.catalyst.rules.Rule
import org.apache.spark.sql.internal.SQLConf
+import org.apache.spark.sql.types.StructType
import org.apache.spark.sql.util.SchemaUtils
/**
* Resolves different children of Union to a common set of columns.
*/
object ResolveUnion extends Rule[LogicalPlan] {
+
+ private[catalyst] def makeUnionOutput(children: Seq[LogicalPlan]):
Seq[Attribute] = {
+ children.map(_.output).transpose.map { attrs =>
+ val firstAttr = attrs.head
+ val nullable = attrs.exists(_.nullable)
+ val newDt = attrs.map(_.dataType).reduce(StructType.merge)
+ val newExprId = NamedExpression.newExprId
+ if (firstAttr.dataType == newDt) {
+ firstAttr.withExprId(newExprId).withNullability(nullable)
Review comment:
NOTE: I updated this code for assigning new `ExprId`s in this case
because the `UpdateAttributeNullability` rule wrongly updates nullability in
`unionOutput` of `Union` if we reuse input `ExprId`s here.
----------------------------------------------------------------
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]
