weaselab/conflict-set
2
0
Fork 0
Code Issues 4 Packages Releases 13 Activity

Simplify

Browse Source
This commit is contained in:
Andrew Noyes
2024-09-04 12:12:54 -07:00
parent 2037d37c66
commit c4c4531bd3
1 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ConflictSet.cpp
View File

@@ -2512,20 +2512,17 @@ namespace {
// that are >= key is <= readVersion // that are >= key is <= readVersion
bool checkRangeLeftSide(Node *n, std::span<const uint8_t> key, int prefixLen, bool checkRangeLeftSide(Node *n, std::span<const uint8_t> key, int prefixLen,
InternalVersionT readVersion, ReadContext *tls) { InternalVersionT readVersion, ReadContext *tls) {
bool ok;
auto remaining = key; auto remaining = key;
int searchPathLen = 0; int searchPathLen = 0;
for (;; ++tls->range_read_iterations_accum) { for (;; ++tls->range_read_iterations_accum) {
if (remaining.size() == 0) { if (remaining.size() == 0) {
assert(searchPathLen >= prefixLen); assert(searchPathLen >= prefixLen);
ok = maxVersion(n) <= readVersion; return maxVersion(n) <= readVersion;
return ok;
} }
if (searchPathLen >= prefixLen) { if (searchPathLen >= prefixLen) {
if (!checkMaxBetweenExclusive(n, remaining[0], 256, readVersion, tls)) { if (!checkMaxBetweenExclusive(n, remaining[0], 256, readVersion, tls)) {
ok = false; return false;
return ok;
} }
} }
@@ -2538,13 +2535,11 @@ bool checkRangeLeftSide(Node *n, std::span<const uint8_t> key, int prefixLen,
goto downLeftSpine; goto downLeftSpine;
} }
n = c; n = c;
ok = maxVersion(n) <= readVersion; return maxVersion(n) <= readVersion;
return ok;
} else { } else {
n = nextSibling(n); n = nextSibling(n);
if (n == nullptr) { if (n == nullptr) {
ok = true; return true;
return ok;
} }
goto downLeftSpine; goto downLeftSpine;
} }
@@ -2565,16 +2560,13 @@ bool checkRangeLeftSide(Node *n, std::span<const uint8_t> key, int prefixLen,
goto downLeftSpine; goto downLeftSpine;
} }
if (n->entryPresent && n->entry.rangeVersion > readVersion) { if (n->entryPresent && n->entry.rangeVersion > readVersion) {
ok = false; return false;
return ok;
} }
ok = maxVersion(n) <= readVersion; return maxVersion(n) <= readVersion;
return ok;
} else { } else {
n = nextSibling(n); n = nextSibling(n);
if (n == nullptr) { if (n == nullptr) {
ok = true; return true;
return ok;
} }
goto downLeftSpine; goto downLeftSpine;
} }
@@ -2585,23 +2577,19 @@ bool checkRangeLeftSide(Node *n, std::span<const uint8_t> key, int prefixLen,
} else if (n->partialKeyLen > int(remaining.size())) { } else if (n->partialKeyLen > int(remaining.size())) {
assert(searchPathLen >= prefixLen); assert(searchPathLen >= prefixLen);
if (n->entryPresent && n->entry.rangeVersion > readVersion) { if (n->entryPresent && n->entry.rangeVersion > readVersion) {
ok = false; return false;
return ok;
} }
ok = maxVersion(n) <= readVersion; return maxVersion(n) <= readVersion;
return ok;
} }
} }
if (maxV <= readVersion) { if (maxV <= readVersion) {
ok = true; return true;
return ok;
} }
} }
downLeftSpine: downLeftSpine:
for (; !n->entryPresent; n = getFirstChildExists(n)) { for (; !n->entryPresent; n = getFirstChildExists(n)) {
} }
ok = n->entry.rangeVersion <= readVersion; return 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]