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

Avoid re-inserting begin if begin is not a prefix of end

Browse Source
This commit is contained in:
Andrew Noyes
2024-03-11 22:43:52 -07:00
parent 1dcb380c73
commit 5e4eab55fb
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ConflictSet.cpp
View File

@@ -1577,7 +1577,7 @@ bool checkRangeRead(Node *n, std::span<const uint8_t> begin,
// Returns a pointer to the newly inserted node. Caller must set // Returns a pointer to the newly inserted node. Caller must set
// `entryPresent`, `entry` fields and `maxVersion` on the result. The search // `entryPresent`, `entry` fields and `maxVersion` on the result. The search
// path of the result's parent will have `maxVersion` at least `writeVersion` as // path of the result's parent will have `maxVersion` at least `writeVersion` as
// a postcondition. // a postcondition. Nodes along the search path may be invalidated.
template <bool kBegin> template <bool kBegin>
[[nodiscard]] Node *insert(Node **self, std::span<const uint8_t> key, [[nodiscard]] Node *insert(Node **self, std::span<const uint8_t> key,
int64_t writeVersion, NodeAllocators *allocators, int64_t writeVersion, NodeAllocators *allocators,
@@ -1704,6 +1704,7 @@ void addWriteRange(Node *&root, int64_t oldestVersion,
return addPointWrite(root, oldestVersion, begin, writeVersion, allocators, return addPointWrite(root, oldestVersion, begin, writeVersion, allocators,
impl); impl);
} }
const bool beginIsPrefix = lcp == int(begin.size());
auto remaining = begin.subspan(0, lcp); auto remaining = begin.subspan(0, lcp);
auto *n = root; auto *n = root;
@@ -1772,8 +1773,9 @@ void addWriteRange(Node *&root, int64_t oldestVersion,
} }
endNode->entry.rangeVersion = writeVersion; endNode->entry.rangeVersion = writeVersion;
if (insertedEnd) { if (beginIsPrefix && insertedEnd) {
// beginNode may have been invalidated // beginNode may have been invalidated when inserting end. TODO can we do
// better?
beginNode = insert<true>(useAsRoot, begin, writeVersion, allocators, impl); beginNode = insert<true>(useAsRoot, begin, writeVersion, allocators, impl);
assert(beginNode->entryPresent); assert(beginNode->entryPresent);
} }