From 0b494f7db47cf1de35aaed046f21bbb3592c3d97 Mon Sep 17 00:00:00 2001
From: Binh Nguyen <bnguyen@palantir.com>
Date: Tue, 10 Dec 2013 11:17:52 -0800
Subject: [PATCH] Hook directly to Scala API
---
.../org/apache/spark/api/java/JavaPairRDD.scala | 14 ++++++--------
1 file 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))
}
/**
--
GitLab