checkRangeLeftSide

ConflictSet.cpp

@@ -2510,24 +2510,22 @@ downLeftSpine:
 namespace {
 // Return true if the max version among all keys that start with key[:prefixLen]
 // that are >= key is <= readVersion
-struct CheckRangeLeftSide {
+bool checkRangeLeftSide(Node *n, std::span<const uint8_t> key, int prefixLen,
-  bool ok;
-
-  bool step(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 true;
+      return ok;
     }
 
     if (searchPathLen >= prefixLen) {
       if (!checkMaxBetweenExclusive(n, remaining[0], 256, readVersion, tls)) {
         ok = false;
-          return true;
+        return ok;
       }
     }
 
@@ -2541,12 +2539,12 @@ struct CheckRangeLeftSide {
         }
         n = c;
         ok = maxVersion(n) <= readVersion;
-          return true;
+        return ok;
       } else {
         n = nextSibling(n);
         if (n == nullptr) {
           ok = true;
-            return true;
+          return ok;
         }
         goto downLeftSpine;
       }
@@ -2558,8 +2556,7 @@ struct CheckRangeLeftSide {
 
     if (n->partialKeyLen > 0) {
       int commonLen = std::min<int>(n->partialKeyLen, remaining.size());
-        int i =
+      int i = longestCommonPrefix(n->partialKey(), remaining.data(), commonLen);
-            longestCommonPrefix(n->partialKey(), remaining.data(), commonLen);
       searchPathLen += i;
       if (i < commonLen) {
         auto c = n->partialKey()[i] <=> remaining[i];
@@ -2569,45 +2566,43 @@ struct CheckRangeLeftSide {
           }
           if (n->entryPresent && n->entry.rangeVersion > readVersion) {
             ok = false;
-              return true;
+            return ok;
           }
           ok = maxVersion(n) <= readVersion;
-            return true;
+          return ok;
         } else {
           n = nextSibling(n);
           if (n == nullptr) {
             ok = true;
-              return true;
+            return ok;
           }
           goto downLeftSpine;
         }
       }
       if (commonLen == n->partialKeyLen) {
         // partial key matches
-          remaining =
+        remaining = remaining.subspan(commonLen, remaining.size() - commonLen);
-              remaining.subspan(commonLen, remaining.size() - commonLen);
       } else if (n->partialKeyLen > int(remaining.size())) {
         assert(searchPathLen >= prefixLen);
         if (n->entryPresent && n->entry.rangeVersion > readVersion) {
           ok = false;
-            return true;
+          return ok;
         }
         ok = maxVersion(n) <= readVersion;
-          return true;
+        return ok;
       }
     }
     if (maxV <= readVersion) {
       ok = true;
-        return true;
+      return ok;
     }
   }
-  downLeftSpine:
+downLeftSpine:
   for (; !n->entryPresent; n = getFirstChildExists(n)) {
   }
   ok = n->entry.rangeVersion <= readVersion;
-    return true;
+  return ok;
-  }
+}
-};
 
 // Return true if the max version among all keys that start with key[:prefixLen]
 // that are < key is <= readVersion
@@ -2816,13 +2811,12 @@ bool checkRangeRead(Node *n, std::span<const uint8_t> begin,
   // 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));
-  CheckRangeLeftSide checkRangeLeftSide{};
+  bool lhsOk = checkRangeLeftSide(n, begin, lcp + 1, readVersion, tls);
-  checkRangeLeftSide.step(n, begin, lcp + 1, readVersion, tls);
   CheckRangeRightSide checkRangeRightSide{n, end, lcp + 1, readVersion, tls};
   for (; !checkRangeRightSide.step(); ++tls->range_read_iterations_accum)
     ;
 
-  return checkRangeLeftSide.ok && checkRangeRightSide.ok;
+  return lhsOk && checkRangeRightSide.ok;
 }
 
 #ifdef __x86_64__