weaselab/conflict-set
2
0
Fork 0
Code Issues 4 Packages Releases 13 Activity

Pass in-tree reference to mergeWithChild

Browse Source
This commit is contained in:
Andrew Noyes
2024-08-15 13:52:06 -07:00
parent 5626cd09d9
commit f93466316a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ConflictSet.cpp
View File

@@ -1606,6 +1606,7 @@ void rezero(Node *n, InternalVersionT z) {
void mergeWithChild(Node *&self, WriteContext *tls, ConflictSet::Impl *impl, void mergeWithChild(Node *&self, WriteContext *tls, ConflictSet::Impl *impl,
Node *&dontInvalidate, Node3 *self3) { Node *&dontInvalidate, Node3 *self3) {
assert(!self3->entryPresent);
auto *child = self3->children[0]; auto *child = self3->children[0];
int minCapacity = self3->partialKeyLen + 1 + child->partialKeyLen; int minCapacity = self3->partialKeyLen + 1 + child->partialKeyLen;
@@ -1639,7 +1640,7 @@ void mergeWithChild(Node *&self, WriteContext *tls, ConflictSet::Impl *impl,
// that we have a new parent. // that we have a new parent.
setMaxVersion(child, impl, std::max(childMaxVersion, tls->zero)); setMaxVersion(child, impl, std::max(childMaxVersion, tls->zero));
getInTree(self, impl) = child; self = child;
tls->release(self3); tls->release(self3);
} }
@@ -1662,7 +1663,7 @@ void maybeDownsize(Node *self, WriteContext *tls, ConflictSet::Impl *impl,
getInTree(self, impl) = newSelf; getInTree(self, impl) = newSelf;
tls->release(self3); tls->release(self3);
} else if (self->numChildren == 1 && !self->entryPresent) { } else if (self->numChildren == 1 && !self->entryPresent) {
mergeWithChild(self, tls, impl, dontInvalidate, self3); mergeWithChild(getInTree(self, impl), tls, impl, dontInvalidate, self3);
} }
} break; } break;
case Type_Node16: case Type_Node16: