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/07 19:57:32 UTC
[GitHub] [spark] agubichev opened a new pull request, #42383: [SPARK-44549] Support window functions in correlated scalar subqueries
agubichev opened a new pull request, #42383:
URL: https://github.com/apache/spark/pull/42383
<!--
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.
-->
Support window functions in correlated scalar subqueries.
Support in IN/EXISTS subqueries will come after we migrate them into DecorrelateInnerQuery framework. In addition, correlation is not yet supported inside the window function itself.
### 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.
-->
Supports more subqueries.
### 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'.
-->
Yes, users can run more subqueries now.
### 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.
-->
Unit and query tests. The results of query tests were checked 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] allisonwang-db commented on a diff in pull request #42383: [SPARK-44549][SQL] Support window functions in correlated scalar subqueries
Posted by "allisonwang-db (via GitHub)" <gi...@apache.org>.
allisonwang-db commented on code in PR #42383:
URL: https://github.com/apache/spark/pull/42383#discussion_r1301949906
##########
sql/core/src/test/resources/sql-tests/inputs/subquery/exists-subquery/exists-aggregate.sql:
##########
@@ -118,3 +118,10 @@ WHERE NOT EXISTS (SELECT 1
FROM dept
WHERE emp.dept_id = dept.dept_id
GROUP BY dept.dept_id));
+
+-- Window functions are not supported in EXISTS subqueries yet
Review Comment:
Do we plan to make IN and EXISTS subqueries also use the new decorrelation framework?
--
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 #42383: [SPARK-44549][SQL] Support window functions in correlated scalar subqueries
Posted by "agubichev (via GitHub)" <gi...@apache.org>.
agubichev commented on code in PR #42383:
URL: https://github.com/apache/spark/pull/42383#discussion_r1300527734
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/DecorrelateInnerQuery.scala:
##########
@@ -654,6 +654,25 @@ object DecorrelateInnerQuery extends PredicateHelper {
val newProject = Project(newProjectList ++ referencesToAdd, newChild)
(newProject, joinCond, outerReferenceMap)
+ case w@Window(projectList, partitionSpec, orderSpec, child) =>
+ val outerReferences = collectOuterReferences(w.expressions)
+ assert(outerReferences.isEmpty, s"Correlated column is not allowed in window " +
+ s"function: $w")
+ val newOuterReferences = parentOuterReferences ++ outerReferences
+ val (newChild, joinCond, outerReferenceMap) =
+ decorrelate(child, newOuterReferences, aggregated = true, underSetOp)
Review Comment:
we already have a test like that, see join-lateral.sql line 187:
https://github.com/apache/spark/pull/42383/files#diff-d8634e1fa795909252ff1b65501896fb5402befbad4ec9be86dfd840c5d3cfeaR187
--
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 #42383: [SPARK-44549][SQL] Support window functions in correlated scalar subqueries
Posted by "agubichev (via GitHub)" <gi...@apache.org>.
agubichev commented on code in PR #42383:
URL: https://github.com/apache/spark/pull/42383#discussion_r1300497152
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/DecorrelateInnerQuery.scala:
##########
@@ -654,6 +654,25 @@ object DecorrelateInnerQuery extends PredicateHelper {
val newProject = Project(newProjectList ++ referencesToAdd, newChild)
(newProject, joinCond, outerReferenceMap)
+ case w@Window(projectList, partitionSpec, orderSpec, child) =>
+ val outerReferences = collectOuterReferences(w.expressions)
+ assert(outerReferences.isEmpty, s"Correlated column is not allowed in window " +
+ s"function: $w")
+ val newOuterReferences = parentOuterReferences ++ outerReferences
+ val (newChild, joinCond, outerReferenceMap) =
+ decorrelate(child, newOuterReferences, aggregated = true, underSetOp)
+ val newProjectList = replaceOuterReferences(projectList, outerReferenceMap)
+ val newPartitionSpec = replaceOuterReferences(partitionSpec, outerReferenceMap)
+ val newOrderSpec = replaceOuterReferences(orderSpec, outerReferenceMap)
Review Comment:
added a comment
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/DecorrelateInnerQuery.scala:
##########
@@ -654,6 +654,25 @@ object DecorrelateInnerQuery extends PredicateHelper {
val newProject = Project(newProjectList ++ referencesToAdd, newChild)
(newProject, joinCond, outerReferenceMap)
+ case w@Window(projectList, partitionSpec, orderSpec, child) =>
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 a diff in pull request #42383: [SPARK-44549][SQL] Support window functions in correlated scalar subqueries
Posted by "agubichev (via GitHub)" <gi...@apache.org>.
agubichev commented on code in PR #42383:
URL: https://github.com/apache/spark/pull/42383#discussion_r1300496679
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/DecorrelateInnerQuery.scala:
##########
@@ -654,6 +654,25 @@ object DecorrelateInnerQuery extends PredicateHelper {
val newProject = Project(newProjectList ++ referencesToAdd, newChild)
(newProject, joinCond, outerReferenceMap)
+ case w@Window(projectList, partitionSpec, orderSpec, child) =>
+ val outerReferences = collectOuterReferences(w.expressions)
+ assert(outerReferences.isEmpty, s"Correlated column is not allowed in window " +
+ s"function: $w")
+ val newOuterReferences = parentOuterReferences ++ outerReferences
+ val (newChild, joinCond, outerReferenceMap) =
+ decorrelate(child, newOuterReferences, aggregated = true, underSetOp)
+ val newProjectList = replaceOuterReferences(projectList, outerReferenceMap)
+ val newPartitionSpec = replaceOuterReferences(partitionSpec, outerReferenceMap)
+ val newOrderSpec = replaceOuterReferences(orderSpec, outerReferenceMap)
+ val referencesToAdd = missingReferences(
+ newPartitionSpec.asInstanceOf[Seq[NamedExpression]],
Review Comment:
good point! as we don't allow correlation anywhere in the Window operator itself, it is enough to get the joinCond attributes.
--
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 #42383: [SPARK-44549][SQL] Support window functions in correlated scalar subqueries
Posted by "jchen5 (via GitHub)" <gi...@apache.org>.
jchen5 commented on code in PR #42383:
URL: https://github.com/apache/spark/pull/42383#discussion_r1300551631
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/DecorrelateInnerQuery.scala:
##########
@@ -654,6 +654,25 @@ object DecorrelateInnerQuery extends PredicateHelper {
val newProject = Project(newProjectList ++ referencesToAdd, newChild)
(newProject, joinCond, outerReferenceMap)
+ case w@Window(projectList, partitionSpec, orderSpec, child) =>
+ val outerReferences = collectOuterReferences(w.expressions)
+ assert(outerReferences.isEmpty, s"Correlated column is not allowed in window " +
+ s"function: $w")
+ val newOuterReferences = parentOuterReferences ++ outerReferences
+ val (newChild, joinCond, outerReferenceMap) =
+ decorrelate(child, newOuterReferences, aggregated = true, underSetOp)
+ val newProjectList = replaceOuterReferences(projectList, outerReferenceMap)
+ val newPartitionSpec = replaceOuterReferences(partitionSpec, outerReferenceMap)
+ val newOrderSpec = replaceOuterReferences(orderSpec, outerReferenceMap)
+ val referencesToAdd = missingReferences(
+ newPartitionSpec.asInstanceOf[Seq[NamedExpression]],
Review Comment:
The joinCond has both the inner and outer/domain attribute references, so I think this would duplicate some refs unnecessarily. I think we can do missingReferences(newProjectList, joinCond), similar to other cases.
--
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 #42383: [SPARK-44549][SQL] Support window functions in correlated scalar subqueries
Posted by "agubichev (via GitHub)" <gi...@apache.org>.
agubichev commented on code in PR #42383:
URL: https://github.com/apache/spark/pull/42383#discussion_r1301955745
##########
sql/core/src/test/resources/sql-tests/inputs/subquery/exists-subquery/exists-aggregate.sql:
##########
@@ -118,3 +118,10 @@ WHERE NOT EXISTS (SELECT 1
FROM dept
WHERE emp.dept_id = dept.dept_id
GROUP BY dept.dept_id));
+
+-- Window functions are not supported in EXISTS subqueries yet
Review Comment:
yes this is definitely planned for q3
--
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 #42383: [SPARK-44549][SQL] Support window functions in correlated scalar subqueries
Posted by "agubichev (via GitHub)" <gi...@apache.org>.
agubichev commented on code in PR #42383:
URL: https://github.com/apache/spark/pull/42383#discussion_r1300502131
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/DecorrelateInnerQuery.scala:
##########
@@ -654,6 +654,25 @@ object DecorrelateInnerQuery extends PredicateHelper {
val newProject = Project(newProjectList ++ referencesToAdd, newChild)
(newProject, joinCond, outerReferenceMap)
+ case w@Window(projectList, partitionSpec, orderSpec, child) =>
+ val outerReferences = collectOuterReferences(w.expressions)
+ assert(outerReferences.isEmpty, s"Correlated column is not allowed in window " +
+ s"function: $w")
+ val newOuterReferences = parentOuterReferences ++ outerReferences
+ val (newChild, joinCond, outerReferenceMap) =
+ decorrelate(child, newOuterReferences, aggregated = true, underSetOp)
Review Comment:
window function is not an aggregate, indeed. Moreover, the query that you want to try, should give a runtime exception (As there are >1 rows returned from the subquery, unless only 1 row satisfies the b >= d filter).
However, what i want to achieve by setting aggregate = true is to avoid pulling-up non-equi predicates from under the Window function to the join above. It is correct to do so for equi-predicates, but for non-equi in general we need to keep a domain join. Perhaps the `aggregate` input param should be renamed to reflect that it is about non-equi predicate treatment..
--
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 #42383: [SPARK-44549][SQL] Support window functions in correlated scalar subqueries
Posted by "jchen5 (via GitHub)" <gi...@apache.org>.
jchen5 commented on code in PR #42383:
URL: https://github.com/apache/spark/pull/42383#discussion_r1298613693
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/DecorrelateInnerQuery.scala:
##########
@@ -654,6 +654,25 @@ object DecorrelateInnerQuery extends PredicateHelper {
val newProject = Project(newProjectList ++ referencesToAdd, newChild)
(newProject, joinCond, outerReferenceMap)
+ case w@Window(projectList, partitionSpec, orderSpec, child) =>
+ val outerReferences = collectOuterReferences(w.expressions)
+ assert(outerReferences.isEmpty, s"Correlated column is not allowed in window " +
+ s"function: $w")
+ val newOuterReferences = parentOuterReferences ++ outerReferences
+ val (newChild, joinCond, outerReferenceMap) =
+ decorrelate(child, newOuterReferences, aggregated = true, underSetOp)
Review Comment:
The aggregated = true part probably deserves a comment, and should also edit
`// aggregated: a boolean flag indicating whether the result of the plan will be aggregated.`
to add that it includes window funcs.
Can we also add a test case that verifies this? I think something like this would probably test the behavior:
`SELECT *, (SELECT RANK() OVER(ORDER BY c) FROM t2 WHERE b >= d) FROM t1`
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/DecorrelateInnerQuery.scala:
##########
@@ -654,6 +654,25 @@ object DecorrelateInnerQuery extends PredicateHelper {
val newProject = Project(newProjectList ++ referencesToAdd, newChild)
(newProject, joinCond, outerReferenceMap)
+ case w@Window(projectList, partitionSpec, orderSpec, child) =>
+ val outerReferences = collectOuterReferences(w.expressions)
+ assert(outerReferences.isEmpty, s"Correlated column is not allowed in window " +
+ s"function: $w")
+ val newOuterReferences = parentOuterReferences ++ outerReferences
+ val (newChild, joinCond, outerReferenceMap) =
+ decorrelate(child, newOuterReferences, aggregated = true, underSetOp)
+ val newProjectList = replaceOuterReferences(projectList, outerReferenceMap)
+ val newPartitionSpec = replaceOuterReferences(partitionSpec, outerReferenceMap)
+ val newOrderSpec = replaceOuterReferences(orderSpec, outerReferenceMap)
+ val referencesToAdd = missingReferences(
+ newPartitionSpec.asInstanceOf[Seq[NamedExpression]],
Review Comment:
What about the project list and order spec?
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/DecorrelateInnerQuery.scala:
##########
@@ -654,6 +654,25 @@ object DecorrelateInnerQuery extends PredicateHelper {
val newProject = Project(newProjectList ++ referencesToAdd, newChild)
(newProject, joinCond, outerReferenceMap)
+ case w@Window(projectList, partitionSpec, orderSpec, child) =>
Review Comment:
nit: spaces around the @ ?
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/DecorrelateInnerQuery.scala:
##########
@@ -654,6 +654,25 @@ object DecorrelateInnerQuery extends PredicateHelper {
val newProject = Project(newProjectList ++ referencesToAdd, newChild)
(newProject, joinCond, outerReferenceMap)
+ case w@Window(projectList, partitionSpec, orderSpec, child) =>
+ val outerReferences = collectOuterReferences(w.expressions)
+ assert(outerReferences.isEmpty, s"Correlated column is not allowed in window " +
+ s"function: $w")
+ val newOuterReferences = parentOuterReferences ++ outerReferences
+ val (newChild, joinCond, outerReferenceMap) =
+ decorrelate(child, newOuterReferences, aggregated = true, underSetOp)
+ val newProjectList = replaceOuterReferences(projectList, outerReferenceMap)
+ val newPartitionSpec = replaceOuterReferences(partitionSpec, outerReferenceMap)
+ val newOrderSpec = replaceOuterReferences(orderSpec, outerReferenceMap)
Review Comment:
In CheckAnalysis you are blocking outer refs in the window itself, so these shouldn't be needed, right? Can leave it like this but add a comment.
--
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 #42383: [SPARK-44549][SQL] Support window functions in correlated scalar subqueries
Posted by "agubichev (via GitHub)" <gi...@apache.org>.
agubichev commented on code in PR #42383:
URL: https://github.com/apache/spark/pull/42383#discussion_r1300531777
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/DecorrelateInnerQuery.scala:
##########
@@ -654,6 +654,25 @@ object DecorrelateInnerQuery extends PredicateHelper {
val newProject = Project(newProjectList ++ referencesToAdd, newChild)
(newProject, joinCond, outerReferenceMap)
+ case w@Window(projectList, partitionSpec, orderSpec, child) =>
+ val outerReferences = collectOuterReferences(w.expressions)
+ assert(outerReferences.isEmpty, s"Correlated column is not allowed in window " +
+ s"function: $w")
+ val newOuterReferences = parentOuterReferences ++ outerReferences
+ val (newChild, joinCond, outerReferenceMap) =
+ decorrelate(child, newOuterReferences, aggregated = true, underSetOp)
Review Comment:
updated the comment
--
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 #42383: [SPARK-44549][SQL] Support window functions in correlated scalar subqueries
Posted by "agubichev (via GitHub)" <gi...@apache.org>.
agubichev commented on PR #42383:
URL: https://github.com/apache/spark/pull/42383#issuecomment-1686835787
> Can we also add test cases for window functions with:
>
> * in EXISTS
> * non-equality correlation cond
> * aggregate
added more tests
--
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 #42383: [SPARK-44549][SQL] Support window functions in correlated scalar subqueries
Posted by "jchen5 (via GitHub)" <gi...@apache.org>.
jchen5 commented on code in PR #42383:
URL: https://github.com/apache/spark/pull/42383#discussion_r1300501201
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/DecorrelateInnerQuery.scala:
##########
@@ -654,6 +654,25 @@ object DecorrelateInnerQuery extends PredicateHelper {
val newProject = Project(newProjectList ++ referencesToAdd, newChild)
(newProject, joinCond, outerReferenceMap)
+ case w@Window(projectList, partitionSpec, orderSpec, child) =>
+ val outerReferences = collectOuterReferences(w.expressions)
+ assert(outerReferences.isEmpty, s"Correlated column is not allowed in window " +
+ s"function: $w")
+ val newOuterReferences = parentOuterReferences ++ outerReferences
+ val (newChild, joinCond, outerReferenceMap) =
+ decorrelate(child, newOuterReferences, aggregated = true, underSetOp)
+ val newProjectList = replaceOuterReferences(projectList, outerReferenceMap)
+ val newPartitionSpec = replaceOuterReferences(partitionSpec, outerReferenceMap)
+ val newOrderSpec = replaceOuterReferences(orderSpec, outerReferenceMap)
+ val referencesToAdd = missingReferences(
+ newPartitionSpec.asInstanceOf[Seq[NamedExpression]],
Review Comment:
Don't we want to pass newProjectList instead of newPartitionSpec? Since those are the outputs from the window func.
--
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 #42383: [SPARK-44549][SQL] Support window functions in correlated scalar subqueries
Posted by "agubichev (via GitHub)" <gi...@apache.org>.
agubichev commented on code in PR #42383:
URL: https://github.com/apache/spark/pull/42383#discussion_r1300579827
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/DecorrelateInnerQuery.scala:
##########
@@ -654,6 +654,25 @@ object DecorrelateInnerQuery extends PredicateHelper {
val newProject = Project(newProjectList ++ referencesToAdd, newChild)
(newProject, joinCond, outerReferenceMap)
+ case w@Window(projectList, partitionSpec, orderSpec, child) =>
+ val outerReferences = collectOuterReferences(w.expressions)
+ assert(outerReferences.isEmpty, s"Correlated column is not allowed in window " +
+ s"function: $w")
+ val newOuterReferences = parentOuterReferences ++ outerReferences
+ val (newChild, joinCond, outerReferenceMap) =
+ decorrelate(child, newOuterReferences, aggregated = true, underSetOp)
+ val newProjectList = replaceOuterReferences(projectList, outerReferenceMap)
+ val newPartitionSpec = replaceOuterReferences(partitionSpec, outerReferenceMap)
+ val newOrderSpec = replaceOuterReferences(orderSpec, outerReferenceMap)
+ val referencesToAdd = missingReferences(
+ newPartitionSpec.asInstanceOf[Seq[NamedExpression]],
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] cloud-fan closed pull request #42383: [SPARK-44549][SQL] Support window functions in correlated scalar subqueries
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan closed pull request #42383: [SPARK-44549][SQL] Support window functions in correlated scalar subqueries
URL: https://github.com/apache/spark/pull/42383
--
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 #42383: [SPARK-44549][SQL] Support window functions in correlated scalar subqueries
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #42383:
URL: https://github.com/apache/spark/pull/42383#issuecomment-1690097815
thanks, 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
[GitHub] [spark] agubichev commented on a diff in pull request #42383: [SPARK-44549][SQL] Support window functions in correlated scalar subqueries
Posted by "agubichev (via GitHub)" <gi...@apache.org>.
agubichev commented on code in PR #42383:
URL: https://github.com/apache/spark/pull/42383#discussion_r1300509442
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/DecorrelateInnerQuery.scala:
##########
@@ -654,6 +654,25 @@ object DecorrelateInnerQuery extends PredicateHelper {
val newProject = Project(newProjectList ++ referencesToAdd, newChild)
(newProject, joinCond, outerReferenceMap)
+ case w@Window(projectList, partitionSpec, orderSpec, child) =>
+ val outerReferences = collectOuterReferences(w.expressions)
+ assert(outerReferences.isEmpty, s"Correlated column is not allowed in window " +
+ s"function: $w")
+ val newOuterReferences = parentOuterReferences ++ outerReferences
+ val (newChild, joinCond, outerReferenceMap) =
+ decorrelate(child, newOuterReferences, aggregated = true, underSetOp)
+ val newProjectList = replaceOuterReferences(projectList, outerReferenceMap)
+ val newPartitionSpec = replaceOuterReferences(partitionSpec, outerReferenceMap)
+ val newOrderSpec = replaceOuterReferences(orderSpec, outerReferenceMap)
+ val referencesToAdd = missingReferences(
+ newPartitionSpec.asInstanceOf[Seq[NamedExpression]],
Review Comment:
if the window function has no correlated params, then the diff between joinCond.attributes and projectList should be just joinCond.attributes, right?
--
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 #42383: [SPARK-44549][SQL] Support window functions in correlated scalar subqueries
Posted by "jchen5 (via GitHub)" <gi...@apache.org>.
jchen5 commented on code in PR #42383:
URL: https://github.com/apache/spark/pull/42383#discussion_r1300507642
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/DecorrelateInnerQuery.scala:
##########
@@ -654,6 +654,25 @@ object DecorrelateInnerQuery extends PredicateHelper {
val newProject = Project(newProjectList ++ referencesToAdd, newChild)
(newProject, joinCond, outerReferenceMap)
+ case w@Window(projectList, partitionSpec, orderSpec, child) =>
+ val outerReferences = collectOuterReferences(w.expressions)
+ assert(outerReferences.isEmpty, s"Correlated column is not allowed in window " +
+ s"function: $w")
+ val newOuterReferences = parentOuterReferences ++ outerReferences
+ val (newChild, joinCond, outerReferenceMap) =
+ decorrelate(child, newOuterReferences, aggregated = true, underSetOp)
Review Comment:
Yeah, I agree we need the logic of setting aggregated=true and that's fine. It's needed for correctness around outer ref substitution. And window funcs are doing something similar to aggregation, so I think it's ok as long as there's a comment.
You're right that this test case wouldn't work, how about the same thing but with a lateral join?
--
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