Skip to content

Commit 0e2bbe1

Browse files
committed
wip: resolve ambiguities in a way that works in Scala 2 as well
1 parent 3e54e33 commit 0e2bbe1

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

core/src/main/scala/scala/collection/parallel/mutable/ParHashMap.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,11 @@ extends scala.collection.parallel.BucketCombiner[(K, V), ParHashMap[K, V], Defau
169169
with scala.collection.mutable.HashTable.HashUtils[K]
170170
{
171171
private val nonmasklen = ParHashMapCombiner.nonmasklength
172-
private val seedvalue = 27
172+
private val seed = 27
173173

174174
def addOne(elem: (K, V)) = {
175175
sz += 1
176-
val hc = improve(elemHashCode(elem._1), seedvalue)
176+
val hc = improve(elemHashCode(elem._1), seed)
177177
val pos = (hc >>> nonmasklen)
178178
if (buckets(pos) eq null) {
179179
// initialize bucket
@@ -186,7 +186,7 @@ extends scala.collection.parallel.BucketCombiner[(K, V), ParHashMap[K, V], Defau
186186

187187
def result(): ParHashMap[K, V] = if (size >= (ParHashMapCombiner.numblocks * sizeMapBucketSize)) { // 1024
188188
// construct table
189-
val table = new AddingHashTable(size, tableLoadFactor, seedvalue)
189+
val table = new AddingHashTable(size, tableLoadFactor, seed)
190190
val bucks = buckets.map(b => if (b ne null) b.headPtr else null)
191191
val insertcount = combinerTaskSupport.executeAndWaitResult(new FillBlocks(bucks, table, 0, bucks.length))
192192
table.setSize(insertcount)
@@ -229,7 +229,7 @@ extends scala.collection.parallel.BucketCombiner[(K, V), ParHashMap[K, V], Defau
229229
_loadFactor = lf
230230
table = new Array[HashEntry[K, DefaultEntry[K, V]]](capacity(sizeForThreshold(_loadFactor, numelems)))
231231
tableSize = 0
232-
super[HashTable].seedvalue = _seedvalue
232+
seedvalue = _seedvalue
233233
threshold = newThreshold(_loadFactor, table.length)
234234
sizeMapInit(table.length)
235235
def setSize(sz: Int) = tableSize = sz

core/src/main/scala/scala/collection/parallel/mutable/ParHashSet.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,12 @@ extends scala.collection.parallel.BucketCombiner[T, ParHashSet[T], AnyRef, ParHa
126126
with scala.collection.mutable.FlatHashTable.HashUtils[T] {
127127
//self: EnvironmentPassingCombiner[T, ParHashSet[T]] =>
128128
private val nonmasklen = ParHashSetCombiner.nonmasklength
129-
private val seedvalue = 27
129+
private val seed = 27
130130

131131
def addOne(elem: T) = {
132132
val entry = elemToEntry(elem)
133133
sz += 1
134-
val hc = improve(entry.hashCode, seedvalue)
134+
val hc = improve(entry.hashCode, seed)
135135
val pos = hc >>> nonmasklen
136136
if (buckets(pos) eq null) {
137137
// initialize bucket
@@ -149,7 +149,7 @@ with scala.collection.mutable.FlatHashTable.HashUtils[T] {
149149

150150
private def parPopulate: FlatHashTable.Contents[T] = {
151151
// construct it in parallel
152-
val table = new AddingFlatHashTable(size, tableLoadFactor, seedvalue)
152+
val table = new AddingFlatHashTable(size, tableLoadFactor, seed)
153153
val (inserted, leftovers) = combinerTaskSupport.executeAndWaitResult(new FillBlocks(buckets, table, 0, buckets.length))
154154
var leftinserts = 0
155155
for (entry <- leftovers) leftinserts += table.insertEntry(0, table.tableLength, entry)
@@ -162,7 +162,7 @@ with scala.collection.mutable.FlatHashTable.HashUtils[T] {
162162
// TODO parallelize by keeping separate size maps and merging them
163163
val tbl = new FlatHashTable[T] {
164164
sizeMapInit(table.length)
165-
super[FlatHashTable].seedvalue = ParHashSetCombiner.this.seedvalue
165+
seedvalue = seed
166166
for {
167167
buffer <- buckets
168168
if buffer ne null
@@ -184,7 +184,7 @@ with scala.collection.mutable.FlatHashTable.HashUtils[T] {
184184
table = new Array[AnyRef](capacity(FlatHashTable.sizeForThreshold(numelems, _loadFactor)))
185185
tableSize = 0
186186
threshold = FlatHashTable.newThreshold(_loadFactor, table.length)
187-
super[FlatHashTable].seedvalue = inseedvalue
187+
seedvalue = inseedvalue
188188
sizeMapInit(table.length)
189189

190190
override def toString = "AFHT(%s)".format(table.length)

0 commit comments

Comments
 (0)