checkRangeLeftSide

This commit is contained in:
2024-09-04 12:11:16 -07:00
parent 6fe6a244af
commit 2037d37c66

View File

@@ -2510,104 +2510,99 @@ downLeftSpine:
namespace { namespace {
// Return true if the max version among all keys that start with key[:prefixLen] // Return true if the max version among all keys that start with key[:prefixLen]
// that are >= key is <= readVersion // that are >= key is <= readVersion
struct CheckRangeLeftSide { bool checkRangeLeftSide(Node *n, std::span<const uint8_t> key, int prefixLen,
InternalVersionT readVersion, ReadContext *tls) {
bool ok; 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 ok;
}
bool step(Node *n, std::span<const uint8_t> key, int prefixLen, if (searchPathLen >= prefixLen) {
InternalVersionT readVersion, ReadContext *tls) { if (!checkMaxBetweenExclusive(n, remaining[0], 256, readVersion, tls)) {
auto remaining = key; ok = false;
int searchPathLen = 0; return ok;
for (;; ++tls->range_read_iterations_accum) {
if (remaining.size() == 0) {
assert(searchPathLen >= prefixLen);
ok = maxVersion(n) <= readVersion;
return true;
} }
}
if (searchPathLen >= prefixLen) { auto [child, maxV] = getChildAndMaxVersion(n, remaining[0]);
if (!checkMaxBetweenExclusive(n, remaining[0], 256, readVersion, tls)) { if (child == nullptr) {
ok = false; auto c = getChildGeq(n, remaining[0]);
return true; if (c != nullptr) {
if (searchPathLen < prefixLen) {
n = c;
goto downLeftSpine;
} }
n = c;
ok = maxVersion(n) <= readVersion;
return ok;
} else {
n = nextSibling(n);
if (n == nullptr) {
ok = true;
return ok;
}
goto downLeftSpine;
} }
}
auto [child, maxV] = getChildAndMaxVersion(n, remaining[0]); n = child;
if (child == nullptr) { remaining = remaining.subspan(1, remaining.size() - 1);
auto c = getChildGeq(n, remaining[0]); ++searchPathLen;
if (c != nullptr) {
if (n->partialKeyLen > 0) {
int commonLen = std::min<int>(n->partialKeyLen, remaining.size());
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) { if (searchPathLen < prefixLen) {
n = c;
goto downLeftSpine; goto downLeftSpine;
} }
n = c; if (n->entryPresent && n->entry.rangeVersion > readVersion) {
ok = false;
return ok;
}
ok = maxVersion(n) <= readVersion; ok = maxVersion(n) <= readVersion;
return true; return ok;
} else { } else {
n = nextSibling(n); n = nextSibling(n);
if (n == nullptr) { if (n == nullptr) {
ok = true; ok = true;
return true; return ok;
} }
goto downLeftSpine; goto downLeftSpine;
} }
} }
if (commonLen == n->partialKeyLen) {
n = child; // partial key matches
remaining = remaining.subspan(1, remaining.size() - 1); remaining = remaining.subspan(commonLen, remaining.size() - commonLen);
++searchPathLen; } else if (n->partialKeyLen > int(remaining.size())) {
assert(searchPathLen >= prefixLen);
if (n->partialKeyLen > 0) { if (n->entryPresent && n->entry.rangeVersion > readVersion) {
int commonLen = std::min<int>(n->partialKeyLen, remaining.size()); ok = false;
int i = return ok;
longestCommonPrefix(n->partialKey(), remaining.data(), commonLen);
searchPathLen += i;
if (i < commonLen) {
auto c = n->partialKey()[i] <=> remaining[i];
if (c > 0) {
if (searchPathLen < prefixLen) {
goto downLeftSpine;
}
if (n->entryPresent && n->entry.rangeVersion > readVersion) {
ok = false;
return true;
}
ok = maxVersion(n) <= readVersion;
return true;
} else {
n = nextSibling(n);
if (n == nullptr) {
ok = true;
return true;
}
goto downLeftSpine;
}
} }
if (commonLen == n->partialKeyLen) { ok = maxVersion(n) <= readVersion;
// partial key matches return ok;
remaining =
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;
}
ok = maxVersion(n) <= readVersion;
return true;
}
}
if (maxV <= readVersion) {
ok = true;
return true;
} }
} }
downLeftSpine: if (maxV <= readVersion) {
for (; !n->entryPresent; n = getFirstChildExists(n)) { ok = true;
return ok;
} }
ok = n->entry.rangeVersion <= readVersion;
return true;
} }
}; downLeftSpine:
for (; !n->entryPresent; n = getFirstChildExists(n)) {
}
ok = n->entry.rangeVersion <= readVersion;
return ok;
}
// Return true if the max version among all keys that start with key[:prefixLen] // Return true if the max version among all keys that start with key[:prefixLen]
// that are < key is <= readVersion // 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 // This makes it safe to check maxVersion within CheckRangeLeftSide. If this
// were false, then we would have returned above since lcp == begin.size(). // were false, then we would have returned above since lcp == begin.size().
assert(!(n->parent == nullptr && begin.size() == 0)); 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}; CheckRangeRightSide checkRangeRightSide{n, end, lcp + 1, readVersion, tls};
for (; !checkRangeRightSide.step(); ++tls->range_read_iterations_accum) for (; !checkRangeRightSide.step(); ++tls->range_read_iterations_accum)
; ;
return checkRangeLeftSide.ok && checkRangeRightSide.ok; return lhsOk && checkRangeRightSide.ok;
} }
#ifdef __x86_64__ #ifdef __x86_64__