[SPARK-51820][FOLLOWUP][CONNECT] Replace literal in SortOrder only under Sort operator
#52189
+80
−6
Conversation
This file contains hidden or 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
mihailotim-db
force-pushed
the
mihailotim-db/fix_window_ordinal
branch
from
6ced69c to
7f033b1
Compare
mihailotim-db
force-pushed
the
mihailotim-db/fix_window_ordinal
branch
from
7f033b1 to
f3530ab
Compare
mihailotim-db
changed the title
SortOrder only under Sort operator
vladimirg-db
reviewed
Sep 2, 2025
| @@ -1752,7 +1752,8 @@ class SparkConnectPlanner( | |||
| transformUnresolvedExtractValue(exp.getUnresolvedExtractValue) | |||
| case proto.Expression.ExprTypeCase.UPDATE_FIELDS => | |||
| transformUpdateFields(exp.getUpdateFields) | |||
| case proto.Expression.ExprTypeCase.SORT_ORDER => transformSortOrder(exp.getSortOrder) | |||
| case proto.Expression.ExprTypeCase.SORT_ORDER => | |||
| transformSortOrder(order = exp.getSortOrder, shouldReplaceOrdinals = false) | |||
There was a problem hiding this comment.
So using ordinals in ORDER BY in window operator is not possible both in DF and in SQL?
There was a problem hiding this comment.
Yeah, ORDER BY 1 in window is just order by literal
vladimirg-db
reviewed
Sep 2, 2025
| @@ -962,6 +962,69 @@ class SparkConnectPlannerSuite extends SparkFunSuite with SparkConnectPlanTest { | |||
| !aggregateExpression.containsPattern(TreePattern.UNRESOLVED_ORDINAL))) | |||
| } | |||
|
|
|||
| test("SPARK-51820 Literals in SortOrder should only be replaced under Sort node") { | |||
There was a problem hiding this comment.
I wonder why add a low-level proto test and not a high-level DF test?
There was a problem hiding this comment.
To force Spark Connect, otherwise it goes through Dataset.scala API
vladimirg-db
approved these changes
Sep 2, 2025
cloud-fan
approved these changes
Sep 2, 2025
|
thanks, merging to master! |
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?
Replace literal in
SortOrderonly underSortoperatorWhy are the changes needed?
SPARK-51820 introduced a bug where literal under all
SortOrderexpressions were treated as ordinals, breaking Windows in Spark Connect. This PR fixes that.Does this PR introduce any user-facing change?
No
How was this patch tested?
Added a test case
Was this patch authored or co-authored using generative AI tooling?
No