Skip to content
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

Jump to bottom

[SPARK-7437][SQL] Fold "literal in (item1, item2, ..., literal, ...)" into true or false directly #5972

Closed
wants to merge 21 commits into from
Closed

[SPARK-7437][SQL] Fold "literal in (item1, item2, ..., literal, ...)" into true or false directly #5972

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c3f046f
Merge pull request #1 from apache/master
pzzs Mar 2, 2015
cb1852d
Merge pull request #2 from apache/master
pzzs Mar 5, 2015
c87e8b6
Merge pull request #3 from apache/master
pzzs Mar 10, 2015
161cae3
Merge pull request #4 from apache/master
pzzs Mar 12, 2015
98b134f
Merge pull request #5 from apache/master
pzzs Mar 19, 2015
d00303b
Merge pull request #6 from apache/master
pzzs Mar 24, 2015
802261c
Merge pull request #7 from apache/master
pzzs Mar 26, 2015
34b1a9a
Merge pull request #8 from apache/master
pzzs Apr 8, 2015
f61210c
Merge pull request #9 from apache/master
pzzs Apr 17, 2015
f12fa50
Merge pull request #10 from apache/master
pzzs Apr 21, 2015
f03fe7f
Merge pull request #12 from apache/master
pzzs Apr 29, 2015
14952e2
Merge pull request #13 from apache/master
pzzs May 7, 2015
2e8f6ca
Update Optimizer.scala
pzzs May 7, 2015
36c194e
Update Optimizer.scala
pzzs May 7, 2015
35ceb7a
Update Optimizer.scala
pzzs May 7, 2015
f4dbf50
Update ConstantFoldingSuite.scala
pzzs May 7, 2015
24739bd
Update ConstantFoldingSuite.scala
pzzs May 7, 2015
e34c28a
Update predicates.scala
pzzs May 8, 2015
fa461a5
Update Optimizer.scala
pzzs May 8, 2015
abe2bbb
Update Optimizer.scala
pzzs May 8, 2015
4c722a2
Update predicates.scala
pzzs May 8, 2015
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
1 change: 1 addition & 0 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ case class InSet(value: Expression, hset: Set[Any])

override def children: Seq[Expression] = value :: Nil

override def foldable: Boolean = true
Copy link
Contributor

Choose a reason for hiding this comment

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

I believe that you want override def foldable: Boolean = value.foldable.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yeah, you are right

override def nullable: Boolean = true // TODO: Figure out correct nullability semantics of IN.
override def toString: String = s"$value INSET ${hset.mkString("(", ",", ")")}"

Expand Down
4 changes: 2 additions & 2 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ object DefaultOptimizer extends Optimizer {
CombineLimits) ::
Batch("ConstantFolding", FixedPoint(100),
NullPropagation,
OptimizeIn,
Copy link
Contributor

Choose a reason for hiding this comment

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

Why move it?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

because it more like a transform, i think it should before ConstantFolding @yhuai

Copy link
Contributor

Choose a reason for hiding this comment

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

All of them are in the batch of "ConstantFolding". So, we do not really need to move them, right?

Copy link
Contributor

Choose a reason for hiding this comment

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

Not necessary, but looks ok to me, here first do transform from in -> inset, then in ConstantFolding it will call InSet.eval (not In.eval) which should be more efficient.

ConstantFolding,
LikeSimplification,
BooleanSimplification,
SimplifyFilters,
SimplifyCasts,
SimplifyCaseConversionExpressions,
OptimizeIn) ::
SimplifyCaseConversionExpressions) ::
Batch("Decimal Optimizations", FixedPoint(100),
DecimalAggregates) ::
Batch("LocalRelation", FixedPoint(100),
Expand Down
33 changes: 33 additions & 0 deletions ...atalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/ConstantFoldingSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class ConstantFoldingSuite extends PlanTest {
Batch("AnalysisNodes", Once,
EliminateSubQueries) ::
Batch("ConstantFolding", Once,
OptimizeIn,
ConstantFolding,
BooleanSimplification) :: Nil
Copy link
Contributor

Choose a reason for hiding this comment

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

@marmbrus Seems we need to add all of the rules shown in Analyzer's "ConstantFolding" to here?

Copy link
Contributor

Choose a reason for hiding this comment

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

The initial plan here was to only include the rules we are testing. I'm not sure if its true here, but sometimes including all the rules make it harder to test since then you need something that won't be optimized away by unrelated rules.

}
Expand Down Expand Up @@ -247,4 +248,36 @@ class ConstantFoldingSuite extends PlanTest {

comparePlans(optimized, correctAnswer)
}

test("Constant folding test: Fold In(v, list) into true or false") {
var originalQuery =
testRelation
.select('a)
.where(In(Literal(1), Seq(Literal(1), Literal(2))))

var optimized = Optimize.execute(originalQuery.analyze)

var correctAnswer =
testRelation
.select('a)
.where(Literal(true))
.analyze

comparePlans(optimized, correctAnswer)

originalQuery =
testRelation
.select('a)
.where(In(Literal(1), Seq(Literal(1), 'a.attr)))

optimized = Optimize.execute(originalQuery.analyze)

correctAnswer =
testRelation
.select('a)
.where(Literal(true))
.analyze

comparePlans(optimized, correctAnswer)
}
}