cloud-fan commented on code in PR #52153:
URL: https://github.com/apache/spark/pull/52153#discussion_r2315074175
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicLogicalOperators.scala:
##########
@@ -1871,19 +1871,29 @@ trait HasPartitionExpressions extends SQLConfHelper {
protected def partitioning: Partitioning = if (partitionExpressions.isEmpty)
{
RoundRobinPartitioning(numPartitions)
} else {
- val (sortOrder, nonSortOrder) =
partitionExpressions.partition(_.isInstanceOf[SortOrder])
- require(sortOrder.isEmpty || nonSortOrder.isEmpty,
- s"${getClass.getSimpleName} expects that either all its
`partitionExpressions` are of type " +
- "`SortOrder`, which means `RangePartitioning`, or none of them are
`SortOrder`, which " +
- "means `HashPartitioning`. In this case we have:" +
- s"""
- |SortOrder: $sortOrder
- |NonSortOrder: $nonSortOrder
- """.stripMargin)
- if (sortOrder.nonEmpty) {
- RangePartitioning(sortOrder.map(_.asInstanceOf[SortOrder]),
numPartitions)
+ val directShuffleExprs =
partitionExpressions.filter(_.isInstanceOf[DirectShufflePartitionID])
+ if (directShuffleExprs.nonEmpty) {
+ require(directShuffleExprs.length == 1 && partitionExpressions.length ==
1,
Review Comment:
actually we can use assert here, as our public APIs guarantees it.
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicLogicalOperators.scala:
##########
@@ -1871,19 +1871,29 @@ trait HasPartitionExpressions extends SQLConfHelper {
protected def partitioning: Partitioning = if (partitionExpressions.isEmpty)
{
RoundRobinPartitioning(numPartitions)
} else {
- val (sortOrder, nonSortOrder) =
partitionExpressions.partition(_.isInstanceOf[SortOrder])
- require(sortOrder.isEmpty || nonSortOrder.isEmpty,
- s"${getClass.getSimpleName} expects that either all its
`partitionExpressions` are of type " +
- "`SortOrder`, which means `RangePartitioning`, or none of them are
`SortOrder`, which " +
- "means `HashPartitioning`. In this case we have:" +
- s"""
- |SortOrder: $sortOrder
- |NonSortOrder: $nonSortOrder
- """.stripMargin)
- if (sortOrder.nonEmpty) {
- RangePartitioning(sortOrder.map(_.asInstanceOf[SortOrder]),
numPartitions)
+ val directShuffleExprs =
partitionExpressions.filter(_.isInstanceOf[DirectShufflePartitionID])
+ if (directShuffleExprs.nonEmpty) {
+ require(directShuffleExprs.length == 1 && partitionExpressions.length ==
1,
Review Comment:
actually we can use assert here, as our public APIs guarantee it.
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
