Skip to content

[SPARK-24371] [SQL] Added isInCollection in DataFrame API for Scala and Java. #21416

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
dbtsai wants to merge 6 commits into from
Closed

[SPARK-24371] [SQL] Added isInCollection in DataFrame API for Scala and Java. #21416

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
da10307
Added isinSet in DataFrame API for Scala and Java.
dbtsai May 17, 2018
730b19b
Not optimize In if the list is type of ListQuery
dbtsai May 25, 2018
6ff2806
Safer rule
dbtsai May 25, 2018
286a468
Addressed feedback
dbtsai May 26, 2018
1332406
Removed rules in OptimizeIn into another PR.
dbtsai May 28, 2018
fed2846
Simplify the tests
dbtsai May 29, 2018
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
Prev Previous commit
Next Next commit
Safer rule
  • Loading branch information
@dbtsai
dbtsai committed May 25, 2018
commit 6ff280616bab4f38d338b9b3aca38c4affd86cd8
3 changes: 1 addition & 2 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/expressions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,7 @@ object OptimizeIn extends Rule[LogicalPlan] {
// When v is not nullable, the following expression will be optimized
// to FalseLiteral which is tested in OptimizeInSuite.scala
If(IsNotNull(v), FalseLiteral, Literal(null, BooleanType))
case In(v, list) if list.length == 1 && !list.head.isInstanceOf[ListQuery] =>
EqualTo(v, list.head)
case In(v, Seq(elem @ Literal(_, _))) => EqualTo(v, elem)
case expr @ In(v, list) if expr.inSetConvertible =>
val newList = ExpressionSet(list).toSeq
if (newList.size > SQLConf.get.optimizerInSetConversionThreshold) {
Expand Down
4 changes: 2 additions & 2 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/OptimizeInSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,13 @@ class OptimizeInSuite extends PlanTest {
test("OptimizedIn test: one element in list gets transformed to EqualTo.") {
val originalQuery =
testRelation
.where(In(UnresolvedAttribute("a"), Seq(UnresolvedAttribute("b"))))
.where(In(UnresolvedAttribute("a"), Seq(Literal(1))))
.analyze

val optimized = Optimize.execute(originalQuery)
val correctAnswer =
testRelation
.where(EqualTo(UnresolvedAttribute("a"), UnresolvedAttribute("b")))
.where(EqualTo(UnresolvedAttribute("a"), Literal(1)))
.analyze

comparePlans(optimized, correctAnswer)
Expand Down