SPARK-1589: Fix the incorrect compare

zsxwing · zsxwing · commit 570c67a1432f · 2014-04-24T11:09:39.000+08:00
diff --git a/core/src/main/scala/org/apache/spark/rdd/PairRDDFunctions.scala b/core/src/main/scala/org/apache/spark/rdd/PairRDDFunctions.scala
@@ -291,7 +291,11 @@ class PairRDDFunctions[K: ClassTag, V: ClassTag](self: RDD[(K, V)])
     if (getKeyClass().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
`@@ -291,7 +291,11 @@ class PairRDDFunctions[K: ClassTag, V: ClassTag](self: RDD[(K, V)])`
`291`	`291`	`if (getKeyClass().isArray && partitioner.isInstanceOf[HashPartitioner]) {`
`292`	`292`	`throw new SparkException("Default partitioner cannot partition array keys.")`
`293`	`293`	`}`
`294`		`- if (self.partitioner == partitioner) self else new ShuffledRDD[K, V, (K, V)](self, partitioner)`
	`294`	`+ if (self.partitioner == Some(partitioner)) {`
	`295`	`+ self`
	`296`	`+ } else {`
	`297`	`+ new ShuffledRDD[K, V, (K, V)](self, partitioner)`
	`298`	`+ }`
`295`	`299`	`}`
`296`	`300`
`297`	`301`	`/**`