[SPARK-31958][SQL] normalize special floating numbers in subquery #28785
Conversation
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
maropu
reviewed
Jun 10, 2020
| @@ -56,10 +56,6 @@ import org.apache.spark.sql.types._ | |||
| object NormalizeFloatingNumbers extends Rule[LogicalPlan] { | |||
|
|
|||
| def apply(plan: LogicalPlan): LogicalPlan = plan match { | |||
| // A subquery will be rewritten into join later, and will go through this rule | |||
| // eventually. Here we skip subquery, as we only need to run this rule once. | |||
| case _: Subquery => plan | |||
There was a problem hiding this comment.
How about adding tests for the subquery case in NormalizeFloatingPointNumbersSuite, too?
There was a problem hiding this comment.
No we can't.
This fix relies on the rule OptimizeSubqueries, which is an inner object of the class Optimizer as it needs to rerun the entire optimizer for subquery. So we can't use OptimizeSubqueries in NormalizeFloatingPointNumbersSuite.
|
Test build #123771 has finished for PR 28785 at commit
|
viirya
approved these changes
Jun 11, 2020
viirya
reviewed
Jun 11, 2020
| @@ -56,10 +56,6 @@ import org.apache.spark.sql.types._ | |||
| object NormalizeFloatingNumbers extends Rule[LogicalPlan] { | |||
There was a problem hiding this comment.
Does it also mean This batch must be executed after the RewriteSubquery batch, which creates joins. is not definitely true now?
There was a problem hiding this comment.
it's still true, the correlated subquery becomes join, and may have new join keys.
|
thanks for the review, merging to master/3.0! |
cloud-fan
added a commit
that referenced
this pull request
Jun 11, 2020
### What changes were proposed in this pull request? This is a followup of #23388 . #23388 has an issue: it doesn't handle subquery expressions and assumes they will be turned into joins. However, this is not true for non-correlated subquery expressions. This PR fixes this issue. It now doesn't skip `Subquery`, and subquery expressions will be handled by `OptimizeSubqueries`, which runs the optimizer with the subquery. Note that, correlated subquery expressions will be handled twice: once in `OptimizeSubqueries`, once later when it becomes join. This is OK as `NormalizeFloatingNumbers` is idempotent now. ### Why are the changes needed? fix a bug ### Does this PR introduce _any_ user-facing change? yes, see the newly added test. ### How was this patch tested? new test Closes #28785 from cloud-fan/normalize. Authored-by: Wenchen Fan <wenchen@databricks.com> Signed-off-by: Wenchen Fan <wenchen@databricks.com> (cherry picked from commit 6fb9c80) Signed-off-by: Wenchen Fan <wenchen@databricks.com>
holdenk
pushed a commit
to holdenk/spark
that referenced
this pull request
Jun 25, 2020
### What changes were proposed in this pull request? This is a followup of apache#23388 . apache#23388 has an issue: it doesn't handle subquery expressions and assumes they will be turned into joins. However, this is not true for non-correlated subquery expressions. This PR fixes this issue. It now doesn't skip `Subquery`, and subquery expressions will be handled by `OptimizeSubqueries`, which runs the optimizer with the subquery. Note that, correlated subquery expressions will be handled twice: once in `OptimizeSubqueries`, once later when it becomes join. This is OK as `NormalizeFloatingNumbers` is idempotent now. ### Why are the changes needed? fix a bug ### Does this PR introduce _any_ user-facing change? yes, see the newly added test. ### How was this patch tested? new test Closes apache#28785 from cloud-fan/normalize. Authored-by: Wenchen Fan <wenchen@databricks.com> Signed-off-by: Wenchen Fan <wenchen@databricks.com> (cherry picked from commit 6fb9c80) Signed-off-by: Wenchen Fan <wenchen@databricks.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
This is a followup of #23388 .
#23388 has an issue: it doesn't handle subquery expressions and assumes they will be turned into joins. However, this is not true for non-correlated subquery expressions.
This PR fixes this issue. It now doesn't skip
Subquery, and subquery expressions will be handled byOptimizeSubqueries, which runs the optimizer with the subquery.Note that, correlated subquery expressions will be handled twice: once in
OptimizeSubqueries, once later when it becomes join. This is OK asNormalizeFloatingNumbersis idempotent now.Why are the changes needed?
fix a bug
Does this PR introduce any user-facing change?
yes, see the newly added test.
How was this patch tested?
new test