Github user sameeragarwal commented on a diff in the pull request:
https://github.com/apache/spark/pull/15319#discussion_r84649236
--- Diff:
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/InferFiltersFromConstraintsSuite.scala
---
@@ -120,4 +123,80 @@ class InferFiltersFromConstraintsSuite extends
PlanTest {
val optimized = Optimize.execute(originalQuery)
comparePlans(optimized, correctAnswer)
}
+
+ test("inner join with alias: alias contains multiple attributes") {
+ val t1 = testRelation.subquery('t1)
+ val t2 = testRelation.subquery('t2)
+
+ val originalQuery = t1.select('a, Coalesce(Seq('a,
'b)).as('int_col)).as("t")
+ .join(t2, Inner, Some("t.a".attr === "t2.a".attr && "t.int_col".attr
=== "t2.a".attr))
+ .analyze
+ val currectAnswer = t1.where(IsNotNull('a) &&
IsNotNull(Coalesce(Seq('a, 'b)))
+ &&'a === Coalesce(Seq('a, 'b)))
+ .select('a, Coalesce(Seq('a, 'b)).as('int_col)).as("t")
+ .join(t2.where(IsNotNull('a)), Inner,
+ Some("t.a".attr === "t2.a".attr && "t.int_col".attr ===
"t2.a".attr))
+ .analyze
+ val optimized = Optimize.execute(originalQuery)
+ comparePlans(optimized, currectAnswer)
+ }
+
+ test("inner join with alias: alias contains single attributes") {
+ val t1 = testRelation.subquery('t1)
+ val t2 = testRelation.subquery('t2)
+
+ val originalQuery = t1.select('a, 'b.as('d)).as("t")
+ .join(t2, Inner, Some("t.a".attr === "t2.a".attr && "t.d".attr ===
"t2.a".attr))
+ .analyze
+ val currectAnswer = t1.where(IsNotNull('a) && IsNotNull('b)
+ && 'a <=> 'a && 'b <=> 'b &&'a === 'b)
+ .select('a, 'b.as('d)).as("t")
+ .join(t2.where(IsNotNull('a) && 'a <=> 'a), Inner,
+ Some("t.a".attr === "t2.a".attr && "t.d".attr === "t2.a".attr))
+ .analyze
+ val optimized = Optimize.execute(originalQuery)
+ comparePlans(optimized, currectAnswer)
+ }
+
+ test("inner join with alias: don't generate constraints for recursive
functions") {
+ val t1 = testRelation.subquery('t1)
+ val t2 = testRelation.subquery('t2)
+
+ val originalQuery = t1.select('a, 'b.as('d), Coalesce(Seq('a,
'b)).as('int_col)).as("t")
+ .join(t2, Inner,
+ Some("t.a".attr === "t2.a".attr
+ && "t.d".attr === "t2.a".attr
+ && "t.int_col".attr === "t2.a".attr))
+ .analyze
+ val correctAnswer = t1.where(IsNotNull('a) &&
IsNotNull(Coalesce(Seq('a, 'a)))
+ && 'a === Coalesce(Seq('a, 'a)) && 'a <=> Coalesce(Seq('a, 'a)) &&
'a <=> 'a
+ && Coalesce(Seq('a, 'a)) <=> 'b && Coalesce(Seq('a, 'a)) <=>
Coalesce(Seq('a, 'a))
+ && 'a === 'b && IsNotNull(Coalesce(Seq('a, 'b))) && 'a ===
Coalesce(Seq('a, 'b))
+ && Coalesce(Seq('a, 'b)) <=> Coalesce(Seq('b, 'b)) &&
Coalesce(Seq('a, 'b)) === 'b
+ && IsNotNull('b) && IsNotNull(Coalesce(Seq('b, 'b)))
+ && 'b === Coalesce(Seq('b, 'b)) && 'b <=> Coalesce(Seq('b, 'b))
+ && Coalesce(Seq('b, 'b)) <=> Coalesce(Seq('b, 'b)) && 'b <=> 'b)
+ .select('a, 'b.as('d), Coalesce(Seq('a, 'b)).as('int_col)).as("t")
+ .join(t2.where(IsNotNull('a) && IsNotNull(Coalesce(Seq('a, 'a)))
+ && 'a === Coalesce(Seq('a, 'a)) && 'a <=> Coalesce(Seq('a, 'a)) &&
'a <=> 'a
+ && Coalesce(Seq('a, 'a)) <=> Coalesce(Seq('a, 'a))), Inner,
--- End diff --
nit: 2 spaces
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
