Skip to content

[SPARK-32258][SQL] Not duplicate normalization on children for float/double If/CaseWhen/Coalesce #29091

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

[SPARK-32258][SQL] Not duplicate normalization on children for float/double If/CaseWhen/Coalesce #29091

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
6 changes: 3 additions & 3 deletions ...yst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/NormalizeFloatingNumbers.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@ object NormalizeFloatingNumbers extends Rule[LogicalPlan] {
case CreateMap(children, useStringTypeWhenEmpty) =>
CreateMap(children.map(normalize), useStringTypeWhenEmpty)

case _ if expr.dataType == FloatType || expr.dataType == DoubleType =>
KnownFloatingPointNormalized(NormalizeNaNAndZero(expr))

case If(cond, trueValue, falseValue) =>
If(cond, normalize(trueValue), normalize(falseValue))

Expand All @@ -125,9 +128,6 @@ object NormalizeFloatingNumbers extends Rule[LogicalPlan] {
case Coalesce(children) =>
Coalesce(children.map(normalize))

case _ if expr.dataType == FloatType || expr.dataType == DoubleType =>
KnownFloatingPointNormalized(NormalizeNaNAndZero(expr))

case _ if expr.dataType.isInstanceOf[StructType] =>
val fields = expr.dataType.asInstanceOf[StructType].fields.indices.map { i =>
normalize(GetStructField(expr, i))
Expand Down
26 changes: 12 additions & 14 deletions ...st/scala/org/apache/spark/sql/catalyst/optimizer/NormalizeFloatingPointNumbersSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,43 +85,41 @@ class NormalizeFloatingPointNumbersSuite extends PlanTest {
val optimized = Optimize.execute(query)
val doubleOptimized = Optimize.execute(optimized)
val joinCond = IsNull(a) === IsNull(b) &&
coalesce(KnownFloatingPointNormalized(NormalizeNaNAndZero(a)),
KnownFloatingPointNormalized(NormalizeNaNAndZero(0.0))) ===
coalesce(KnownFloatingPointNormalized(NormalizeNaNAndZero(b)),
KnownFloatingPointNormalized(NormalizeNaNAndZero(0.0)))
KnownFloatingPointNormalized(NormalizeNaNAndZero(coalesce(a, 0.0))) ===
KnownFloatingPointNormalized(NormalizeNaNAndZero(coalesce(b, 0.0)))
val correctAnswer = testRelation1.join(testRelation2, condition = Some(joinCond))

comparePlans(doubleOptimized, correctAnswer)
}

test("SPARK-32258: normalize the children of If") {
val cond = If(a > 0.1D, a, a + 0.2D) === b
val cond = If(a > 0.1D, namedStruct("a", a), namedStruct("a", a + 0.2D)) === namedStruct("a", b)
val query = testRelation1.join(testRelation2, condition = Some(cond))
val optimized = Optimize.execute(query)
val doubleOptimized = Optimize.execute(optimized)

val joinCond = If(a > 0.1D,
KnownFloatingPointNormalized(NormalizeNaNAndZero(a)),
KnownFloatingPointNormalized(NormalizeNaNAndZero(a + 0.2D))) ===
KnownFloatingPointNormalized(NormalizeNaNAndZero(b))
namedStruct("a", KnownFloatingPointNormalized(NormalizeNaNAndZero(a))),
namedStruct("a", KnownFloatingPointNormalized(NormalizeNaNAndZero(a + 0.2D)))) ===
namedStruct("a", KnownFloatingPointNormalized(NormalizeNaNAndZero(b)))
val correctAnswer = testRelation1.join(testRelation2, condition = Some(joinCond))

comparePlans(doubleOptimized, correctAnswer)
}

test("SPARK-32258: normalize the children of CaseWhen") {
val cond = CaseWhen(
Seq((a > 0.1D, a), (a > 0.2D, a + 0.2D)),
Some(a + 0.3D)) === b
Seq((a > 0.1D, namedStruct("a", a)), (a > 0.2D, namedStruct("a", a + 0.2D))),
Some(namedStruct("a", a + 0.3D))) === namedStruct("a", b)
val query = testRelation1.join(testRelation2, condition = Some(cond))
val optimized = Optimize.execute(query)
val doubleOptimized = Optimize.execute(optimized)

val joinCond = CaseWhen(
Seq((a > 0.1D, KnownFloatingPointNormalized(NormalizeNaNAndZero(a))),
(a > 0.2D, KnownFloatingPointNormalized(NormalizeNaNAndZero(a + 0.2D)))),
Some(KnownFloatingPointNormalized(NormalizeNaNAndZero(a + 0.3D)))) ===
KnownFloatingPointNormalized(NormalizeNaNAndZero(b))
Seq((a > 0.1D, namedStruct("a", KnownFloatingPointNormalized(NormalizeNaNAndZero(a)))),
(a > 0.2D, namedStruct("a", KnownFloatingPointNormalized(NormalizeNaNAndZero(a + 0.2D))))),
Some(namedStruct("a", KnownFloatingPointNormalized(NormalizeNaNAndZero(a + 0.3D))))) ===
namedStruct("a", KnownFloatingPointNormalized(NormalizeNaNAndZero(b)))
val correctAnswer = testRelation1.join(testRelation2, condition = Some(joinCond))

comparePlans(doubleOptimized, correctAnswer)
Expand Down