Skip to content

[SPARK-18063][SQL] Failed to infer constraints over multiple aliases #15597

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
jiangxb1987 wants to merge 4 commits into from
Closed

[SPARK-18063][SQL] Failed to infer constraints over multiple aliases #15597

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0700d84
fix replace alias on constraints rule.
jiangxb1987 Oct 21, 2016
2fe728f
modify test cases.
jiangxb1987 Oct 22, 2016
32e0b36
bugfix
jiangxb1987 Oct 24, 2016
3f07493
improve generate of constraints set.
jiangxb1987 Oct 25, 2016
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
16 changes: 10 additions & 6 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/LogicalPlan.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,15 +293,19 @@ abstract class UnaryNode extends LogicalPlan {
* expressions with the corresponding alias
*/
protected def getAliasedConstraints(projectList: Seq[NamedExpression]): Set[Expression] = {
projectList.flatMap {
var aliasedConstraints = child.constraints.toSet
Copy link
Member

@sameeragarwal sameeragarwal Oct 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove toSet (ExpressionSet should support all these operations)

Copy link
Contributor Author

@jiangxb1987 jiangxb1987 Oct 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I transformed child.constraints to Set[Expression] as we need to apply ++= operator on it.

projectList.foreach {
case a @ Alias(e, _) =>
child.constraints.map(_ transform {
// For every alias in `projectList`, replace the reference in constraints by its attribute.
aliasedConstraints ++= aliasedConstraints.map(_ transform {
case expr: Expression if expr.semanticEquals(e) =>
a.toAttribute
}).union(Set(EqualNullSafe(e, a.toAttribute)))
case _ =>
Set.empty[Expression]
}.toSet
})
aliasedConstraints += EqualNullSafe(e, a.toAttribute)
case _ => // Don't change.
}

aliasedConstraints
Copy link
Member

@sameeragarwal sameeragarwal Oct 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should really return aliasedConstraints -- child.constraints. Perhaps rename aliasedConstraints to allConstraints and then return allConstraints -- child.constraints?

}

override protected def validConstraints: Set[Expression] = child.constraints
Expand Down
8 changes: 8 additions & 0 deletions ...alyst/src/test/scala/org/apache/spark/sql/catalyst/plans/ConstraintPropagationSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,16 @@ class ConstraintPropagationSuite extends SparkFunSuite {
ExpressionSet(Seq(resolveColumn(aliasedRelation.analyze, "x") > 10,
IsNotNull(resolveColumn(aliasedRelation.analyze, "x")),
resolveColumn(aliasedRelation.analyze, "b") <=> resolveColumn(aliasedRelation.analyze, "y"),
resolveColumn(aliasedRelation.analyze, "z") <=> resolveColumn(aliasedRelation.analyze, "x"),
resolveColumn(aliasedRelation.analyze, "z") > 10,
IsNotNull(resolveColumn(aliasedRelation.analyze, "z")))))

val multiAlias = tr.where('a === 'c + 10).select('a.as('x), 'c.as('y))
verifyConstraints(multiAlias.analyze.constraints,
ExpressionSet(Seq(IsNotNull(resolveColumn(multiAlias.analyze, "x")),
IsNotNull(resolveColumn(multiAlias.analyze, "y")),
resolveColumn(multiAlias.analyze, "x") === resolveColumn(multiAlias.analyze, "y") + 10))
)
}

test("propagating constraints in union") {
Expand Down