Prepare for interleaving checkRangeRightSide

ConflictSet.cpp

@@ -2496,27 +2496,19 @@ bool checkRangeRightSide(Node *n, std::span<const uint8_t> key, int prefixLen,
   auto remaining = key;
   int searchPathLen = 0;
 
-  for (;; ++tls->range_read_iterations_accum) {
-    assert(searchPathLen <= int(key.size()));
-    if (remaining.size() == 0) {
-      goto downLeftSpine;
-    }
+  assert(remaining.size() > 0);
 
-    if (searchPathLen >= prefixLen) {
-      if (n->entryPresent && n->entry.pointVersion > readVersion) {
-        return false;
-      }
-
-      if (!checkMaxBetweenExclusive(n, -1, remaining[0], readVersion, tls)) {
-        return false;
-      }
-    }
-
-    if (searchPathLen > prefixLen && n->entryPresent &&
-        n->entry.rangeVersion > readVersion) {
+  if (prefixLen == 0) {
+    if (n->entryPresent && n->entry.pointVersion > readVersion) {
       return false;
     }
 
+    if (!checkMaxBetweenExclusive(n, -1, remaining[0], readVersion, tls)) {
+      return false;
+    }
+  }
+
+  for (;;) {
     Node *child = getChild(n, remaining[0]);
     if (child == nullptr) {
       auto c = getChildGeq(n, remaining[0]);
@@ -2556,6 +2548,24 @@ bool checkRangeRightSide(Node *n, std::span<const uint8_t> key, int prefixLen,
         goto downLeftSpine;
       }
     }
+
+    ++tls->range_read_iterations_accum;
+
+    assert(searchPathLen <= int(key.size()));
+
+    if (remaining.size() == 0) {
+      goto downLeftSpine;
+    }
+
+    assert(searchPathLen >= prefixLen);
+    if (n->entryPresent && (n->entry.pointVersion > readVersion ||
+                            n->entry.rangeVersion > readVersion)) {
+      return false;
+    }
+
+    if (!checkMaxBetweenExclusive(n, -1, remaining[0], readVersion, tls)) {
+      return false;
+    }
   }
 backtrack:
   for (;;) {