From c4c4531bd33a1b82b55b3290b39e13328a40ae8e Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew@weaselab.dev>
Date: Wed, 4 Sep 2024 12:12:54 -0700
Subject: [PATCH] Simplify

---
 ConflictSet.cpp | 34 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/ConflictSet.cpp b/ConflictSet.cpp
index 0d62e65..260a9d0 100644
--- a/ConflictSet.cpp
+++ b/ConflictSet.cpp
@@ -2512,20 +2512,17 @@ namespace {
 // that are >= key is <= readVersion
 bool checkRangeLeftSide(Node *n, std::span<const uint8_t> key, int prefixLen,
                         InternalVersionT readVersion, ReadContext *tls) {
-  bool ok;
   auto remaining = key;
   int searchPathLen = 0;
   for (;; ++tls->range_read_iterations_accum) {
     if (remaining.size() == 0) {
       assert(searchPathLen >= prefixLen);
-      ok = maxVersion(n) <= readVersion;
-      return ok;
+      return maxVersion(n) <= readVersion;
     }
 
     if (searchPathLen >= prefixLen) {
       if (!checkMaxBetweenExclusive(n, remaining[0], 256, readVersion, tls)) {
-        ok = false;
-        return ok;
+        return false;
       }
     }
 
@@ -2538,13 +2535,11 @@ bool checkRangeLeftSide(Node *n, std::span<const uint8_t> key, int prefixLen,
           goto downLeftSpine;
         }
         n = c;
-        ok = maxVersion(n) <= readVersion;
-        return ok;
+        return maxVersion(n) <= readVersion;
       } else {
         n = nextSibling(n);
         if (n == nullptr) {
-          ok = true;
-          return ok;
+          return true;
         }
         goto downLeftSpine;
       }
@@ -2565,16 +2560,13 @@ bool checkRangeLeftSide(Node *n, std::span<const uint8_t> key, int prefixLen,
             goto downLeftSpine;
           }
           if (n->entryPresent && n->entry.rangeVersion > readVersion) {
-            ok = false;
-            return ok;
+            return false;
           }
-          ok = maxVersion(n) <= readVersion;
-          return ok;
+          return maxVersion(n) <= readVersion;
         } else {
           n = nextSibling(n);
           if (n == nullptr) {
-            ok = true;
-            return ok;
+            return true;
           }
           goto downLeftSpine;
         }
@@ -2585,23 +2577,19 @@ bool checkRangeLeftSide(Node *n, std::span<const uint8_t> key, int prefixLen,
       } else if (n->partialKeyLen > int(remaining.size())) {
         assert(searchPathLen >= prefixLen);
         if (n->entryPresent && n->entry.rangeVersion > readVersion) {
-          ok = false;
-          return ok;
+          return false;
         }
-        ok = maxVersion(n) <= readVersion;
-        return ok;
+        return maxVersion(n) <= readVersion;
       }
     }
     if (maxV <= readVersion) {
-      ok = true;
-      return ok;
+      return true;
     }
   }
 downLeftSpine:
   for (; !n->entryPresent; n = getFirstChildExists(n)) {
   }
-  ok = n->entry.rangeVersion <= readVersion;
-  return ok;
+  return n->entry.rangeVersion <= readVersion;
 }
 
 // Return true if the max version among all keys that start with key[:prefixLen]