weaselbot/conflict-set
1
Fork 0
forked from weaselab/conflict-set
Code Pull Requests Activity

Fix setOldestVersion

Browse Source 
We were not accumulating keyUpdates strictly faster than we were
spending them for a monotonically increasing workload.
This commit is contained in:
andrew
2024-02-26 13:51:03 -08:00
parent 2b0dbabb5c
commit 3f45535f89
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ConflictSet.cpp
+3 -3
View File
@@ -1851,11 +1851,11 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
auto begin = std::span<const uint8_t>(w.begin.p, w.begin.len); auto begin = std::span<const uint8_t>(w.begin.p, w.begin.len);
auto end = std::span<const uint8_t>(w.end.p, w.end.len); auto end = std::span<const uint8_t>(w.end.p, w.end.len);
if (w.end.len > 0) { if (w.end.len > 0) {
keyUpdates += 2; keyUpdates += 3;
addWriteRange(root, oldestVersion, begin, end, w.writeVersion, addWriteRange(root, oldestVersion, begin, end, w.writeVersion,
&allocators, this); &allocators, this);
} else { } else {
keyUpdates += 1; keyUpdates += 2;
addPointWrite(root, oldestVersion, begin, w.writeVersion, &allocators, addPointWrite(root, oldestVersion, begin, w.writeVersion, &allocators,
this); this);
} }
@@ -1870,7 +1870,7 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
Node *prev = firstGeq(root, removalKey).n; Node *prev = firstGeq(root, removalKey).n;
// There's no way to erase removalKey without introducing a key after it // There's no way to erase removalKey without introducing a key after it
assert(prev != nullptr); assert(prev != nullptr);
while (keyUpdates-- > 0) { for (; keyUpdates > 0; --keyUpdates) {
Node *n = nextLogical(prev); Node *n = nextLogical(prev);
if (n == nullptr) { if (n == nullptr) {
removalKey = {}; removalKey = {};