Fix issue with getSearchPath on nullptr on setOldestVersion
All checks were successful
Tests / Release [gcc] total: 827, passed: 827
GNU C Compiler (gcc) |Total|New|Outstanding|Fixed|Trend |:-:|:-:|:-:|:-:|:-: |0|0|0|0|:clap:
Tests / Release [gcc,aarch64] total: 826, passed: 826
Tests / Coverage total: 825, passed: 825
weaselab/conflict-set/pipeline/head This commit looks good

This commit is contained in:
2024-03-12 11:02:51 -07:00
parent 471b276947
commit 71e117965e

View File

@@ -2033,12 +2033,7 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
if (n == root) {
n = nextLogical(n);
}
for (; keyUpdates > 0; --keyUpdates) {
if (n == nullptr) {
removalKey = {};
return;
}
for (; keyUpdates > 0 && n != nullptr; --keyUpdates) {
if (std::max(n->entry.pointVersion, n->entry.rangeVersion) <=
oldestVersion) {
// Any transaction n would have prevented from committing is
@@ -2052,6 +2047,10 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
n = nextLogical(n);
}
}
if (n == nullptr) {
removalKey = {};
return;
}
removalKeyArena = Arena();
removalKey = getSearchPath(removalKeyArena, n);
}