Merge pull request 'Run the maxVersion "borrowed range version" check (#95)' (#106) from weaselbot/conflict-set:weaselbot/issue-95 into main

Reviewed-on: weaselab/conflict-set#106
This commit is contained in:
andrew committed 2026-11-18 21:22:17 +00:00
commit cce3e1651f
1 file changed
+6 -1
+6 -1
View File
@@ -5635,6 +5635,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;
} }
} }
@@ -5932,7 +5935,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) {