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

Fix setOldestVersion
All checks were successful
Tests / Release [gcc] total: 471, passed: 471
Details
GNU C Compiler (gcc) |Total|New|Outstanding|Fixed|Trend |:-:|:-:|:-:|:-:|:-: |0|0|0|0|:clap: Reference build: <a href="https://jenkins.weaselab.dev/job/weaselab/job/conflict-set/job/main/40//gcc">weaselab » conflict-set » main #40</a>
Details
Tests / Coverage total: 469, passed: 469
Details
weaselab/conflict-set/pipeline/head This commit looks good
Details

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 Noyes
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

6
ConflictSet.cpp
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 = {};