SPARK-1589: Fix the incorrect compare

zsxwing · rxin · commit 6ab7578067e3 · 2014-04-23T22:36:02.000-07:00
JIRA: https://issues.apache.org/jira/browse/SPARK-1589 Author: zsxwing <zsxwing@gmail.com> Closes #508 from zsxwing/SPARK-1589 and squashes the following commits: 570c67a [zsxwing] SPARK-1589: Fix the incorrect compare
diff --git a/core/src/main/scala/org/apache/spark/rdd/PairRDDFunctions.scala b/core/src/main/scala/org/apache/spark/rdd/PairRDDFunctions.scala
@@ -292,7 +292,11 @@ class PairRDDFunctions[K, V](self: RDD[(K, V)])
     if (keyClass.isArray && partitioner.isInstanceOf[HashPartitioner]) {
       throw new SparkException("Default partitioner cannot partition array keys.")
     }
-    if (self.partitioner == partitioner) self else new ShuffledRDD[K, V, (K, V)](self, partitioner)
+    if (self.partitioner == Some(partitioner)) {
+      self
+    } else {
+      new ShuffledRDD[K, V, (K, V)](self, partitioner)
+    }
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,11 @@ class PairRDDFunctions[K, V](self: RDD[(K, V)])`
`292`	`292`	`if (keyClass.isArray && partitioner.isInstanceOf[HashPartitioner]) {`
`293`	`293`	`throw new SparkException("Default partitioner cannot partition array keys.")`
`294`	`294`	`}`
`295`		`- if (self.partitioner == partitioner) self else new ShuffledRDD[K, V, (K, V)](self, partitioner)`
	`295`	`+ if (self.partitioner == Some(partitioner)) {`
	`296`	`+ self`
	`297`	`+ } else {`
	`298`	`+ new ShuffledRDD[K, V, (K, V)](self, partitioner)`
	`299`	`+ }`
`296`	`300`	`}`
`297`	`301`
`298`	`302`	`/**`