[SPARK-45036][FOLLOWUP][SQL] SPJ: Make sure result partitions are sorted according to partition values #42839
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
viirya
reviewed
Sep 6, 2023
.../src/main/scala/org/apache/spark/sql/execution/datasources/v2/DataSourceV2ScanExecBase.scala
Outdated
Show resolved
Hide resolved
viirya
approved these changes
Sep 6, 2023
Hisoka-X
approved these changes
Sep 7, 2023
Member
dongjoon-hyun
left a comment
dongjoon-hyun
left a comment
There was a problem hiding this comment.
Could you re-trigger the CI again, @sunchao ?
LuciferYang
reviewed
Sep 7, 2023
| val sortedKeyToPartitions = results.sorted(partitionOrdering) | ||
| val groupedPartitions = sortedKeyToPartitions | ||
| val rowOrdering = RowOrdering.createNaturalAscendingOrdering(partitionDataTypes) | ||
| val sortedKeyToPartitions = results.sorted(rowOrdering.on(_._1)) |
Contributor
There was a problem hiding this comment.
Suggested change
| val sortedKeyToPartitions = results.sorted(rowOrdering.on(_._1)) | |
| val sortedKeyToPartitions = results.sorted(rowOrdering.on((t: (InternalRow, _)) => t._1)) |
Contributor
There was a problem hiding this comment.
To fix Scala 2.13 build
[error] /home/runner/work/spark/spark/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/DataSourceV2ScanExecBase.scala:147:67: missing parameter type for expanded function ((<x$7: error>) => x$7._1)
[error] val sortedKeyToPartitions = results.sorted(rowOrdering.on(_._1))
Member
Author
There was a problem hiding this comment.
oops didn't realize it doesn't compile this way.
| .groupBy(_._1) | ||
| .toSeq | ||
| .map { case (key, s) => KeyGroupedPartition(key.row, s.map(_._2)) } | ||
| .sorted(rowOrdering.on(_.value)) |
Contributor
There was a problem hiding this comment.
Suggested change
| .sorted(rowOrdering.on(_.value)) | |
| .sorted(rowOrdering.on((k: KeyGroupedPartition) => k.value)) |
Contributor
|
Merged into master. Thanks @sunchao @viirya @dongjoon-hyun @Hisoka-X |
Member
|
Thank you, all! |
szehon-ho
pushed a commit
to szehon-ho/spark
that referenced
this pull request
Feb 7, 2024
…ted according to partition values ### What changes were proposed in this pull request? This PR makes sure the result grouped partitions from `DataSourceV2ScanExec#groupPartitions` are sorted according to the partition values. Previously in the apache#42757 we were assuming Scala would preserve the input ordering but apparently that's not the case. ### Why are the changes needed? See apache#42757 (comment) for diagnosis. The partition ordering is a fundamental property for SPJ and thus must be guaranteed. ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? We have tests in `KeyGroupedPartitioningSuite` to cover this. ### Was this patch authored or co-authored using generative AI tooling? Closes apache#42839 from sunchao/SPARK-45036-followup. Authored-by: Chao Sun <[email protected]> Signed-off-by: yangjie01 <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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 PR makes sure the result grouped partitions from
DataSourceV2ScanExec#groupPartitionsare sorted according to the partition values. Previously in the #42757 we were assuming Scala would preserve the input ordering but apparently that's not the case.Why are the changes needed?
See #42757 (comment) for diagnosis. The partition ordering is a fundamental property for SPJ and thus must be guaranteed.
Does this PR introduce any user-facing change?
No
How was this patch tested?
We have tests in
KeyGroupedPartitioningSuiteto cover this.Was this patch authored or co-authored using generative AI tooling?