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

Convert CheckRangeRightSide WIP

Browse Source
This commit is contained in:
Andrew Noyes
2024-09-04 12:22:36 -07:00
parent b9503f8258
commit 55b73c8ddb
1 changed files with 9 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
ConflictSet.cpp
View File

@@ -2595,39 +2595,16 @@ downLeftSpine:
// 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 CheckRangeRightSide { struct CheckRangeRightSide {
CheckRangeRightSide(Node *n, std::span<const uint8_t> key, int prefixLen,
InternalVersionT readVersion, ReadContext *tls)
: n(n), key(key), remaining(key), prefixLen(prefixLen),
readVersion(readVersion), impl(tls->impl), tls(tls) {
#if DEBUG_VERBOSE && !defined(NDEBUG)
fprintf(stderr, "Check range right side to %s for keys starting with %s\n",
printable(key).c_str(),
printable(key.subspan(0, prefixLen)).c_str());
#endif
}
Node *n;
std::span<const uint8_t> key;
std::span<const uint8_t> remaining;
int prefixLen;
InternalVersionT readVersion;
ConflictSet::Impl *impl;
ReadContext *tls;
int searchPathLen = 0;
bool ok; bool ok;
bool step() { bool step(Node *n, std::span<const uint8_t> key, int prefixLen,
#if DEBUG_VERBOSE && !defined(NDEBUG) InternalVersionT readVersion, ReadContext *tls) {
fprintf(stderr, auto remaining = key;
"Search path: %s, searchPathLen: %d, prefixLen: %d, remaining: " int searchPathLen = 0;
"%s\n",
getSearchPathPrintable(n).c_str(), searchPathLen, prefixLen,
printable(remaining).c_str());
#endif
assert(searchPathLen <= int(key.size()));
for (;; ++tls->range_read_iterations_accum) { for (;; ++tls->range_read_iterations_accum) {
assert(searchPathLen <= int(key.size()));
if (remaining.size() == 0) { if (remaining.size() == 0) {
goto downLeftSpine; goto downLeftSpine;
} }
@@ -2784,8 +2761,8 @@ bool checkRangeRead(Node *n, std::span<const uint8_t> begin,
lcp -= consumed; lcp -= consumed;
if (lcp == int(begin.size())) { if (lcp == int(begin.size())) {
CheckRangeRightSide checkRangeRightSide{n, end, lcp, readVersion, tls}; CheckRangeRightSide checkRangeRightSide{};
for (; !checkRangeRightSide.step();) for (; !checkRangeRightSide.step(n, end, lcp, readVersion, tls);)
; ;
return checkRangeRightSide.ok; return checkRangeRightSide.ok;
} }
@@ -2799,8 +2776,8 @@ bool checkRangeRead(Node *n, std::span<const uint8_t> begin,
// 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));
bool lhsOk = checkRangeLeftSide(n, begin, lcp + 1, readVersion, tls); bool lhsOk = checkRangeLeftSide(n, begin, lcp + 1, readVersion, tls);
CheckRangeRightSide checkRangeRightSide{n, end, lcp + 1, readVersion, tls}; CheckRangeRightSide checkRangeRightSide{};
for (; !checkRangeRightSide.step();) for (; !checkRangeRightSide.step(n, end, lcp + 1, readVersion, tls);)
; ;
return lhsOk && checkRangeRightSide.ok; return lhsOk && checkRangeRightSide.ok;