Replace case with pair parameter

Author: ankurdave

graphx/src/main/scala/org/apache/spark/graphx/impl/RoutingTablePartition.scala

@@ -76,7 +76,9 @@ object RoutingTablePartition {
     edgePartition.dstIds.iterator.foreach { dstId =>
       map.changeValue(dstId, 0x2, (b: Byte) => (b | 0x2).toByte)
     }
-    map.iterator.map { case (vid, position) => new RoutingTableMessage(vid, pid, position) }
+    map.iterator.map { vidAndPosition =>
+      new RoutingTableMessage(vidAndPosition._1, pid, vidAndPosition._2)
+    }
   }
 
   /** Build a `RoutingTablePartition` from `RoutingTableMessage`s. */

graphx/src/main/scala/org/apache/spark/graphx/impl/VertexPartitionBase.scala

@@ -33,8 +33,8 @@ private[graphx] object VertexPartitionBase {
   def initFrom[VD: ClassTag](iter: Iterator[(VertexId, VD)])
     : (VertexIdToIndexMap, Array[VD], BitSet) = {
     val map = new PrimitiveKeyOpenHashMap[VertexId, VD]
-    iter.foreach { case (k, v) =>
-      map(k) = v
+    iter.foreach { pair =>
+      map(pair._1) = pair._2
     }
     (map.keySet, map._values, map.keySet.getBitSet)
   }
@@ -46,8 +46,8 @@ private[graphx] object VertexPartitionBase {
   def initFrom[VD: ClassTag](iter: Iterator[(VertexId, VD)], mergeFunc: (VD, VD) => VD)
     : (VertexIdToIndexMap, Array[VD], BitSet) = {
     val map = new PrimitiveKeyOpenHashMap[VertexId, VD]
-    iter.foreach { case (k, v) =>
-      map.setMerge(k, v, mergeFunc)
+    iter.foreach { pair =>
+      map.setMerge(pair._1, pair._2, mergeFunc)
     }
     (map.keySet, map._values, map.keySet.getBitSet)
   }

graphx/src/main/scala/org/apache/spark/graphx/impl/VertexPartitionBaseOps.scala

@@ -171,11 +171,11 @@ private[graphx] abstract class VertexPartitionBaseOps
     : Self[VD2] = {
     val newMask = new BitSet(self.capacity)
     val newValues = new Array[VD2](self.capacity)
-    iter.foreach { case (vid, vdata) =>
-      val pos = self.index.getPos(vid)
+    iter.foreach { pair =>
+      val pos = self.index.getPos(pair._1)
       if (pos >= 0) {
         newMask.set(pos)
-        newValues(pos) = vdata
+        newValues(pos) = pair._2
       }
     }
     this.withValues(newValues).withMask(newMask)
@@ -189,11 +189,11 @@ private[graphx] abstract class VertexPartitionBaseOps
     val newMask = new BitSet(self.capacity)
     val newValues = new Array[VD](self.capacity)
     System.arraycopy(self.values, 0, newValues, 0, newValues.length)
-    iter.foreach { case (vid, vdata) =>
-      val pos = self.index.getPos(vid)
+    iter.foreach { pair =>
+      val pos = self.index.getPos(pair._1)
       if (pos >= 0) {
         newMask.set(pos)
-        newValues(pos) = vdata
+        newValues(pos) = pair._2
       }
     }
     this.withValues(newValues).withMask(newMask)