Converting CheckRangeRightSide WIP

ConflictSet.cpp

@@ -2627,8 +2627,9 @@ struct CheckRangeRightSide {
 
     assert(searchPathLen <= int(key.size()));
 
+    for (;; ++tls->range_read_iterations_accum) {
       if (remaining.size() == 0) {
-      return downLeftSpine();
+        goto downLeftSpine;
       }
 
       if (searchPathLen >= prefixLen) {
@@ -2654,9 +2655,9 @@ struct CheckRangeRightSide {
         auto c = getChildGeq(n, remaining[0]);
         if (c != nullptr) {
           n = c;
-        return downLeftSpine();
+          goto downLeftSpine;
         } else {
-        return backtrack();
+          goto backtrack;
         }
       }
 
@@ -2666,33 +2667,33 @@ 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;
           auto c = n->partialKey()[i] <=> remaining[i];
           if (c > 0) {
-          return downLeftSpine();
+            goto downLeftSpine;
           } else {
             if (searchPathLen > prefixLen && n->entryPresent &&
                 n->entry.rangeVersion > readVersion) {
               ok = false;
               return true;
             }
-          return backtrack();
+            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())) {
-        return downLeftSpine();
+          goto downLeftSpine;
         }
       }
-    return false;
     }
-
+  backtrack:
-  bool backtrack() {
     for (;;) {
       // searchPathLen > prefixLen implies n is not the root
       if (searchPathLen > prefixLen && maxVersion(n) > readVersion) {
@@ -2711,12 +2712,10 @@ struct CheckRangeRightSide {
         searchPathLen -= n->partialKeyLen;
         n = next;
         searchPathLen += n->partialKeyLen;
-        return downLeftSpine();
+        goto downLeftSpine;
       }
     }
-  }
+  downLeftSpine:
-
-  bool downLeftSpine() {
     for (; !n->entryPresent; n = getFirstChildExists(n)) {
     }
     ok = n->entry.rangeVersion <= readVersion;
@@ -2786,7 +2785,7 @@ bool checkRangeRead(Node *n, std::span<const uint8_t> begin,
 
   if (lcp == int(begin.size())) {
     CheckRangeRightSide checkRangeRightSide{n, end, lcp, readVersion, tls};
-    for (; !checkRangeRightSide.step(); ++tls->range_read_iterations_accum)
+    for (; !checkRangeRightSide.step();)
       ;
     return checkRangeRightSide.ok;
   }
@@ -2801,7 +2800,7 @@ bool checkRangeRead(Node *n, std::span<const uint8_t> begin,
   assert(!(n->parent == nullptr && begin.size() == 0));
   bool lhsOk = checkRangeLeftSide(n, begin, lcp + 1, readVersion, tls);
   CheckRangeRightSide checkRangeRightSide{n, end, lcp + 1, readVersion, tls};
-  for (; !checkRangeRightSide.step(); ++tls->range_read_iterations_accum)
+  for (; !checkRangeRightSide.step();)
     ;
 
   return lhsOk && checkRangeRightSide.ok;