Allow hashMap collisions to be located at any level

Abduqodiri Qurbonzoda · Abduqodiri Qurbonzoda · commit ee4c5f60af44 · 2019-08-09T20:30:41.000+03:00
diff --git a/kotlinx-collections-immutable/src/main/kotlin/kotlinx/collections/immutable/implementations/immutableMap/PersistentHashMapBuilderContentIterators.kt b/kotlinx-collections-immutable/src/main/kotlin/kotlinx/collections/immutable/implementations/immutableMap/PersistentHashMapBuilderContentIterators.kt
@@ -88,7 +88,7 @@ internal abstract class PersistentHashMapBuilderBaseIterator<K, V, T>(private va
 
         val nodeIndex = node.nodeIndex(keyPositionMask)
         val targetNode = node.nodeAtIndex(nodeIndex)
-        if (shift == MAX_SHIFT) {   // collision
+        if (targetNode.isCollision()) {
             path[pathIndex].reset(node.buffer, node.buffer.size, 0)
             while (path[pathIndex].currentKey() != key) {
                 path[pathIndex].moveToNextKey()
diff --git a/kotlinx-collections-immutable/src/main/kotlin/kotlinx/collections/immutable/implementations/immutableMap/PersistentHashMapContentIterators.kt b/kotlinx-collections-immutable/src/main/kotlin/kotlinx/collections/immutable/implementations/immutableMap/PersistentHashMapContentIterators.kt
@@ -107,7 +107,7 @@ internal abstract class PersistentHashMapBaseIterator<K, V, T>(node: TrieNode<K,
         }
         if (path[pathIndex].hasNextNode()) {
             val node = path[pathIndex].currentNode()
-            if (pathIndex == TRIE_MAX_HEIGHT - 1) {     // collision
+            if (node.isCollision()) {
                 path[pathIndex + 1].reset(node.buffer, node.buffer.size)
             } else {
                 path[pathIndex + 1].reset(node.buffer, ENTRY_SIZE * node.entryCount())
diff --git a/kotlinx-collections-immutable/src/main/kotlin/kotlinx/collections/immutable/implementations/immutableMap/TrieNode.kt b/kotlinx-collections-immutable/src/main/kotlin/kotlinx/collections/immutable/implementations/immutableMap/TrieNode.kt

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ internal abstract class PersistentHashMapBaseIterator<K, V, T>(node: TrieNode<K,`
`107`	`107`	`}`
`108`	`108`	`if (path[pathIndex].hasNextNode()) {`
`109`	`109`	`val node = path[pathIndex].currentNode()`
`110`		`- if (pathIndex == TRIE_MAX_HEIGHT - 1) { // collision`
	`110`	`+ if (node.isCollision()) {`
`111`	`111`	`path[pathIndex + 1].reset(node.buffer, node.buffer.size)`
`112`	`112`	`} else {`
`113`	`113`	`path[pathIndex + 1].reset(node.buffer, ENTRY_SIZE * node.entryCount())`