[SPARK-35703][SQL][FOLLOWUP] ValidateRequirements should check the co-partitioning requirement #35225
Conversation
This file contains 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
cloud-fan
commented
Jan 17, 2022
| @@ -441,7 +441,7 @@ case class HashShuffleSpec( | |||
| distribution.clustering.zipWithIndex.foreach { case (distKey, distKeyPos) => | |||
| distKeyToPos.getOrElseUpdate(distKey.canonicalized, mutable.BitSet.empty).add(distKeyPos) | |||
| } | |||
| partitioning.expressions.map(k => distKeyToPos(k.canonicalized)) | |||
| partitioning.expressions.map(k => distKeyToPos.getOrElse(k.canonicalized, mutable.BitSet.empty)) | |||
There was a problem hiding this comment.
This change is needed to pass the new test: https://github.com/apache/spark/pull/35225/files#diff-dd5267ed90ff4f7191facb46157728eee14f225ae64dc867d095aa924444f8f1R78
sunchao
approved these changes
Jan 18, 2022
| val specs = children.map(_.outputPartitioning).zip(requiredChildDistributions).map { | ||
| case (p, d) => p.createShuffleSpec(d.asInstanceOf[ClusteredDistribution]) | ||
| } | ||
| specs.tail.forall(_.isCompatibleWith(specs.head)) |
There was a problem hiding this comment.
nit: maybe we can add a logDebug here too
There was a problem hiding this comment.
+1 for maintaining existing behavior.
c21
reviewed
Jan 19, 2022
| testValidate(Seq(1, 2), Seq(1, 0), Seq(1, 0), 5, 5, false) | ||
| } | ||
|
|
||
| test("SMJ requirements not satisfied with unequal partition number") { |
There was a problem hiding this comment.
It would be nice to test for HashPartitioning(1) and AllTuples. I remember we had quite some bugs with AllTuples before. But this comment is non-blocking.
|
thanks for the review, 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?
This is a followup of #32875 . This PR updates
ValidateRequirementsto match the new change in the partitioning-distribution framework, and check the co-partitioning requirement for join nodes.Why are the changes needed?
Fix bugs in
ValidateRequirementsDoes this PR introduce any user-facing change?
no
How was this patch tested?
a new test suite