From e2927bf0fa5d2ec46477172926edd023f59a890b Mon Sep 17 00:00:00 2001 From: Andrew Noyes Date: Wed, 3 Jul 2024 16:39:22 -0700 Subject: [PATCH] Simplify condition for TooOld in `check` --- ConflictSet.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ConflictSet.cpp b/ConflictSet.cpp index a4fdb09..8588061 100644 --- a/ConflictSet.cpp +++ b/ConflictSet.cpp @@ -2884,11 +2884,10 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl { const auto &r = reads[i]; auto begin = std::span(r.begin.p, r.begin.len); auto end = std::span(r.end.p, r.end.len); + assert(oldestVersionFullPrecision >= + newestVersionFullPrecision - kNominalVersionWindow); result[i] = - reads[i].readVersion < oldestVersionFullPrecision || - reads[i].readVersion < - newestVersionFullPrecision - kNominalVersionWindow - ? TooOld + reads[i].readVersion < oldestVersionFullPrecision ? TooOld : (end.size() > 0 ? checkRangeRead(root, begin, end, InternalVersionT(reads[i].readVersion), this)