Finish checkRangeRightSide conversion

ConflictSet.cpp

@@ -2594,11 +2594,8 @@ downLeftSpine:
 
 // Return true if the max version among all keys that start with key[:prefixLen]
 // that are < key is <= readVersion
-struct CheckRangeRightSide {
-
-  bool step(Node *n, std::span<const uint8_t> key, int prefixLen,
+bool checkRangeRightSide(Node *n, std::span<const uint8_t> key, int prefixLen,
                          InternalVersionT readVersion, ReadContext *tls) {
-    bool ok;
   auto remaining = key;
   int searchPathLen = 0;
 
@@ -2610,20 +2607,17 @@ struct CheckRangeRightSide {
 
     if (searchPathLen >= prefixLen) {
       if (n->entryPresent && n->entry.pointVersion > readVersion) {
-          ok = false;
-          return ok;
+        return false;
       }
 
       if (!checkMaxBetweenExclusive(n, -1, remaining[0], readVersion, tls)) {
-          ok = false;
-          return ok;
+        return false;
       }
     }
 
     if (searchPathLen > prefixLen && n->entryPresent &&
         n->entry.rangeVersion > readVersion) {
-        ok = false;
-        return ok;
+      return false;
     }
 
     auto *child = getChild(n, remaining[0]);
@@ -2643,8 +2637,7 @@ struct CheckRangeRightSide {
 
     if (n->partialKeyLen > 0) {
       int commonLen = std::min<int>(n->partialKeyLen, remaining.size());
-        int i =
-            longestCommonPrefix(n->partialKey(), remaining.data(), commonLen);
+      int i = longestCommonPrefix(n->partialKey(), remaining.data(), commonLen);
       searchPathLen += i;
       if (i < commonLen) {
         ++searchPathLen;
@@ -2654,31 +2647,27 @@ struct CheckRangeRightSide {
         } else {
           if (searchPathLen > prefixLen && n->entryPresent &&
               n->entry.rangeVersion > readVersion) {
-              ok = false;
-              return ok;
+            return false;
           }
           goto backtrack;
         }
       }
       if (commonLen == n->partialKeyLen) {
         // partial key matches
-          remaining =
-              remaining.subspan(commonLen, remaining.size() - commonLen);
+        remaining = remaining.subspan(commonLen, remaining.size() - commonLen);
       } else if (n->partialKeyLen > int(remaining.size())) {
         goto downLeftSpine;
       }
     }
   }
-  backtrack:
+backtrack:
   for (;;) {
     // searchPathLen > prefixLen implies n is not the root
     if (searchPathLen > prefixLen && maxVersion(n) > readVersion) {
-        ok = false;
-        return ok;
+      return false;
     }
     if (n->parent == nullptr) {
-        ok = true;
-        return ok;
+      return true;
     }
     auto next = getChildGeq(n->parent, n->parentsIndex + 1);
     if (next == nullptr) {
@@ -2691,13 +2680,11 @@ struct CheckRangeRightSide {
       goto downLeftSpine;
     }
   }
-  downLeftSpine:
+downLeftSpine:
   for (; !n->entryPresent; n = getFirstChildExists(n)) {
   }
-    ok = n->entry.rangeVersion <= readVersion;
-    return ok;
-  }
-};
+  return n->entry.rangeVersion <= readVersion;
+}
 } // namespace
 
 bool checkRangeRead(Node *n, std::span<const uint8_t> begin,
@@ -2760,21 +2747,17 @@ bool checkRangeRead(Node *n, std::span<const uint8_t> begin,
   lcp -= consumed;
 
   if (lcp == int(begin.size())) {
-    CheckRangeRightSide checkRangeRightSide{};
-    return checkRangeRightSide.step(n, end, lcp, readVersion, tls);
-  }
-
-  if (!checkRangeStartsWith(n, begin.subspan(0, lcp), begin[lcp], end[lcp],
-                            readVersion, tls)) {
-    return false;
+    return checkRangeRightSide(n, end, lcp, readVersion, tls);
   }
 
   // This makes it safe to check maxVersion within CheckRangeLeftSide. If this
   // were false, then we would have returned above since lcp == begin.size().
   assert(!(n->parent == nullptr && begin.size() == 0));
-  CheckRangeRightSide checkRangeRightSide{};
-  return checkRangeLeftSide(n, begin, lcp + 1, readVersion, tls) &&
-         checkRangeRightSide.step(n, end, lcp + 1, readVersion, tls);
+
+  return checkRangeStartsWith(n, begin.subspan(0, lcp), begin[lcp], end[lcp],
+                              readVersion, tls) &&
+         checkRangeLeftSide(n, begin, lcp + 1, readVersion, tls) &&
+         checkRangeRightSide(n, end, lcp + 1, readVersion, tls);
 }
 
 #ifdef __x86_64__