Merge remote-tracking branch 'origin/shuffle-spec-direct-partition' into shuffle-spec-direct-partition

Author: shujingyang-db

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

@@ -166,7 +166,7 @@ case class EnsureRequirements(
       //   1. There are exactly two children (e.g., join). Note that Spark doesn't support
       //      multi-way join at the moment, so this check should be sufficient.
       //   2. All children are of the compatible key group partitioning or
-      //    compatible shuffle partition id pass through partitioning
+      //      compatible shuffle partition id pass through partitioning
       // If both are true, skip shuffle.
       val areChildrenCompatible = parent.isDefined &&
           children.length == 2 && childrenIndexes.length == 2 && {

sql/core/src/test/scala/org/apache/spark/sql/execution/exchange/EnsureRequirementsSuite.scala

@@ -1280,7 +1280,7 @@ class EnsureRequirementsSuite extends SharedSparkSession {
           SortExec(_, _, ShuffleExchangeExec(_: HashPartitioning, _, _, _), _),
           SortExec(_, _, _: DummySparkPlan, _), _) =>
           // Left side shuffled, right side kept as-is
-        case other => fail(s"Expected shuffle on at least one side, but got: $other")
+        case other => fail(s"Expected shuffle on the left side, but got: $other")
       }
     }
   }