You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "agubichev (via GitHub)" <gi...@apache.org> on 2023/08/28 19:26:36 UTC
[GitHub] [spark] agubichev opened a new pull request, #42705: [SPARK-36191][SQL] Handle limit and order by in correlated scalar (lateral) subqueries
agubichev opened a new pull request, #42705:
URL: https://github.com/apache/spark/pull/42705
<!--
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
'core/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.
-->
### 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.
-->
### 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'.
-->
### 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.
-->
### 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.
-->
--
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
[GitHub] [spark] agubichev commented on a diff in pull request #42705: [SPARK-36191][SQL] Handle limit and order by in correlated scalar (lateral) subqueries
Posted by "agubichev (via GitHub)" <gi...@apache.org>.
agubichev commented on code in PR #42705:
URL: https://github.com/apache/spark/pull/42705#discussion_r1324666031
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/DecorrelateInnerQuery.scala:
##########
@@ -655,6 +655,39 @@ object DecorrelateInnerQuery extends PredicateHelper {
val newProject = Project(newProjectList ++ referencesToAdd, newChild)
(newProject, joinCond, outerReferenceMap)
+ case Limit(limit, input) =>
+ // LIMIT K (with potential ORDER BY) is decorrelated by computing K rows per every
+ // domain value via a row_number() window function. For example, for a subquery
+ // (SELECT T2.a FROM T2 WHERE T2.b = OuterReference(x) ORDER BY T2.c LIMIT 3)
+ // -- we need to get top 3 values of T2.a (ordering by T2.c) for every value of x.
+ // Following our general decorrelation procedure, 'x' is then replaced by T2.b, so the
+ // subquery is decorrelated as:
+ // SELECT * FROM (
+ // SELECT T2.a, row_number() OVER (PARTITION BY T2.b ORDER BY T2.c) AS rn FROM T2)
+ // WHERE rn <= 3
+ val (child, ordering) = input match {
+ case Sort(order, _, child) => (child, order)
+ case _ => (input, Seq())
+ }
+ val (newChild, joinCond, outerReferenceMap) =
+ decorrelate(child, parentOuterReferences, aggregated = true, underSetOp)
+ val collectedChildOuterReferences = collectOuterReferencesInPlanTree(child)
+ // Add outer references to the PARTITION BY clause
+ val partitionFields = collectedChildOuterReferences.map(outerReferenceMap(_)).toSeq
+ val orderByFields = replaceOuterReferences(ordering, outerReferenceMap)
+
+ val rowNumber = WindowExpression(RowNumber(),
+ WindowSpecDefinition(partitionFields, orderByFields,
+ SpecifiedWindowFrame(RowFrame, UnboundedPreceding, CurrentRow)))
+ val rowNumberAlias = Alias(rowNumber, "rn_" + NamedExpression.newExprId.id)()
Review Comment:
done
--
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
[GitHub] [spark] jchen5 commented on pull request #42705: [SPARK-36191][SQL] Handle limit and order by in correlated scalar (lateral) subqueries
Posted by "jchen5 (via GitHub)" <gi...@apache.org>.
jchen5 commented on PR #42705:
URL: https://github.com/apache/spark/pull/42705#issuecomment-1697694362
I need to do another pass over some of the code but looks good overall!
--
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
[GitHub] [spark] agubichev commented on a diff in pull request #42705: [SPARK-36191][SQL] Handle limit and order by in correlated scalar (lateral) subqueries
Posted by "agubichev (via GitHub)" <gi...@apache.org>.
agubichev commented on code in PR #42705:
URL: https://github.com/apache/spark/pull/42705#discussion_r1318785351
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/DecorrelateInnerQuery.scala:
##########
@@ -655,6 +655,39 @@ object DecorrelateInnerQuery extends PredicateHelper {
val newProject = Project(newProjectList ++ referencesToAdd, newChild)
(newProject, joinCond, outerReferenceMap)
+ case Limit(limit, input) =>
+ // LIMIT K (with potential ORDER BY) is decorrelated by computing K rows per every
+ // domain value via a row_number() window function. For example, for a subquery
+ // (SELECT T2.a FROM T2 WHERE T2.b = OuterReference(x) ORDER BY T2.c LIMIT 3)
+ // -- we need to get top 3 values of T2.a (ordering by T2.c) for every value of x.
+ // Following our general decorrelation procedure, 'x' is then replaced by T2.b, so the
+ // subquery is decorrelated as:
+ // SELECT * FROM (
+ // SELECT T2.a, row_number() OVER (PARTITION BY T2.b ORDER BY T2.c) AS rn FROM T2)
+ // WHERE rn <= 3
+ val (child, ordering) = input match {
+ case Sort(order, _, child) => (child, order)
+ case _ => (input, Seq())
+ }
+ val (newChild, joinCond, outerReferenceMap) =
+ decorrelate(child, parentOuterReferences, aggregated = true, underSetOp)
+ val collectedChildOuterReferences = collectOuterReferencesInPlanTree(child)
Review Comment:
outerReferenceMap only records keys involved in equivalences, sadly.
(see how we populate it in Filter above, and Join below)
--
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
[GitHub] [spark] jchen5 commented on a diff in pull request #42705: [SPARK-36191][SQL] Handle limit and order by in correlated scalar (lateral) subqueries
Posted by "jchen5 (via GitHub)" <gi...@apache.org>.
jchen5 commented on code in PR #42705:
URL: https://github.com/apache/spark/pull/42705#discussion_r1318771477
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/DecorrelateInnerQuery.scala:
##########
@@ -655,6 +655,39 @@ object DecorrelateInnerQuery extends PredicateHelper {
val newProject = Project(newProjectList ++ referencesToAdd, newChild)
(newProject, joinCond, outerReferenceMap)
+ case Limit(limit, input) =>
+ // LIMIT K (with potential ORDER BY) is decorrelated by computing K rows per every
+ // domain value via a row_number() window function. For example, for a subquery
+ // (SELECT T2.a FROM T2 WHERE T2.b = OuterReference(x) ORDER BY T2.c LIMIT 3)
+ // -- we need to get top 3 values of T2.a (ordering by T2.c) for every value of x.
+ // Following our general decorrelation procedure, 'x' is then replaced by T2.b, so the
+ // subquery is decorrelated as:
+ // SELECT * FROM (
+ // SELECT T2.a, row_number() OVER (PARTITION BY T2.b ORDER BY T2.c) AS rn FROM T2)
+ // WHERE rn <= 3
+ val (child, ordering) = input match {
+ case Sort(order, _, child) => (child, order)
+ case _ => (input, Seq())
+ }
+ val (newChild, joinCond, outerReferenceMap) =
+ decorrelate(child, parentOuterReferences, aggregated = true, underSetOp)
+ val collectedChildOuterReferences = collectOuterReferencesInPlanTree(child)
Review Comment:
Would this be the same as the outer refs in outerReferenceMap? Can we just use that instead of doing an extra traversal?
--
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
[GitHub] [spark] cloud-fan closed pull request #42705: [SPARK-36191][SQL] Handle limit and order by in correlated scalar (lateral) subqueries
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan closed pull request #42705: [SPARK-36191][SQL] Handle limit and order by in correlated scalar (lateral) subqueries
URL: https://github.com/apache/spark/pull/42705
--
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
[GitHub] [spark] cloud-fan commented on a diff in pull request #42705: [SPARK-36191][SQL] Handle limit and order by in correlated scalar (lateral) subqueries
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #42705:
URL: https://github.com/apache/spark/pull/42705#discussion_r1323967912
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/DecorrelateInnerQuery.scala:
##########
@@ -655,6 +655,39 @@ object DecorrelateInnerQuery extends PredicateHelper {
val newProject = Project(newProjectList ++ referencesToAdd, newChild)
(newProject, joinCond, outerReferenceMap)
+ case Limit(limit, input) =>
+ // LIMIT K (with potential ORDER BY) is decorrelated by computing K rows per every
+ // domain value via a row_number() window function. For example, for a subquery
+ // (SELECT T2.a FROM T2 WHERE T2.b = OuterReference(x) ORDER BY T2.c LIMIT 3)
+ // -- we need to get top 3 values of T2.a (ordering by T2.c) for every value of x.
+ // Following our general decorrelation procedure, 'x' is then replaced by T2.b, so the
+ // subquery is decorrelated as:
+ // SELECT * FROM (
+ // SELECT T2.a, row_number() OVER (PARTITION BY T2.b ORDER BY T2.c) AS rn FROM T2)
+ // WHERE rn <= 3
+ val (child, ordering) = input match {
+ case Sort(order, _, child) => (child, order)
+ case _ => (input, Seq())
+ }
+ val (newChild, joinCond, outerReferenceMap) =
+ decorrelate(child, parentOuterReferences, aggregated = true, underSetOp)
+ val collectedChildOuterReferences = collectOuterReferencesInPlanTree(child)
+ // Add outer references to the PARTITION BY clause
+ val partitionFields = collectedChildOuterReferences.map(outerReferenceMap(_)).toSeq
+ val orderByFields = replaceOuterReferences(ordering, outerReferenceMap)
+
+ val rowNumber = WindowExpression(RowNumber(),
+ WindowSpecDefinition(partitionFields, orderByFields,
+ SpecifiedWindowFrame(RowFrame, UnboundedPreceding, CurrentRow)))
+ val rowNumberAlias = Alias(rowNumber, "rn_" + NamedExpression.newExprId.id)()
Review Comment:
I'm not sure putting the id in the name is useful. We may refresh attribute ids in a query plan, and the id in name will be confusing. Shall we just use `rn`? The EXPLAIN command will print the Alias expr id, so having the id in the name is not useful.
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/DecorrelateInnerQuery.scala:
##########
@@ -655,6 +655,39 @@ object DecorrelateInnerQuery extends PredicateHelper {
val newProject = Project(newProjectList ++ referencesToAdd, newChild)
(newProject, joinCond, outerReferenceMap)
+ case Limit(limit, input) =>
+ // LIMIT K (with potential ORDER BY) is decorrelated by computing K rows per every
+ // domain value via a row_number() window function. For example, for a subquery
+ // (SELECT T2.a FROM T2 WHERE T2.b = OuterReference(x) ORDER BY T2.c LIMIT 3)
+ // -- we need to get top 3 values of T2.a (ordering by T2.c) for every value of x.
+ // Following our general decorrelation procedure, 'x' is then replaced by T2.b, so the
+ // subquery is decorrelated as:
+ // SELECT * FROM (
+ // SELECT T2.a, row_number() OVER (PARTITION BY T2.b ORDER BY T2.c) AS rn FROM T2)
+ // WHERE rn <= 3
+ val (child, ordering) = input match {
+ case Sort(order, _, child) => (child, order)
+ case _ => (input, Seq())
+ }
+ val (newChild, joinCond, outerReferenceMap) =
+ decorrelate(child, parentOuterReferences, aggregated = true, underSetOp)
+ val collectedChildOuterReferences = collectOuterReferencesInPlanTree(child)
+ // Add outer references to the PARTITION BY clause
+ val partitionFields = collectedChildOuterReferences.map(outerReferenceMap(_)).toSeq
+ val orderByFields = replaceOuterReferences(ordering, outerReferenceMap)
+
+ val rowNumber = WindowExpression(RowNumber(),
+ WindowSpecDefinition(partitionFields, orderByFields,
+ SpecifiedWindowFrame(RowFrame, UnboundedPreceding, CurrentRow)))
+ val rowNumberAlias = Alias(rowNumber, "rn_" + NamedExpression.newExprId.id)()
Review Comment:
I'm not sure putting the id in the name is useful. We may refresh attribute ids in a query plan, and the id in name will be confusing. Shall we just use `rn`? The EXPLAIN command will print the Alias expr id, so having the id in the name is duplicated.
--
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
[GitHub] [spark] cloud-fan commented on pull request #42705: [SPARK-36191][SQL] Handle limit and order by in correlated scalar (lateral) subqueries
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #42705:
URL: https://github.com/apache/spark/pull/42705#issuecomment-1714048488
cc @allisonwang-db as well
--
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
[GitHub] [spark] agubichev commented on pull request #42705: [SPARK-36191][SQL] Handle limit and order by in correlated scalar (lateral) subqueries
Posted by "agubichev (via GitHub)" <gi...@apache.org>.
agubichev commented on PR #42705:
URL: https://github.com/apache/spark/pull/42705#issuecomment-1710387296
@cloud-fan
--
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
[GitHub] [spark] cloud-fan commented on a diff in pull request #42705: [SPARK-36191][SQL] Handle limit and order by in correlated scalar (lateral) subqueries
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #42705:
URL: https://github.com/apache/spark/pull/42705#discussion_r1323967912
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/DecorrelateInnerQuery.scala:
##########
@@ -655,6 +655,39 @@ object DecorrelateInnerQuery extends PredicateHelper {
val newProject = Project(newProjectList ++ referencesToAdd, newChild)
(newProject, joinCond, outerReferenceMap)
+ case Limit(limit, input) =>
+ // LIMIT K (with potential ORDER BY) is decorrelated by computing K rows per every
+ // domain value via a row_number() window function. For example, for a subquery
+ // (SELECT T2.a FROM T2 WHERE T2.b = OuterReference(x) ORDER BY T2.c LIMIT 3)
+ // -- we need to get top 3 values of T2.a (ordering by T2.c) for every value of x.
+ // Following our general decorrelation procedure, 'x' is then replaced by T2.b, so the
+ // subquery is decorrelated as:
+ // SELECT * FROM (
+ // SELECT T2.a, row_number() OVER (PARTITION BY T2.b ORDER BY T2.c) AS rn FROM T2)
+ // WHERE rn <= 3
+ val (child, ordering) = input match {
+ case Sort(order, _, child) => (child, order)
+ case _ => (input, Seq())
+ }
+ val (newChild, joinCond, outerReferenceMap) =
+ decorrelate(child, parentOuterReferences, aggregated = true, underSetOp)
+ val collectedChildOuterReferences = collectOuterReferencesInPlanTree(child)
+ // Add outer references to the PARTITION BY clause
+ val partitionFields = collectedChildOuterReferences.map(outerReferenceMap(_)).toSeq
+ val orderByFields = replaceOuterReferences(ordering, outerReferenceMap)
+
+ val rowNumber = WindowExpression(RowNumber(),
+ WindowSpecDefinition(partitionFields, orderByFields,
+ SpecifiedWindowFrame(RowFrame, UnboundedPreceding, CurrentRow)))
+ val rowNumberAlias = Alias(rowNumber, "rn_" + NamedExpression.newExprId.id)()
Review Comment:
I'm not sure putting the id in the name is useful. We may refresh attribute ids in a query plan, and the id in name will be confusing. Shall we just use `rn`? The EXPLAIN result will print the Alias expr id, so having the id in the name is not useful.
--
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
[GitHub] [spark] allisonwang-db commented on a diff in pull request #42705: [SPARK-36191][SQL] Handle limit and order by in correlated scalar (lateral) subqueries
Posted by "allisonwang-db (via GitHub)" <gi...@apache.org>.
allisonwang-db commented on code in PR #42705:
URL: https://github.com/apache/spark/pull/42705#discussion_r1323305701
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala:
##########
@@ -1405,6 +1405,11 @@ trait CheckAnalysis extends PredicateHelper with LookupCatalog with QueryErrorsB
failOnInvalidOuterReference(g)
checkPlan(g.child, aggregated, canContainOuter)
+ // Correlated subquery can have a LIMIT clause
+ case l@Limit(_, input) =>
Review Comment:
```suggestion
case l @ Limit(_, input) =>
```
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/DecorrelateInnerQuery.scala:
##########
@@ -655,6 +655,39 @@ object DecorrelateInnerQuery extends PredicateHelper {
val newProject = Project(newProjectList ++ referencesToAdd, newChild)
(newProject, joinCond, outerReferenceMap)
+ case Limit(limit, input) =>
+ // LIMIT K (with potential ORDER BY) is decorrelated by computing K rows per every
+ // domain value via a row_number() window function. For example, for a subquery
+ // (SELECT T2.a FROM T2 WHERE T2.b = OuterReference(x) ORDER BY T2.c LIMIT 3)
+ // -- we need to get top 3 values of T2.a (ordering by T2.c) for every value of x.
+ // Following our general decorrelation procedure, 'x' is then replaced by T2.b, so the
+ // subquery is decorrelated as:
+ // SELECT * FROM (
Review Comment:
Great explanation here!
##########
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/DecorrelateInnerQuerySuite.scala:
##########
@@ -59,6 +59,25 @@ class DecorrelateInnerQuerySuite extends PlanTest {
joinCond.zip(conditions).foreach(e => compareExpressions(e._1, e._2))
}
+ private def check(
+ outputPlan: LogicalPlan,
+ joinCond: Seq[Expression],
+ correctAnswer: LogicalPlan,
+ conditions: Seq[Expression]): Unit = {
+ assert(!hasOuterReferences(outputPlan))
Review Comment:
nit: indent
```suggestion
private def check(
outputPlan: LogicalPlan,
joinCond: Seq[Expression],
correctAnswer: LogicalPlan,
conditions: Seq[Expression]): Unit = {
assert(!hasOuterReferences(outputPlan))
```
--
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
[GitHub] [spark] jchen5 commented on a diff in pull request #42705: [SPARK-36191][SQL] Handle limit and order by in correlated scalar (lateral) subqueries
Posted by "jchen5 (via GitHub)" <gi...@apache.org>.
jchen5 commented on code in PR #42705:
URL: https://github.com/apache/spark/pull/42705#discussion_r1309009616
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/DecorrelateInnerQuery.scala:
##########
@@ -655,6 +655,41 @@ object DecorrelateInnerQuery extends PredicateHelper {
val newProject = Project(newProjectList ++ referencesToAdd, newChild)
(newProject, joinCond, outerReferenceMap)
+ case global @ GlobalLimit(limit, local @ LocalLimit(localLimit, input)) =>
Review Comment:
Can we use `Limit` extractor here? That also checks that they match like you're doing below.
--
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
[GitHub] [spark] agubichev commented on a diff in pull request #42705: [SPARK-36191][SQL] Handle limit and order by in correlated scalar (lateral) subqueries
Posted by "agubichev (via GitHub)" <gi...@apache.org>.
agubichev commented on code in PR #42705:
URL: https://github.com/apache/spark/pull/42705#discussion_r1309322074
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/DecorrelateInnerQuery.scala:
##########
@@ -655,6 +655,41 @@ object DecorrelateInnerQuery extends PredicateHelper {
val newProject = Project(newProjectList ++ referencesToAdd, newChild)
(newProject, joinCond, outerReferenceMap)
+ case global @ GlobalLimit(limit, local @ LocalLimit(localLimit, input)) =>
Review Comment:
done
--
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
[GitHub] [spark] agubichev commented on pull request #42705: [SPARK-36191][SQL] Handle limit and order by in correlated scalar (lateral) subqueries
Posted by "agubichev (via GitHub)" <gi...@apache.org>.
agubichev commented on PR #42705:
URL: https://github.com/apache/spark/pull/42705#issuecomment-1716132670
> Thanks for adding this! Can we also enable certain PostgreSQL tests, such as `postgreSQL/join.sql`, and see if the results match?
>
> ```
> select * from
> text_tbl t1
> left join int8_tbl i8
> on i8.q2 = 123,
> lateral (select i8.q1, t2.f1 from text_tbl t2 limit 1) as ss
> where t1.f1 = ss.f1;
> ```
Added several tests from there and verified results against PostgreSQL
--
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
[GitHub] [spark] agubichev commented on pull request #42705: [SPARK-36191][SQL] Handle limit and order by in correlated scalar (lateral) subqueries
Posted by "agubichev (via GitHub)" <gi...@apache.org>.
agubichev commented on PR #42705:
URL: https://github.com/apache/spark/pull/42705#issuecomment-1698084119
> Can we also add some test cases where there are already window funcs in the subquery as well?
done
--
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
[GitHub] [spark] cloud-fan commented on pull request #42705: [SPARK-36191][SQL] Handle limit and order by in correlated scalar (lateral) subqueries
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #42705:
URL: https://github.com/apache/spark/pull/42705#issuecomment-1716940529
The failure in `ReattachableExecuteSuite` is unrelated, I'm merging it to master, thanks!
--
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
[GitHub] [spark] agubichev commented on a diff in pull request #42705: [SPARK-36191][SQL] Handle limit and order by in correlated scalar (lateral) subqueries
Posted by "agubichev (via GitHub)" <gi...@apache.org>.
agubichev commented on code in PR #42705:
URL: https://github.com/apache/spark/pull/42705#discussion_r1323346187
##########
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/DecorrelateInnerQuerySuite.scala:
##########
@@ -59,6 +59,25 @@ class DecorrelateInnerQuerySuite extends PlanTest {
joinCond.zip(conditions).foreach(e => compareExpressions(e._1, e._2))
}
+ private def check(
+ outputPlan: LogicalPlan,
+ joinCond: Seq[Expression],
+ correctAnswer: LogicalPlan,
+ conditions: Seq[Expression]): Unit = {
+ assert(!hasOuterReferences(outputPlan))
Review Comment:
done
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala:
##########
@@ -1405,6 +1405,11 @@ trait CheckAnalysis extends PredicateHelper with LookupCatalog with QueryErrorsB
failOnInvalidOuterReference(g)
checkPlan(g.child, aggregated, canContainOuter)
+ // Correlated subquery can have a LIMIT clause
+ case l@Limit(_, input) =>
Review Comment:
done
--
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-36191][SQL] Handle limit and order by in correlated scalar (lateral) subqueries [spark]
Posted by "MyqueWooMiddo (via GitHub)" <gi...@apache.org>.
MyqueWooMiddo commented on PR #42705:
URL: https://github.com/apache/spark/pull/42705#issuecomment-2011307828
So , in the latest version (3.5.1) , spark still don't support lateral with LIMIT clause. It's good performance for 1-N-N similar to postgres "https://postgis.net/workshops/postgis-intro/knn.html"
--
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