diff --git a/core/src/main/scala/org/apache/spark/util/hash/OpenHashMap.scala b/core/src/main/scala/org/apache/spark/util/hash/OpenHashMap.scala index af282d5651292469051c678d7b49731ab6a30af4..4eb52158b02d428bce2e2a824fa5648c9fc5e8ed 100644 --- a/core/src/main/scala/org/apache/spark/util/hash/OpenHashMap.scala +++ b/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) diff --git a/core/src/main/scala/org/apache/spark/util/hash/PrimitiveKeyOpenHashMap.scala b/core/src/main/scala/org/apache/spark/util/hash/PrimitiveKeyOpenHashMap.scala index cbfb2361b419e04034393e67e8220c5f7b54620d..1bf2554fb77301ea887f4582cd0d4d7544b6bc0e 100644 --- a/core/src/main/scala/org/apache/spark/util/hash/PrimitiveKeyOpenHashMap.scala +++ b/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 diff --git a/graph/src/main/scala/org/apache/spark/graph/VertexSetRDD.scala b/graph/src/main/scala/org/apache/spark/graph/VertexSetRDD.scala index b3647c083ed5de6e776368aadaa8a9072c391ff0..7211ff3705c455cd58dc97c9a4f6e8ef1de32084 100644 --- a/graph/src/main/scala/org/apache/spark/graph/VertexSetRDD.scala +++ b/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