Fix map iterators #73
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 7 commits
March 26, 2020 19:56
Because it changes iteration order of elements and leads to inconsistency if an iteration is already in progress
qurbonzoda
commented
Mar 30, 2020
| override fun setValue(newValue: V): V { | ||
| val result = value | ||
| value = newValue | ||
| builder[key] = newValue |
There was a problem hiding this comment.
Here is the bug #68.
The value is updated bypassing the iterator this mutable entry was obtained from.
qurbonzoda
commented
Mar 30, 2020
| @@ -144,6 +147,7 @@ internal abstract class PersistentHashMapBaseIterator<K, V, T>(node: TrieNode<K, | |||
| if (i > 0) { | |||
| path[i - 1].moveToNextNode() | |||
| } | |||
| path[i].reset(TrieNode.EMPTY.buffer, 0) | |||
There was a problem hiding this comment.
Here we release iterated nodes to avoid memory leaks
qurbonzoda
commented
Mar 30, 2020
| // assert(buffer[nodeIndex] !== newNode) | ||
|
|
||
| val newNodeBuffer = newNode.buffer | ||
| if (newNodeBuffer.size == 2 && newNode.nodeMap == 0) { |
There was a problem hiding this comment.
Here canonicalisation of trie can change order of iteration (see below), therefore I removed canonicalisation for mutable maps as the update may be made by an iterator currently iterating the map builder.
------------------------------ iterator.remove() after -------------------------------
| k1 | v1 | k3 | v3 | child1 | iterator.next() returned (k4, v4) | k1 | v1 | k2 | v2 | k3 | v3 |
------------------------|----- -------------------------------
| -->
---------------------
| k4 | v4 | k2 | v2 |
---------------------
qurbonzoda
commented
Mar 30, 2020
| mutator.size-- | ||
| mutator.operationResult = valueAtKeyIndex(keyIndex) | ||
| if (buffer.size == ENTRY_SIZE) return null |
There was a problem hiding this comment.
As mutable map is not canonicalised, nodes containing a single entry can occur.
| // assert(hasEntryAt(positionMask)) | ||
| // assert(buffer.size > ENTRY_SIZE) // can be false only for the root node | ||
| if (buffer.size == ENTRY_SIZE) return null |
There was a problem hiding this comment.
The persistent map could be built by a non-canonical builder
ilya-g
approved these changes
Apr 1, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also addresses #68