Skip to content

[SPARK-14502][SQL] Add optimization for Binary Comparison Simplification #12267

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
dongjoon-hyun wants to merge 5 commits into from
Closed

[SPARK-14502][SQL] Add optimization for Binary Comparison Simplification #12267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ef41e26
[SPARK-14502][SQL] Add optimization for Non-Nullable Binary Compariso…
dongjoon-hyun Apr 8, 2016
68b58b6
Replace '||' with '&&'
dongjoon-hyun Apr 11, 2016
71bf40f
Simplify test by removing useless data.
dongjoon-hyun Apr 11, 2016
bdc309c
Extend `EqualNullSafe` case to handle non-nullable exprs.
dongjoon-hyun Apr 11, 2016
9ca13be
Add non-deterministic test on non-nullable relation and remove TRUE/F…
dongjoon-hyun Apr 11, 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
24 changes: 24 additions & 0 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 @@ -86,6 +86,7 @@ abstract class Optimizer extends RuleExecutor[LogicalPlan] {
BooleanSimplification,
SimplifyConditionals,
RemoveDispensableExpressions,
BinaryComparisonSimplification,
PruneFilters,
EliminateSorts,
SimplifyCasts,
Expand Down Expand Up @@ -786,6 +787,29 @@ object BooleanSimplification extends Rule[LogicalPlan] with PredicateHelper {
}
}

/**
* Simplifies binary comparisons with semantically-equal expressions:
* 1) Replace '<=>' with 'true' literal.
* 2) Replace '=', '<=', and '>=' with 'true' literal if both operands are non-nullable.
* 3) Replace '<' and '>' with 'false' literal if both operands are non-nullable.
*/
object BinaryComparisonSimplification extends Rule[LogicalPlan] with PredicateHelper {
def apply(plan: LogicalPlan): LogicalPlan = plan transform {
case q: LogicalPlan => q transformExpressionsUp {
// True with equality
case a EqualNullSafe b if a.semanticEquals(b) => TrueLiteral
case a EqualTo b if !a.nullable && !b.nullable && a.semanticEquals(b) => TrueLiteral
case a GreaterThanOrEqual b if !a.nullable && !b.nullable && a.semanticEquals(b) =>
TrueLiteral
case a LessThanOrEqual b if !a.nullable && !b.nullable && a.semanticEquals(b) => TrueLiteral

// False with inequality
case a GreaterThan b if !a.nullable && !b.nullable && a.semanticEquals(b) => FalseLiteral
case a LessThan b if !a.nullable && !b.nullable && a.semanticEquals(b) => FalseLiteral
}
}
}

/**
* Simplifies conditional expressions (if / case).
*/
Expand Down
95 changes: 95 additions & 0 deletions ...t/scala/org/apache/spark/sql/catalyst/optimizer/BinaryComparisonSimplificationSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.spark.sql.catalyst.optimizer

import org.apache.spark.sql.catalyst.analysis._
import org.apache.spark.sql.catalyst.dsl.expressions._
import org.apache.spark.sql.catalyst.dsl.plans._
import org.apache.spark.sql.catalyst.expressions._
import org.apache.spark.sql.catalyst.expressions.Literal.{FalseLiteral, TrueLiteral}
import org.apache.spark.sql.catalyst.plans.PlanTest
import org.apache.spark.sql.catalyst.plans.logical._
import org.apache.spark.sql.catalyst.rules._

class BinaryComparisonSimplificationSuite extends PlanTest with PredicateHelper {

object Optimize extends RuleExecutor[LogicalPlan] {
val batches =
Batch("AnalysisNodes", Once,
EliminateSubqueryAliases) ::
Batch("Constant Folding", FixedPoint(50),
NullPropagation,
ConstantFolding,
BooleanSimplification,
BinaryComparisonSimplification,
PruneFilters) :: Nil
}

val nullableRelation = LocalRelation('a.int.withNullability(true))
val nonNullableRelation = LocalRelation('a.int.withNullability(false))

test("Preserve nullable exprs in general") {
for (e <- Seq('a === 'a, 'a <= 'a, 'a >= 'a, 'a < 'a, 'a > 'a)) {
val plan = nullableRelation.where(e).analyze
val actual = Optimize.execute(plan)
val correctAnswer = plan
comparePlans(actual, correctAnswer)
}
}

test("Preserve non-deterministic exprs") {
val plan = nonNullableRelation
.where(Rand(0) === Rand(0) && Rand(1) <=> Rand(1)).analyze
val actual = Optimize.execute(plan)
val correctAnswer = plan
comparePlans(actual, correctAnswer)
}

test("Nullable Simplification Primitive: <=>") {
val plan = nullableRelation.select('a <=> 'a).analyze
val actual = Optimize.execute(plan)
val correctAnswer = nullableRelation.select(Alias(TrueLiteral, "(a <=> a)")()).analyze
comparePlans(actual, correctAnswer)
}

test("Non-Nullable Simplification Primitive") {
val plan = nonNullableRelation
.select('a === 'a, 'a <=> 'a, 'a <= 'a, 'a >= 'a, 'a < 'a, 'a > 'a).analyze
val actual = Optimize.execute(plan)
val correctAnswer = nonNullableRelation
.select(
Alias(TrueLiteral, "(a = a)")(),
Alias(TrueLiteral, "(a <=> a)")(),
Alias(TrueLiteral, "(a <= a)")(),
Alias(TrueLiteral, "(a >= a)")(),
Alias(FalseLiteral, "(a < a)")(),
Alias(FalseLiteral, "(a > a)")())
.analyze
comparePlans(actual, correctAnswer)
}

test("Expression Normalization") {
val plan = nonNullableRelation.where(
'a * Literal(100) + Pi() === Pi() + Literal(100) * 'a &&
DateAdd(CurrentDate(), 'a + Literal(2)) <= DateAdd(CurrentDate(), Literal(2) + 'a))
.analyze
val actual = Optimize.execute(plan)
val correctAnswer = nonNullableRelation.analyze
comparePlans(actual, correctAnswer)
}
}