diff options
| author | Aleksandar Prokopec <axel22@gmail.com> | 2012-07-10 18:05:26 +0200 |
|---|---|---|
| committer | Aleksandar Prokopec <axel22@gmail.com> | 2012-08-24 19:43:32 +0200 |
| commit | 1b152ddb45ae3c60039fd16648b36d338caf8208 (patch) | |
| tree | b6af2156d381316d29c94b600e4b17d36dd7eb60 /src | |
| parent | 811be49d3e9a45ef95df6132754e11360b19d917 (diff) | |
| download | scala-1b152ddb45ae3c60039fd16648b36d338caf8208.tar.gz scala-1b152ddb45ae3c60039fd16648b36d338caf8208.tar.bz2 scala-1b152ddb45ae3c60039fd16648b36d338caf8208.zip | |
SI-6052 - fix groupBy on parallel collections
Diffstat (limited to 'src')
| -rw-r--r-- | src/library/scala/collection/parallel/immutable/ParHashMap.scala | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/library/scala/collection/parallel/immutable/ParHashMap.scala b/src/library/scala/collection/parallel/immutable/ParHashMap.scala index ad882390c8..c9876c4d74 100644 --- a/src/library/scala/collection/parallel/immutable/ParHashMap.scala +++ b/src/library/scala/collection/parallel/immutable/ParHashMap.scala @@ -202,7 +202,7 @@ extends collection.parallel.BucketCombiner[(K, V), ParHashMap[K, V], (K, V), Has def groupByKey[Repr](cbf: () => Combiner[V, Repr]): ParHashMap[K, Repr] = { val bucks = buckets.filter(_ != null).map(_.headPtr) val root = new Array[HashMap[K, AnyRef]](bucks.length) - + combinerTaskSupport.executeAndWaitResult(new CreateGroupedTrie(cbf, bucks, root, 0, bucks.length)) var bitmap = 0 @@ -306,8 +306,7 @@ extends collection.parallel.BucketCombiner[(K, V), ParHashMap[K, V], (K, V), Has unrolled = unrolled.next } - evaluateCombiners(trie) - trie.asInstanceOf[HashMap[K, Repr]] + evaluateCombiners(trie).asInstanceOf[HashMap[K, Repr]] } private def evaluateCombiners(trie: HashMap[K, Combiner[V, Repr]]): HashMap[K, Repr] = trie match { case hm1: HashMap.HashMap1[_, _] => |