-
Notifications
You must be signed in to change notification settings - Fork 28.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[SPARK-28306][SQL] Make NormalizeFloatingNumbers rule idempotent
## What changes were proposed in this pull request? The optimizer rule `NormalizeFloatingNumbers` is not idempotent. It will generate multiple `NormalizeNaNAndZero` and `ArrayTransform` expression nodes for multiple runs. This patch fixed this non-idempotence by adding a marking tag above normalized expressions. It also adds missing UTs for `NormalizeFloatingNumbers`. ## How was this patch tested? New UTs. Closes #25080 from yeshengm/spark-28306. Authored-by: Yesheng Ma <[email protected]> Signed-off-by: Wenchen Fan <[email protected]>
- Loading branch information
Showing
3 changed files
with
108 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
82 changes: 82 additions & 0 deletions
82
...st/scala/org/apache/spark/sql/catalyst/optimizer/NormalizeFloatingPointNumbersSuite.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,82 @@ | ||
/* | ||
* 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.dsl.expressions._ | ||
import org.apache.spark.sql.catalyst.dsl.plans._ | ||
import org.apache.spark.sql.catalyst.expressions.KnownFloatingPointNormalized | ||
import org.apache.spark.sql.catalyst.plans.PlanTest | ||
import org.apache.spark.sql.catalyst.plans.logical._ | ||
import org.apache.spark.sql.catalyst.rules.RuleExecutor | ||
|
||
class NormalizeFloatingPointNumbersSuite extends PlanTest { | ||
|
||
object Optimize extends RuleExecutor[LogicalPlan] { | ||
val batches = Batch("NormalizeFloatingPointNumbers", Once, NormalizeFloatingNumbers) :: Nil | ||
} | ||
|
||
val testRelation1 = LocalRelation('a.double) | ||
val a = testRelation1.output(0) | ||
val testRelation2 = LocalRelation('a.double) | ||
val b = testRelation2.output(0) | ||
|
||
test("normalize floating points in window function expressions") { | ||
val query = testRelation1.window(Seq(sum(a).as("sum")), Seq(a), Seq(a.asc)) | ||
|
||
val optimized = Optimize.execute(query) | ||
val correctAnswer = testRelation1.window(Seq(sum(a).as("sum")), | ||
Seq(KnownFloatingPointNormalized(NormalizeNaNAndZero(a))), Seq(a.asc)) | ||
|
||
comparePlans(optimized, correctAnswer) | ||
} | ||
|
||
test("normalize floating points in window function expressions - idempotence") { | ||
val query = testRelation1.window(Seq(sum(a).as("sum")), Seq(a), Seq(a.asc)) | ||
|
||
val optimized = Optimize.execute(query) | ||
val doubleOptimized = Optimize.execute(optimized) | ||
val correctAnswer = testRelation1.window(Seq(sum(a).as("sum")), | ||
Seq(KnownFloatingPointNormalized(NormalizeNaNAndZero(a))), Seq(a.asc)) | ||
|
||
comparePlans(doubleOptimized, correctAnswer) | ||
} | ||
|
||
test("normalize floating points in join keys") { | ||
val query = testRelation1.join(testRelation2, condition = Some(a === b)) | ||
|
||
val optimized = Optimize.execute(query) | ||
val joinCond = Some(KnownFloatingPointNormalized(NormalizeNaNAndZero(a)) | ||
=== KnownFloatingPointNormalized(NormalizeNaNAndZero(b))) | ||
val correctAnswer = testRelation1.join(testRelation2, condition = joinCond) | ||
|
||
comparePlans(optimized, correctAnswer) | ||
} | ||
|
||
test("normalize floating points in join keys - idempotence") { | ||
val query = testRelation1.join(testRelation2, condition = Some(a === b)) | ||
|
||
val optimized = Optimize.execute(query) | ||
val doubleOptimized = Optimize.execute(optimized) | ||
val joinCond = Some(KnownFloatingPointNormalized(NormalizeNaNAndZero(a)) | ||
=== KnownFloatingPointNormalized(NormalizeNaNAndZero(b))) | ||
val correctAnswer = testRelation1.join(testRelation2, condition = joinCond) | ||
|
||
comparePlans(doubleOptimized, correctAnswer) | ||
} | ||
} | ||
|