azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[K/N] Use AbstractList.newCapacity in HashMap.ensureCapacity

Browse Source
This commit is contained in:
Abduqodiri Qurbonzoda
2023-05-30 22:20:47 +03:00
committed by Space Team
parent 2ef50f8c34
commit af7965d996
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/jvm/src/kotlin/collections/builders/MapBuilder.kt
+4 -5
View File
@@ -196,11 +196,10 @@ internal class MapBuilder<K, V> private constructor(
&& gaps >= this.capacity / 4 // at least 25% of current capacity is occupied by gaps && gaps >= this.capacity / 4 // at least 25% of current capacity is occupied by gaps
} }
private fun ensureCapacity(capacity: Int) { private fun ensureCapacity(minCapacity: Int) {
if (capacity < 0) throw OutOfMemoryError() // overflow if (minCapacity < 0) throw OutOfMemoryError() // overflow
if (capacity > this.capacity) { if (minCapacity > this.capacity) {
var newSize = this.capacity * 3 / 2 val newSize = AbstractList.newCapacity(this.capacity, minCapacity)
if (capacity > newSize) newSize = capacity
keysArray = keysArray.copyOfUninitializedElements(newSize) keysArray = keysArray.copyOfUninitializedElements(newSize)
valuesArray = valuesArray?.copyOfUninitializedElements(newSize) valuesArray = valuesArray?.copyOfUninitializedElements(newSize)
presenceArray = presenceArray.copyOf(newSize) presenceArray = presenceArray.copyOf(newSize)
libraries/stdlib/native-wasm/src/kotlin/collections/HashMap.kt
+4 -5
View File
@@ -193,11 +193,10 @@ actual class HashMap<K, V> private constructor(
&& gaps >= this.capacity / 4 // at least 25% of current capacity is occupied by gaps && gaps >= this.capacity / 4 // at least 25% of current capacity is occupied by gaps
} }
private fun ensureCapacity(capacity: Int) { private fun ensureCapacity(minCapacity: Int) {
if (capacity < 0) throw OutOfMemoryError() // overflow if (minCapacity < 0) throw OutOfMemoryError() // overflow
if (capacity > this.capacity) { if (minCapacity > this.capacity) {
var newSize = this.capacity * 3 / 2 val newSize = AbstractList.newCapacity(this.capacity, minCapacity)
if (capacity > newSize) newSize = capacity
keysArray = keysArray.copyOfUninitializedElements(newSize) keysArray = keysArray.copyOfUninitializedElements(newSize)
valuesArray = valuesArray?.copyOfUninitializedElements(newSize) valuesArray = valuesArray?.copyOfUninitializedElements(newSize)
presenceArray = presenceArray.copyOf(newSize) presenceArray = presenceArray.copyOf(newSize)