From f67753cdfcb08b3786320c45af98e097a8ed5d39 Mon Sep 17 00:00:00 2001 From: Ali Ghodsi Date: Thu, 15 Aug 2013 11:03:42 -0700 Subject: made preferredLocation a val of the surrounding case class --- core/src/main/scala/spark/rdd/CoalescedRDD.scala | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'core') diff --git a/core/src/main/scala/spark/rdd/CoalescedRDD.scala b/core/src/main/scala/spark/rdd/CoalescedRDD.scala index 205175edfc..bfd0cf257e 100644 --- a/core/src/main/scala/spark/rdd/CoalescedRDD.scala +++ b/core/src/main/scala/spark/rdd/CoalescedRDD.scala @@ -25,7 +25,7 @@ private[spark] case class CoalescedRDDPartition( index: Int, @transient rdd: RDD[_], parentsIndices: Array[Int], - prefLoc: String = "" + @transient preferredLocation: String = "" ) extends Partition { var parents: Seq[Partition] = parentsIndices.map(rdd.partitions(_)) @@ -36,13 +36,6 @@ private[spark] case class CoalescedRDDPartition( oos.defaultWriteObject() } - /** - * Gets the preferred location for this coalesced RDD partition. - * Most parent indices should prefer this machine. - * @return preferred location - */ - def getPreferredLocation = prefLoc - /** * Computes how many of the parents partitions have getPreferredLocation * as one of their preferredLocations @@ -50,7 +43,7 @@ private[spark] case class CoalescedRDDPartition( */ def localFraction :Double = { var loc: Int = 0 - parents.foreach(p => if (rdd.preferredLocations(p).contains(getPreferredLocation)) loc += 1) + parents.foreach(p => if (rdd.preferredLocations(p).contains(preferredLocation)) loc += 1) if (parents.size == 0) 0.0 else (loc.toDouble / parents.size.toDouble) } } @@ -128,7 +121,7 @@ class CoalescedRDD[T: ClassManifest]( */ override def getPreferredLocations(partition: Partition): Seq[String] = { if (partition.isInstanceOf[CoalescedRDDPartition]) - List(partition.asInstanceOf[CoalescedRDDPartition].getPreferredLocation) + List(partition.asInstanceOf[CoalescedRDDPartition].preferredLocation) else super.getPreferredLocations(partition) } -- cgit v1.2.3