diff options
author | Binh Nguyen <bnguyen@palantir.com> | 2013-12-10 11:01:56 -0800 |
---|---|---|
committer | Binh Nguyen <bnguyen@palantir.com> | 2013-12-10 11:04:14 -0800 |
commit | e85af507671d417724c28ee2db499fc019feb1d8 (patch) | |
tree | 87bb329db9eaa03c9bb90e4e8f388ef7297ca4df /core/src/main/scala/org/apache | |
parent | c82d4f079bf84da06801419defe644f574d0b8d1 (diff) | |
download | spark-e85af507671d417724c28ee2db499fc019feb1d8.tar.gz spark-e85af507671d417724c28ee2db499fc019feb1d8.tar.bz2 spark-e85af507671d417724c28ee2db499fc019feb1d8.zip |
Leave default value of numPartitions to Scala code.
Diffstat (limited to 'core/src/main/scala/org/apache')
-rw-r--r-- | core/src/main/scala/org/apache/spark/api/java/JavaPairRDD.scala | 10 |
1 files changed, 8 insertions, 2 deletions
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 36bd3e673f..2d2b3847de 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)) + } } /** |