Skip to content

[SPARK-9938][SQL]Constant folding of binaryComparison on IntegralType #8165

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
yjshen wants to merge 1 commit into from
Closed

[SPARK-9938][SQL]Constant folding of binaryComparison on IntegralType #8165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
96 changes: 96 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 @@ -382,6 +382,102 @@ object ConstantFolding extends Rule[LogicalPlan] {
case Literal(candidate, _) if candidate == v => true
case _ => false
} => Literal.create(true, BooleanType)

case EqualTo(c @ Cast(a: Attribute, _), Literal(v, _)) if isUpCastingIntegral(c) &&
(v.asInstanceOf[Number].longValue < minValue(a.dataType) ||
v.asInstanceOf[Number].longValue > maxValue(a.dataType)) =>
Literal.create(false, BooleanType)
case EqualTo(Literal(v, _), c @ Cast(a: Attribute, _)) if isUpCastingIntegral(c) &&
(v.asInstanceOf[Number].longValue < minValue(a.dataType) ||
v.asInstanceOf[Number].longValue > maxValue(a.dataType)) =>
Literal.create(false, BooleanType)

case EqualNullSafe(c @ Cast(a: Attribute, _), Literal(v, _)) if isUpCastingIntegral(c) &&
(v.asInstanceOf[Number].longValue < minValue(a.dataType) ||
v.asInstanceOf[Number].longValue > maxValue(a.dataType)) =>
Literal.create(false, BooleanType)
case EqualNullSafe(Literal(v, _), c @ Cast(a: Attribute, _)) if isUpCastingIntegral(c) &&
(v.asInstanceOf[Number].longValue < minValue(a.dataType) ||
v.asInstanceOf[Number].longValue > maxValue(a.dataType)) =>
Literal.create(false, BooleanType)

case GreaterThan(c @ Cast(a: Attribute, _), Literal(v, _)) if isUpCastingIntegral(c) &&
v.asInstanceOf[Number].longValue < minValue(a.dataType) =>
Literal.create(true, BooleanType)
case GreaterThan(c @ Cast(a: Attribute, _), Literal(v, _)) if isUpCastingIntegral(c) &&
v.asInstanceOf[Number].longValue >= maxValue(a.dataType) =>
Literal.create(false, BooleanType)
case GreaterThan(Literal(v, _), c @ Cast(a: Attribute, _)) if isUpCastingIntegral(c) &&
v.asInstanceOf[Number].longValue <= minValue(a.dataType) =>
Literal.create(false, BooleanType)
case GreaterThan(Literal(v, _), c @ Cast(a: Attribute, _)) if isUpCastingIntegral(c) &&
v.asInstanceOf[Number].longValue > maxValue(a.dataType) =>
Literal.create(true, BooleanType)

case LessThan(c @ Cast(a: Attribute, _), Literal(v, _)) if isUpCastingIntegral(c) &&
v.asInstanceOf[Number].longValue <= minValue(a.dataType) =>
Literal.create(false, BooleanType)
case LessThan(c @ Cast(a: Attribute, _), Literal(v, _)) if isUpCastingIntegral(c) &&
v.asInstanceOf[Number].longValue > maxValue(a.dataType) =>
Literal.create(true, BooleanType)
case LessThan(Literal(v, _), c @ Cast(a: Attribute, _)) if isUpCastingIntegral(c) &&
v.asInstanceOf[Number].longValue < minValue(a.dataType) =>
Literal.create(true, BooleanType)
case LessThan(Literal(v, _), c @ Cast(a: Attribute, _)) if isUpCastingIntegral(c) &&
v.asInstanceOf[Number].longValue >= maxValue(a.dataType) =>
Literal.create(false, BooleanType)

case GreaterThanOrEqual(c @ Cast(a: Attribute, _), Literal(v, _))
if isUpCastingIntegral(c) && v.asInstanceOf[Number].longValue <= minValue(a.dataType) =>
Literal.create(true, BooleanType)
case GreaterThanOrEqual(c @ Cast(a: Attribute, _), Literal(v, _))
if isUpCastingIntegral(c) && v.asInstanceOf[Number].longValue > maxValue(a.dataType) =>
Literal.create(false, BooleanType)
case GreaterThanOrEqual(Literal(v, _), c @ Cast(a: Attribute, _))
if isUpCastingIntegral(c) && v.asInstanceOf[Number].longValue < minValue(a.dataType) =>
Literal.create(false, BooleanType)
case GreaterThanOrEqual(Literal(v, _), c @ Cast(a: Attribute, _))
if isUpCastingIntegral(c) && v.asInstanceOf[Number].longValue >= maxValue(a.dataType) =>
Literal.create(true, BooleanType)

case LessThanOrEqual(c @ Cast(a: Attribute, _), Literal(v, _)) if isUpCastingIntegral(c) &&
v.asInstanceOf[Number].longValue < minValue(a.dataType) =>
Literal.create(false, BooleanType)
case LessThanOrEqual(c @ Cast(a: Attribute, _), Literal(v, _)) if isUpCastingIntegral(c) &&
v.asInstanceOf[Number].longValue >= maxValue(a.dataType) =>
Literal.create(true, BooleanType)
case LessThanOrEqual(Literal(v, _), c @ Cast(a: Attribute, _)) if isUpCastingIntegral(c) &&
v.asInstanceOf[Number].longValue <= minValue(a.dataType) =>
Literal.create(true, BooleanType)
case LessThanOrEqual(Literal(v, _), c @ Cast(a: Attribute, _)) if isUpCastingIntegral(c) &&
v.asInstanceOf[Number].longValue > maxValue(a.dataType) =>
Literal.create(false, BooleanType)
}
}

private val integralPrecedence = Seq(ByteType, ShortType, IntegerType, LongType)

private def isUpCastingIntegral(c: Cast): Boolean = {
(c.child.dataType, c.dataType) match {
case (from: IntegralType, to: IntegralType)
if integralPrecedence.indexOf(from) < integralPrecedence.indexOf(to) => true
case _ => false
}
}

private def maxValue(dataType: DataType): Long = {
dataType match {
case ByteType => Byte.MaxValue.toLong
case ShortType => Short.MaxValue.toLong
case IntegerType => Int.MaxValue.toLong
}
}

private def minValue(dataType: DataType): Long = {
dataType match {
case ByteType => Byte.MinValue.toLong
case ShortType => Short.MinValue.toLong
case IntegerType => Int.MinValue.toLong
}
}
}
Expand Down
34 changes: 34 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 @@ -280,4 +280,38 @@ class ConstantFoldingSuite extends PlanTest {

comparePlans(optimized, correctAnswer)
}

test("binary comparison folding") {
val trueQuery = testRelation.select(Literal(true).as("r"))
val falseQuery = testRelation.select(Literal(false).as("r"))
def checkComparisonFolding(l: LogicalPlan, expected: Boolean): Unit = {
val optimized = Optimize.execute(l.analyze)
if (expected) {
comparePlans(optimized, trueQuery)
} else {
comparePlans(optimized, falseQuery)
}
}

checkComparisonFolding(
testRelation.select(EqualTo('a, Int.MaxValue.toLong + 1L).as("r")), false)
checkComparisonFolding(
testRelation.select(EqualTo('a, Int.MinValue.toLong - 1L).as("r")), false)
checkComparisonFolding(
testRelation.select(LessThan('a, Int.MaxValue.toLong + 1L).as("r")), true)
checkComparisonFolding(
testRelation.select(LessThan('a, Int.MinValue.toLong - 1L).as("r")), false)
checkComparisonFolding(
testRelation.select(GreaterThan('a, Int.MaxValue.toLong + 1L).as("r")), false)
checkComparisonFolding(
testRelation.select(GreaterThan('a, Int.MinValue.toLong - 1L).as("r")), true)
checkComparisonFolding(
testRelation.select(LessThanOrEqual('a, Int.MaxValue.toLong).as("r")), true)
checkComparisonFolding(
testRelation.select(LessThanOrEqual('a, Int.MinValue.toLong - 1L).as("r")), false)
checkComparisonFolding(
testRelation.select(GreaterThanOrEqual('a, Int.MaxValue.toLong + 1L).as("r")), false)
checkComparisonFolding(
testRelation.select(GreaterThanOrEqual('a, Int.MinValue.toLong).as("r")), true)
}
}