comments

Author: shujingyang-db

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/ShuffleSpecSuite.scala

@@ -25,6 +25,9 @@ import org.apache.spark.sql.catalyst.plans.physical._
 import org.apache.spark.sql.internal.SQLConf
 
 class ShuffleSpecSuite extends SparkFunSuite with SQLHelper {
+  private val passThrough_a_10 = ShufflePartitionIdPassThrough(DirectShufflePartitionID($"a"), 10)
+  private val passThrough_b_10 = ShufflePartitionIdPassThrough(DirectShufflePartitionID($"b"), 10)
+  private val passThrough_c_10 = ShufflePartitionIdPassThrough(DirectShufflePartitionID($"c"), 10)
   protected def checkCompatible(
       left: ShuffleSpec,
       right: ShuffleSpec,
@@ -484,12 +487,11 @@ class ShuffleSpecSuite extends SparkFunSuite with SQLHelper {
   test("compatibility: ShufflePartitionIdPassThroughSpec on both sides") {
     val ab = ClusteredDistribution(Seq($"a", $"b"))
     val cd = ClusteredDistribution(Seq($"c", $"d"))
-    val passThrough_a_10 = ShufflePartitionIdPassThrough(DirectShufflePartitionID($"a"), 10)
 
     // Identical specs should be compatible
     checkCompatible(
       passThrough_a_10.createShuffleSpec(ab),
-      ShufflePartitionIdPassThrough(DirectShufflePartitionID($"c"), 10).createShuffleSpec(cd),
+      passThrough_c_10.createShuffleSpec(cd),
       expected = true
     )
 
@@ -502,23 +504,22 @@ class ShuffleSpecSuite extends SparkFunSuite with SQLHelper {
 
     // Mismatched key positions should be incompatible
     checkCompatible(
-      ShufflePartitionIdPassThrough(DirectShufflePartitionID($"b"), 10).createShuffleSpec(ab),
-      ShufflePartitionIdPassThrough(DirectShufflePartitionID($"c"), 10).createShuffleSpec(cd),
+      passThrough_b_10.createShuffleSpec(ab),
+      passThrough_c_10.createShuffleSpec(cd),
       expected = false
     )
 
     // Mismatched clustering keys
     checkCompatible(
       passThrough_a_10.createShuffleSpec(ClusteredDistribution(Seq($"e", $"b"))),
-      ShufflePartitionIdPassThrough(DirectShufflePartitionID($"c"), 10).createShuffleSpec(ab),
+      passThrough_c_10.createShuffleSpec(ab),
       expected = false
     )
   }
 
   test("compatibility: ShufflePartitionIdPassThroughSpec vs other specs") {
     val ab = ClusteredDistribution(Seq($"a", $"b"))
     val cd = ClusteredDistribution(Seq($"c", $"d"))
-    val passThrough_a_10 = ShufflePartitionIdPassThrough(DirectShufflePartitionID($"a"), 10)
 
     // Compatibility with SinglePartitionShuffleSpec when numPartitions is 1
     checkCompatible(

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

@@ -165,7 +165,7 @@ case class EnsureRequirements(
       // Check if the following conditions are satisfied:
       //   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 
+      //   2. All children are of the compatible key group partitioning or
       //    compatible shuffle partition id pass through partitioning
       // If both are true, skip shuffle.
       val areChildrenCompatible = parent.isDefined &&

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

@@ -1217,7 +1217,7 @@ class EnsureRequirementsSuite extends SharedSparkSession {
             ) =>
           assert(leftKeys === Seq(exprA))
           assert(rightKeys === Seq(exprA))
-        case other => fail(s"We don't expect shuffle on neither sides, but got: $other")
+        case other => fail(s"We don't expect shuffle on either side, but got: $other")
       }
     }
   }
@@ -1328,7 +1328,7 @@ class EnsureRequirementsSuite extends SharedSparkSession {
             ) =>
           assert(leftKeys === Seq(exprA, exprB))
           assert(rightKeys === Seq(exprA, exprB))
-        case other => fail(s"We don't expect shuffle on neither sides with multiple " +
+        case other => fail(s"We don't expect shuffle on either side with multiple " +
           s"clustering keys, but got: $other")
       }