Leave default value of numPartitions to Scala code.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/e85af507 Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/e85af507 Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/e85af507 Branch: refs/heads/master Commit: e85af507671d417724c28ee2db499fc019feb1d8 Parents: c82d4f0 Author: Binh Nguyen <[email protected]> Authored: Tue Dec 10 11:01:56 2013 -0800 Committer: Binh Nguyen <[email protected]> Committed: Tue Dec 10 11:04:14 2013 -0800 ---------------------------------------------------------------------- .../scala/org/apache/spark/api/java/JavaPairRDD.scala | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/e85af507/core/src/main/scala/org/apache/spark/api/java/JavaPairRDD.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/api/java/JavaPairRDD.scala b/core/src/main/scala/org/apache/spark/api/java/JavaPairRDD.scala index 36bd3e6..2d2b384 100644 --- a/core/src/main/scala/org/apache/spark/api/java/JavaPairRDD.scala +++ b/core/src/main/scala/org/apache/spark/api/java/JavaPairRDD.scala @@ -584,7 +584,9 @@ class JavaPairRDD[K, V](val rdd: RDD[(K, V)])(implicit val kManifest: ClassManif * order of the keys). */ def sortByKey(comp: Comparator[K], ascending: Boolean): JavaPairRDD[K, V] = { - sortByKey(comp, ascending, rdd.partitions.size) + // numPartitions should never be negative in practice so we can use -1 here to indicate that + // we want to use implementation's default value. + sortByKey(comp, ascending, -1) } /** @@ -598,7 +600,11 @@ class JavaPairRDD[K, V](val rdd: RDD[(K, V)])(implicit val kManifest: ClassManif override def compare(b: K) = comp.compare(a, b) } implicit def toOrdered(x: K): Ordered[K] = new KeyOrdering(x) - fromRDD(new OrderedRDDFunctions[K, V, (K, V)](rdd).sortByKey(ascending, numPartitions)) + if (numPartitions < 0) { + fromRDD(new OrderedRDDFunctions[K, V, (K, V)](rdd).sortByKey(ascending)) + } else { + fromRDD(new OrderedRDDFunctions[K, V, (K, V)](rdd).sortByKey(ascending, numPartitions)) + } } /**
