Skip to content

[SPARK-34833][SQL][FOLLOWUP] Handle outer references in all the places #31959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[SPARK-34833][SQL][FOLLOWUP] Handle outer references in all the places #31959

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fc9d34
Handle outer references in all the places
cloud-fan Mar 25, 2021
10d74a0
fix a corner case
cloud-fan Mar 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 41 additions & 26 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4008,34 +4008,32 @@ object UpdateOuterReferences extends Rule[LogicalPlan] {
*/
object ApplyCharTypePadding extends Rule[LogicalPlan] {

object AttrOrOuterRef {
def unapply(e: Expression): Option[Attribute] = e match {
case a: Attribute => Some(a)
case OuterReference(a: Attribute) => Some(a)
case _ => None
}
}

override def apply(plan: LogicalPlan): LogicalPlan = {
plan.resolveOperatorsUp {
case operator => operator.transformExpressionsUp {
case e if !e.childrenResolved => e

// String literal is treated as char type when it's compared to a char type column.
// We should pad the shorter one to the longer length.
case b @ BinaryComparison(attr: Attribute, lit) if lit.foldable =>
padAttrLitCmp(attr, attr.metadata, lit).map { newChildren =>
b.withNewChildren(newChildren)
}.getOrElse(b)

case b @ BinaryComparison(lit, attr: Attribute) if lit.foldable =>
padAttrLitCmp(attr, attr.metadata, lit).map { newChildren =>
b.withNewChildren(newChildren.reverse)
}.getOrElse(b)

case b @ BinaryComparison(or @ OuterReference(attr: Attribute), lit) if lit.foldable =>
padAttrLitCmp(or, attr.metadata, lit).map { newChildren =>
case b @ BinaryComparison(e @ AttrOrOuterRef(attr), lit) if lit.foldable =>
padAttrLitCmp(e, attr.metadata, lit).map { newChildren =>
b.withNewChildren(newChildren)
}.getOrElse(b)

case b @ BinaryComparison(lit, or @ OuterReference(attr: Attribute)) if lit.foldable =>
padAttrLitCmp(or, attr.metadata, lit).map { newChildren =>
case b @ BinaryComparison(lit, e @ AttrOrOuterRef(attr)) if lit.foldable =>
padAttrLitCmp(e, attr.metadata, lit).map { newChildren =>
b.withNewChildren(newChildren.reverse)
}.getOrElse(b)

case i @ In(attr: Attribute, list)
case i @ In(e @ AttrOrOuterRef(attr), list)
if attr.dataType == StringType && list.forall(_.foldable) =>
CharVarcharUtils.getRawType(attr.metadata).flatMap {
case CharType(length) =>
Expand All @@ -4044,27 +4042,44 @@ object ApplyCharTypePadding extends Rule[LogicalPlan] {
val literalCharLengths = literalChars.map(_.numChars())
val targetLen = (length +: literalCharLengths).max
Some(i.copy(
value = addPadding(attr, length, targetLen),
value = addPadding(e, length, targetLen),
list = list.zip(literalCharLengths).map {
case (lit, charLength) => addPadding(lit, charLength, targetLen)
} ++ nulls.map(Literal.create(_, StringType))))
case _ => None
}.getOrElse(i)

// For char type column or inner field comparison, pad the shorter one to the longer length.
case b @ BinaryComparison(left: Attribute, right: Attribute) =>
b.withNewChildren(CharVarcharUtils.addPaddingInStringComparison(Seq(left, right)))

case b @ BinaryComparison(OuterReference(left: Attribute), right: Attribute) =>
b.withNewChildren(padOuterRefAttrCmp(left, right))

case b @ BinaryComparison(left: Attribute, OuterReference(right: Attribute)) =>
b.withNewChildren(padOuterRefAttrCmp(right, left).reverse)
case b @ BinaryComparison(e1 @ AttrOrOuterRef(left), e2 @ AttrOrOuterRef(right))
// For the same attribute, they must be the same length and no padding is needed.
if !left.semanticEquals(right) =>
val outerRefs = (e1, e2) match {
case (_: OuterReference, _: OuterReference) => Seq(left, right)
case (_: OuterReference, _) => Seq(left)
case (_, _: OuterReference) => Seq(right)
case _ => Nil
}
val newChildren = CharVarcharUtils.addPaddingInStringComparison(Seq(left, right))
if (outerRefs.nonEmpty) {
b.withNewChildren(newChildren.map(_.transform {
case a: Attribute if outerRefs.exists(_.semanticEquals(a)) => OuterReference(a)
}))
} else {
b.withNewChildren(newChildren)
}

case i @ In(attr: Attribute, list) if list.forall(_.isInstanceOf[Attribute]) =>
case i @ In(e @ AttrOrOuterRef(attr), list) if list.forall(_.isInstanceOf[Attribute]) =>
val newChildren = CharVarcharUtils.addPaddingInStringComparison(
attr +: list.map(_.asInstanceOf[Attribute]))
i.copy(value = newChildren.head, list = newChildren.tail)
if (e.isInstanceOf[OuterReference]) {
i.copy(
value = newChildren.head.transform {
case a: Attribute if a.semanticEquals(attr) => OuterReference(a)
},
list = newChildren.tail)
} else {
i.copy(value = newChildren.head, list = newChildren.tail)
}
}
}
}
Expand Down