diff options
author | Binh Nguyen <bnguyen@palantir.com> | 2013-12-10 11:17:52 -0800 |
---|---|---|
committer | Binh Nguyen <bnguyen@palantir.com> | 2013-12-10 11:17:52 -0800 |
commit | 0b494f7db47cf1de35aaed046f21bbb3592c3d97 (patch) | |
tree | 97dc02965040b576a5f67ff9e6a43170cdab69ab /core | |
parent | e85af507671d417724c28ee2db499fc019feb1d8 (diff) | |
download | spark-0b494f7db47cf1de35aaed046f21bbb3592c3d97.tar.gz spark-0b494f7db47cf1de35aaed046f21bbb3592c3d97.tar.bz2 spark-0b494f7db47cf1de35aaed046f21bbb3592c3d97.zip |
Hook directly to Scala API
Diffstat (limited to 'core')
-rw-r--r-- | core/src/main/scala/org/apache/spark/api/java/JavaPairRDD.scala | 14 |
1 files changed, 6 insertions, 8 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 2d2b3847de..d0ca289a6c 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,9 +584,11 @@ 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] = { - // 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) + class KeyOrdering(val a: K) extends Ordered[K] { + 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)) } /** @@ -600,11 +602,7 @@ 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) - 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)) - } + fromRDD(new OrderedRDDFunctions[K, V, (K, V)](rdd).sortByKey(ascending, numPartitions)) } /** |