You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "cloud-fan (via GitHub)" <gi...@apache.org> on 2024/12/06 14:22:59 UTC
[PR] [SPARK-48416][SQL] Support nested correlated With expression [spark]
cloud-fan opened a new pull request, #49093:
URL: https://github.com/apache/spark/pull/49093
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://spark.apache.org/contributing.html
2. Ensure you have added or run the appropriate tests for your PR: https://spark.apache.org/developer-tools.html
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][SPARK-XXXX] Your PR title ...'.
4. Be sure to keep the PR description updated to reflect all changes.
5. Please write your PR title to summarize what this PR proposes.
6. If possible, provide a concise example to reproduce the issue for a faster review.
7. If you want to add a new configuration, please read the guideline first for naming configurations in
'core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala'.
8. If you want to add or modify an error type or message, please read the guideline first in
'common/utils/src/main/resources/error/README.md'.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
The inner `With` may reference common expressions of an outer `With`. This PR supports this case by making the rule `RewriteWithExpression` only rewrite top-level `With` expressions, and run the rule repeatedly so that the inner `With` expression becomes top-level `With` after one iteration, and gets rewritten in the next iteration.
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
To support optimized filter pushdown with `With` expression.
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as the documentation fix.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
No
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
If benchmark tests were added, please run the benchmarks in GitHub Actions for the consistent environment, and the instructions could accord to: https://spark.apache.org/developer-tools.html#github-workflow-benchmarks.
-->
updated the unit test
### Was this patch authored or co-authored using generative AI tooling?
<!--
If generative AI tooling has been used in the process of authoring this patch, please include the
phrase: 'Generated-by: ' followed by the name of the tool and its version.
If no, write 'No'.
Please refer to the [ASF Generative Tooling Guidance](https://www.apache.org/legal/generative-tooling.html) for details.
-->
no
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-48416][SQL] Support nested correlated With expression [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #49093:
URL: https://github.com/apache/spark/pull/49093#discussion_r1881204830
##########
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/RewriteWithExpressionSuite.scala:
##########
@@ -104,42 +101,60 @@ class RewriteWithExpressionSuite extends PlanTest {
val outerExpr = With(b + b) { case Seq(ref) =>
ref * ref + innerExpr
}
-
- val plan = testRelation.select(outerExpr.as("col"))
- val rewrittenInnerExpr = (a + a).as("_common_expr_0")
- val rewrittenOuterExpr = (b + b).as("_common_expr_1")
- val finalExpr = rewrittenOuterExpr.toAttribute * rewrittenOuterExpr.toAttribute +
- (rewrittenInnerExpr.toAttribute + rewrittenInnerExpr.toAttribute)
+ val finalExpr = $"_common_expr_1" * $"_common_expr_1" + ($"_common_expr_0" + $"_common_expr_0")
comparePlans(
- Optimizer.execute(plan),
+ Optimizer.execute(testRelation.select(outerExpr.as("col"))),
testRelation
- .select((testRelation.output :+ rewrittenInnerExpr): _*)
- .select((testRelation.output :+ rewrittenInnerExpr.toAttribute :+ rewrittenOuterExpr): _*)
+ .select(star(), (b + b).as("_common_expr_1"))
+ .select(star(), (a + a).as("_common_expr_0"))
.select(finalExpr.as("col"))
.analyze
)
}
- test("correlated nested WITH expression is not supported") {
+ test("correlated nested WITH expression is supported") {
val Seq(a, b) = testRelation.output
val outerCommonExprDef = CommonExpressionDef(b + b, CommonExpressionId(0))
val outerRef = new CommonExpressionRef(outerCommonExprDef)
+ val rewrittenOuterExpr = (b + b).as("_common_expr_0")
// The inner expression definition references the outer expression
val commonExprDef1 = CommonExpressionDef(a + a + outerRef, CommonExpressionId(1))
val ref1 = new CommonExpressionRef(commonExprDef1)
val innerExpr1 = With(ref1 + ref1, Seq(commonExprDef1))
-
val outerExpr1 = With(outerRef + innerExpr1, Seq(outerCommonExprDef))
- intercept[SparkException](Optimizer.execute(testRelation.select(outerExpr1.as("col"))))
+ comparePlans(
+ Optimizer.execute(testRelation.select(outerExpr1.as("col"))),
+ testRelation
+ // The first Project contains the common expression of the outer With
+ .select(star(), rewrittenOuterExpr)
+ // The second Project contains the common expression of the inner With, which references
+ // the common expression of the outer With.
+ .select(star(), (a + a + $"_common_expr_0").as("_common_expr_1"))
+ // The final Project contains the final result expression, which references both common
+ // expressions.
+ .select(($"_common_expr_0" + ($"_common_expr_1" + $"_common_expr_1")).as("col"))
+ .analyze
+ )
- val commonExprDef2 = CommonExpressionDef(a + a)
+ val commonExprDef2 = CommonExpressionDef(a + a, CommonExpressionId(2))
val ref2 = new CommonExpressionRef(commonExprDef2)
// The inner main expression references the outer expression
- val innerExpr2 = With(ref2 + outerRef, Seq(commonExprDef1))
-
+ val innerExpr2 = With(ref2 + outerRef, Seq(commonExprDef2))
val outerExpr2 = With(outerRef + innerExpr2, Seq(outerCommonExprDef))
- intercept[SparkException](Optimizer.execute(testRelation.select(outerExpr2.as("col"))))
+ comparePlans(
+ Optimizer.execute(testRelation.select(outerExpr2.as("col"))),
+ testRelation
+ // The first Project contains the common expression of the outer With
+ .select(star(), rewrittenOuterExpr)
+ // The second Project contains the common expression of the inner With, which does not
+ // references the common expression of the outer With.
Review Comment:
```suggestion
// reference the common expression of the outer With.
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-48416][SQL] Support nested correlated With expression [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan closed pull request #49093: [SPARK-48416][SQL] Support nested correlated With expression
URL: https://github.com/apache/spark/pull/49093
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-48416][SQL] Support nested correlated With expression [spark]
Posted by "MaxGekk (via GitHub)" <gi...@apache.org>.
MaxGekk commented on code in PR #49093:
URL: https://github.com/apache/spark/pull/49093#discussion_r1880616934
##########
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/RewriteWithExpressionSuite.scala:
##########
@@ -29,7 +28,7 @@ import org.apache.spark.sql.catalyst.rules.RuleExecutor
class RewriteWithExpressionSuite extends PlanTest {
object Optimizer extends RuleExecutor[LogicalPlan] {
- val batches = Batch("Rewrite With expression", Once,
+ val batches = Batch("Rewrite With expression", FixedPoint(5),
Review Comment:
Do you support any levels of nested `with` or there is some restrictions? 5 is enough in any case?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-48416][SQL] Support nested correlated With expression [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #49093:
URL: https://github.com/apache/spark/pull/49093#discussion_r1881204603
##########
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/RewriteWithExpressionSuite.scala:
##########
@@ -29,7 +28,7 @@ import org.apache.spark.sql.catalyst.rules.RuleExecutor
class RewriteWithExpressionSuite extends PlanTest {
object Optimizer extends RuleExecutor[LogicalPlan] {
- val batches = Batch("Rewrite With expression", Once,
+ val batches = Batch("Rewrite With expression", FixedPoint(5),
Review Comment:
The implementation supports any nesting levels but we only test 2 levels here so `FixedPoint(5)` is sufficient
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-48416][SQL] Support nested correlated With expression [spark]
Posted by "zml1206 (via GitHub)" <gi...@apache.org>.
zml1206 commented on code in PR #49093:
URL: https://github.com/apache/spark/pull/49093#discussion_r1879245758
##########
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/RewriteWithExpressionSuite.scala:
##########
@@ -104,42 +101,60 @@ class RewriteWithExpressionSuite extends PlanTest {
val outerExpr = With(b + b) { case Seq(ref) =>
ref * ref + innerExpr
}
-
- val plan = testRelation.select(outerExpr.as("col"))
- val rewrittenInnerExpr = (a + a).as("_common_expr_0")
- val rewrittenOuterExpr = (b + b).as("_common_expr_1")
- val finalExpr = rewrittenOuterExpr.toAttribute * rewrittenOuterExpr.toAttribute +
- (rewrittenInnerExpr.toAttribute + rewrittenInnerExpr.toAttribute)
+ val finalExpr = $"_common_expr_1" * $"_common_expr_1" + ($"_common_expr_0" + $"_common_expr_0")
comparePlans(
- Optimizer.execute(plan),
+ Optimizer.execute(testRelation.select(outerExpr.as("col"))),
testRelation
- .select((testRelation.output :+ rewrittenInnerExpr): _*)
- .select((testRelation.output :+ rewrittenInnerExpr.toAttribute :+ rewrittenOuterExpr): _*)
+ .select(star(), (b + b).as("_common_expr_1"))
+ .select(star(), (a + a).as("_common_expr_0"))
.select(finalExpr.as("col"))
.analyze
)
}
- test("correlated nested WITH expression is not supported") {
+ test("correlated nested WITH expression is supported") {
val Seq(a, b) = testRelation.output
val outerCommonExprDef = CommonExpressionDef(b + b, CommonExpressionId(0))
val outerRef = new CommonExpressionRef(outerCommonExprDef)
+ val rewrittenOuterExpr = (b + b).as("_common_expr_0")
// The inner expression definition references the outer expression
val commonExprDef1 = CommonExpressionDef(a + a + outerRef, CommonExpressionId(1))
val ref1 = new CommonExpressionRef(commonExprDef1)
val innerExpr1 = With(ref1 + ref1, Seq(commonExprDef1))
-
val outerExpr1 = With(outerRef + innerExpr1, Seq(outerCommonExprDef))
- intercept[SparkException](Optimizer.execute(testRelation.select(outerExpr1.as("col"))))
+ comparePlans(
+ Optimizer.execute(testRelation.select(outerExpr1.as("col"))),
+ testRelation
+ // The first Project contains the common expression of the outer With
+ .select(star(), rewrittenOuterExpr)
+ // The second Project contains the common expression of the inner With, which references
+ // the common expression of the outer With.
+ .select(star(), (a + a + $"_common_expr_0").as("_common_expr_1"))
+ // The final Project contains the final result expression, which references both common
+ // expressions.
+ .select(($"_common_expr_0" + ($"_common_expr_1" + $"_common_expr_1")).as("col"))
+ .analyze
+ )
- val commonExprDef2 = CommonExpressionDef(a + a)
+ val commonExprDef2 = CommonExpressionDef(a + a, CommonExpressionId(2))
val ref2 = new CommonExpressionRef(commonExprDef2)
// The inner main expression references the outer expression
- val innerExpr2 = With(ref2 + outerRef, Seq(commonExprDef1))
-
+ val innerExpr2 = With(ref2 + outerRef, Seq(commonExprDef2))
val outerExpr2 = With(outerRef + innerExpr2, Seq(outerCommonExprDef))
- intercept[SparkException](Optimizer.execute(testRelation.select(outerExpr2.as("col"))))
+ comparePlans(
+ Optimizer.execute(testRelation.select(outerExpr2.as("col"))),
+ testRelation
+ // The first Project contains the common expression of the outer With
+ .select(star(), rewrittenOuterExpr)
+ // The second Project contains the common expression of the inner With, which does not
+ // references the common expression of the outer With.
Review Comment:
nit: references -> reference
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-48416][SQL] Support nested correlated With expression [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #49093:
URL: https://github.com/apache/spark/pull/49093#issuecomment-2540218464
thanks for the review, merging to master!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org