renamed update to setMerge

core/src/main/scala/org/apache/spark/util/hash/OpenHashMap.scala

@@ -79,7 +79,7 @@ class OpenHashMap[K >: Null : ClassManifest, @specialized(Long, Int, Double) V:
   }
 
   /** Set the value for a key */
-  def update(k: K, v: V, mergeF: (V,V) => V) {
+  def setMerge(k: K, v: V, mergeF: (V,V) => V) {
     if (k == null) {
       if(haveNullValue) {
         nullValue = mergeF(nullValue, v)

core/src/main/scala/org/apache/spark/util/hash/PrimitiveKeyOpenHashMap.scala

@@ -65,7 +65,7 @@ class PrimitiveKeyOpenHashMap[@specialized(Long, Int) K: ClassManifest,
 
 
   /** Set the value for a key */
-  def update(k: K, v: V, mergeF: (V,V) => V) {
+  def setMerge(k: K, v: V, mergeF: (V,V) => V) {
     val pos = keySet.fastAdd(k)
     val ind = pos & OpenHashSet.POSITION_MASK
     if ((pos & OpenHashSet.EXISTENCE_MASK) != 0) { // if first add

graph/src/main/scala/org/apache/spark/graph/VertexSetRDD.scala

@@ -641,7 +641,7 @@ object VertexSetRDD {
     val groups = preAgg.mapPartitions( iter => {
       val hashMap = new PrimitiveKeyOpenHashMap[Vid, V]
       for ((k,v) <- iter) {
-        hashMap.update(k, v, reduceFunc)
+        hashMap.setMerge(k, v, reduceFunc)
       }
       val index = hashMap.keySet
       val values: IndexedSeq[V] = hashMap._values