Compare commits
2 commits
a6e8ced7f7
...
bf8298658c
| Author | SHA1 | Date | |
|---|---|---|---|
| bf8298658c | |||
| b5b363ae9f |
3 changed files with 29 additions and 25 deletions
|
|
@ -10,9 +10,12 @@ namespace PersistentMap
|
||||||
// Public API
|
// Public API
|
||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
|
|
||||||
|
/// <summary>TryGetValue tries to get the value at mapping key. If it finds the key it sets th
|
||||||
|
/// out var to value and returns true. </summary>
|
||||||
public static bool TryGetValue<K, V, TStrategy>(Node<K> root, K key, TStrategy strategy, out V value)
|
public static bool TryGetValue<K, V, TStrategy>(Node<K> root, K key, TStrategy strategy, out V value)
|
||||||
where TStrategy : IKeyStrategy<K>
|
where TStrategy : IKeyStrategy<K>
|
||||||
{
|
{
|
||||||
|
// We always get a strategy to avoid branching already here
|
||||||
long keyPrefix = strategy.UsesPrefixes ? strategy.GetPrefix(key) : 0;
|
long keyPrefix = strategy.UsesPrefixes ? strategy.GetPrefix(key) : 0;
|
||||||
|
|
||||||
Node<K> current = root;
|
Node<K> current = root;
|
||||||
|
|
@ -43,6 +46,7 @@ namespace PersistentMap
|
||||||
{
|
{
|
||||||
root = root.EnsureEditable(owner);
|
root = root.EnsureEditable(owner);
|
||||||
|
|
||||||
|
// Todo, this should really be made a tuple return value to not stress the GC
|
||||||
var splitResult = InsertRecursive(root, key, value, strategy, owner, out countChanged);
|
var splitResult = InsertRecursive(root, key, value, strategy, owner, out countChanged);
|
||||||
|
|
||||||
if (splitResult != null)
|
if (splitResult != null)
|
||||||
|
|
@ -329,11 +333,11 @@ if (typeof(K) == typeof(int))
|
||||||
// Insertion Logic
|
// Insertion Logic
|
||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
|
|
||||||
private class SplitResult<K>
|
private class SeplitResult<K>
|
||||||
{
|
{
|
||||||
public Node<K> NewNode;
|
public Node<K> NewNode;
|
||||||
public K Separator;
|
public K Separator;
|
||||||
public SplitResult(Node<K> newNode, K separator)
|
public SeplitResult(Node<K> newNode, K separator)
|
||||||
{
|
{
|
||||||
NewNode = newNode;
|
NewNode = newNode;
|
||||||
Separator = separator;
|
Separator = separator;
|
||||||
|
|
@ -367,7 +371,7 @@ if (typeof(K) == typeof(int))
|
||||||
leaf.SetCount(count + 1);
|
leaf.SetCount(count + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static SplitResult<K> SplitLeaf<K, V, TStrategy>(LeafNode<K, V> left, int insertIndex, K key, V value, TStrategy strategy, OwnerId owner)
|
private static (Node<K>, K) SplitLeaf<K, V, TStrategy>(LeafNode<K, V> left, int insertIndex, K key, V value, TStrategy strategy, OwnerId owner)
|
||||||
where TStrategy : IKeyStrategy<K>
|
where TStrategy : IKeyStrategy<K>
|
||||||
{
|
{
|
||||||
var right = new LeafNode<K, V>(owner, strategy.UsesPrefixes);
|
var right = new LeafNode<K, V>(owner, strategy.UsesPrefixes);
|
||||||
|
|
@ -399,7 +403,7 @@ else
|
||||||
InsertIntoLeaf(right, insertIndex - splitPoint, key, value, strategy);
|
InsertIntoLeaf(right, insertIndex - splitPoint, key, value, strategy);
|
||||||
}
|
}
|
||||||
|
|
||||||
return new SplitResult<K>(right, right.Keys[0]);
|
return (right, right.Keys[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void InsertIntoInternal<K, TStrategy>(InternalNode<K> node, int index, K separator, Node<K> newChild, TStrategy strategy)
|
private static void InsertIntoInternal<K, TStrategy>(InternalNode<K> node, int index, K separator, Node<K> newChild, TStrategy strategy)
|
||||||
|
|
@ -433,7 +437,7 @@ else
|
||||||
node.SetCount(count + 1);
|
node.SetCount(count + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static SplitResult<K> SplitInternal<K, TStrategy>(InternalNode<K> left, int insertIndex, K separator, Node<K> newChild, TStrategy strategy, OwnerId owner)
|
private static (Node<K>, K) SplitInternal<K, TStrategy>(InternalNode<K> left, int insertIndex, K separator, Node<K> newChild, TStrategy strategy, OwnerId owner)
|
||||||
where TStrategy : IKeyStrategy<K>
|
where TStrategy : IKeyStrategy<K>
|
||||||
{
|
{
|
||||||
var right = strategy.UsesPrefixes
|
var right = strategy.UsesPrefixes
|
||||||
|
|
@ -473,7 +477,7 @@ else
|
||||||
InsertIntoInternal(right, insertIndex - (splitPoint + 1), separator, newChild, strategy);
|
InsertIntoInternal(right, insertIndex - (splitPoint + 1), separator, newChild, strategy);
|
||||||
}
|
}
|
||||||
|
|
||||||
return new SplitResult<K>(right, upKey);
|
return (right, upKey);
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue