weaselab/conflict-set
1
Fork 1
Code Issues 11 Pull Requests 6 Actions 1 Packages Releases 13 Activity

Run the maxVersion "borrowed range version" check (#95) #106

Open
weaselbot wants to merge 1 commits from weaselbot/conflict-set:weaselbot/issue-95 into main
pull from: weaselbot/conflict-set:weaselbot/issue-95
merge into: weaselab:main
Conversation 0 Commits 1 Files Changed 1
+6 -1
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ConflictSet.cpp
+6 -1
View File
@@ -5631,6 +5631,9 @@ Node *firstGeqLogical(Node *n, const TrivialSpan key) {
goto downLeftSpine; goto downLeftSpine;
} else { } else {
n = nextSibling(n); n = nextSibling(n);
if (n == nullptr) {
return nullptr;
}
goto downLeftSpine; goto downLeftSpine;
} }
} }
@@ -5928,7 +5931,9 @@ checkMaxVersion(Node *root, Node *node, InternalVersionT oldestVersion,
expected = std::max(expected, child->entry.rangeVersion); expected = std::max(expected, child->entry.rangeVersion);
} }
} }
auto key = getSearchPath(root); // Account for the range version of the first key after `node`'s subtree: a
// range write spanning the subtree is recorded there.
auto key = getSearchPath(node);
bool ok; bool ok;
auto inc = strinc(key, ok); auto inc = strinc(key, ok);
if (ok) { if (ok) {