EnricoMi commented on code in PR #37407:
URL: https://github.com/apache/spark/pull/37407#discussion_r981169668
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala:
##########
@@ -869,26 +869,50 @@ class Analyzer(override val catalogManager:
CatalogManager)
def apply(plan: LogicalPlan): LogicalPlan =
plan.resolveOperatorsWithPruning(
_.containsPattern(UNPIVOT), ruleId) {
- // once children and ids are resolved, we can determine values, if non
were given
- case up: Unpivot if up.childrenResolved && up.ids.forall(_.resolved) &&
up.values.isEmpty =>
- up.copy(values = up.child.output.diff(up.ids))
-
- case up: Unpivot if !up.childrenResolved || !up.ids.forall(_.resolved) ||
- up.values.isEmpty || !up.values.forall(_.resolved) ||
!up.valuesTypeCoercioned => up
+ // once children are resolved, we can determine values from ids and vice
versa
+ // if only either is given
+ case up: Unpivot if up.childrenResolved &&
+ up.ids.exists(_.forall(_.resolved)) && up.values.isEmpty =>
+ val values = (AttributeSet(up.child.output) --
AttributeSet(up.ids.get)).toSeq
+ // up.child.output.intersect preserves order of columns
+ up.copy(values = Some(up.child.output.intersect(values).map(Seq(_))))
+ case up: Unpivot if up.childrenResolved &&
+ up.values.exists(_.forall(_.forall(_.resolved))) && up.ids.isEmpty =>
+ val ids = (AttributeSet(up.child.output) --
AttributeSet(up.values.get.flatten)).toSeq
+ // up.child.output.intersect preserves order of columns
+ up.copy(ids = Some(up.child.output.intersect(ids)))
+
+ case up: Unpivot if !up.childrenResolved ||
!up.ids.exists(_.forall(_.resolved)) ||
+ !up.values.exists(_.nonEmpty) ||
!up.values.exists(_.forall(_.forall(_.resolved))) ||
+ !up.values.get.forall(_.length == up.valueColumnNames.length) ||
+ !up.valuesTypeCoercioned => up
// TypeCoercionBase.UnpivotCoercion determines valueType
// and casts values once values are set and resolved
- case Unpivot(ids, values, variableColumnName, valueColumnName, child) =>
+ case Unpivot(Some(ids), Some(values), aliases, variableColumnName,
valueColumnNames, child) =>
+
+ def toString(values: Seq[NamedExpression]): String =
+ "(" + values.map(v => quoteIdentifier(v.name)).mkString(",") + ")"
Review Comment:
Done in 890d21f8.
--
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]
