Skip to content

Commit 2e5d819

Browse files
committed
address review findings
1 parent 9e3085f commit 2e5d819

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

sql/core/src/main/scala/org/apache/spark/sql/execution/exchange/EnsureRequirements.scala

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -517,15 +517,18 @@ case class EnsureRequirements(
517517
val (rightReducedDataTypes, rightReducedKeys) = rightReducers.fold(
518518
(rightPartitioning.expressionDataTypes, rightPartitioning.partitionKeys)
519519
)(rightPartitioning.reduceKeys)
520-
if (leftReducedDataTypes != rightReducedDataTypes) {
520+
val commonReducedDataTypes = if (leftReducedDataTypes == rightReducedDataTypes) {
521+
leftReducedDataTypes
522+
} else {
521523
throw QueryExecutionErrors.storagePartitionJoinIncompatibleReducedTypesError(
522524
leftReducers = leftReducers,
523525
leftReducedDataTypes = leftReducedDataTypes,
524526
rightReducers = rightReducers,
525527
rightReducedDataTypes = rightReducedDataTypes)
526528
}
527529

528-
val reducedKeyRowOrdering = RowOrdering.createNaturalAscendingOrdering(leftReducedDataTypes)
530+
val reducedKeyRowOrdering =
531+
RowOrdering.createNaturalAscendingOrdering(commonReducedDataTypes)
529532
val reducedKeyOrdering =
530533
reducedKeyRowOrdering.on((t: InternalRowComparableWrapper) => t.row)
531534

sql/core/src/test/scala/org/apache/spark/sql/connector/KeyGroupedPartitioningSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class KeyGroupedPartitioningSuite extends DistributionAndOrderingSuiteBase with
8888
(id, oldFn)
8989
}
9090
try f finally {
91-
oldFns.foreach { case (id, oldFn ) =>
91+
oldFns.foreach { case (id, oldFn) =>
9292
catalog.dropFunction(id)
9393
oldFn.foreach(catalog.createFunction(id, _))
9494
}

0 commit comments

Comments
 (0)