Make CheckRange{Left,Right}Side into normal functions, WIP

ConflictSet.cpp

@@ -2532,6 +2532,7 @@ struct CheckRangeLeftSide {
   bool ok;
 
   bool step() {
+    for (;; ++tls->range_read_iterations_accum) {
       if (remaining.size() == 0) {
         assert(searchPathLen >= prefixLen);
         ok = maxVersion(n) <= readVersion;
@@ -2551,7 +2552,7 @@ struct CheckRangeLeftSide {
         if (c != nullptr) {
           if (searchPathLen < prefixLen) {
             n = c;
-          return downLeftSpine();
+            goto downLeftSpine;
           }
           n = c;
           ok = maxVersion(n) <= readVersion;
@@ -2562,7 +2563,7 @@ struct CheckRangeLeftSide {
             ok = true;
             return true;
           }
-        return downLeftSpine();
+          goto downLeftSpine;
         }
       }
 
@@ -2572,13 +2573,14 @@ struct CheckRangeLeftSide {
 
       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) {
           auto c = n->partialKey()[i] <=> remaining[i];
           if (c > 0) {
             if (searchPathLen < prefixLen) {
-            return downLeftSpine();
+              goto downLeftSpine;
             }
             if (n->entryPresent && n->entry.rangeVersion > readVersion) {
               ok = false;
@@ -2592,12 +2594,13 @@ struct CheckRangeLeftSide {
               ok = true;
               return true;
             }
-          return downLeftSpine();
+            goto downLeftSpine;
           }
         }
         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())) {
           assert(searchPathLen >= prefixLen);
           if (n->entryPresent && n->entry.rangeVersion > readVersion) {
@@ -2612,10 +2615,8 @@ struct CheckRangeLeftSide {
         ok = true;
         return true;
       }
-    return false;
     }
-
-  bool downLeftSpine() {
+  downLeftSpine:
     for (; !n->entryPresent; n = getFirstChildExists(n)) {
     }
     ok = n->entry.rangeVersion <= readVersion;
@@ -2817,7 +2818,7 @@ bool checkRangeRead(Node *n, std::span<const uint8_t> begin,
 
   if (lcp == int(begin.size())) {
     CheckRangeRightSide checkRangeRightSide{n, end, lcp, readVersion, tls};
-    while (!checkRangeRightSide.step())
+    for (; !checkRangeRightSide.step(); ++tls->range_read_iterations_accum)
       ;
     return checkRangeRightSide.ok;
   }
@@ -2831,30 +2832,11 @@ bool checkRangeRead(Node *n, std::span<const uint8_t> begin,
   // were false, then we would have returned above since lcp == begin.size().
   assert(!(n->parent == nullptr && begin.size() == 0));
   CheckRangeLeftSide checkRangeLeftSide{n, begin, lcp + 1, readVersion, tls};
+  for (; !checkRangeLeftSide.step(); ++tls->range_read_iterations_accum)
+    ;
   CheckRangeRightSide checkRangeRightSide{n, end, lcp + 1, readVersion, tls};
-
-  for (;;) {
-    bool leftDone = checkRangeLeftSide.step();
-    bool rightDone = checkRangeRightSide.step();
-    if (!leftDone && !rightDone) {
-      tls->range_read_iterations_accum += 2;
-      continue;
-    }
-    if (leftDone && rightDone) {
-      break;
-    } else if (leftDone) {
-      while (!checkRangeRightSide.step()) {
-        ++tls->range_read_iterations_accum;
-      }
-      break;
-    } else {
-      assert(rightDone);
-      while (!checkRangeLeftSide.step()) {
-        ++tls->range_read_iterations_accum;
-      }
-    }
-    break;
-  }
+  for (; !checkRangeRightSide.step(); ++tls->range_read_iterations_accum)
+    ;
 
   return checkRangeLeftSide.ok && checkRangeRightSide.ok;
 }