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

Add "iter" state

Browse Source
This commit is contained in:
Andrew Noyes
2024-09-10 17:22:10 -07:00
parent fe5cfb0336
commit 0550fa0016
1 changed files with 51 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ConflictSet.cpp
View File

@@ -3040,6 +3040,7 @@ struct CheckJob {
namespace check_point_read_state_machine { namespace check_point_read_state_machine {
CheckJob::continuation down_left_spine(CheckJob *job); CheckJob::continuation down_left_spine(CheckJob *job);
CheckJob::continuation iter(CheckJob *job);
// Logically this is the same as performing firstGeq and then checking against // Logically this is the same as performing firstGeq and then checking against
// point or range version according to cmp, but this version short circuits as // point or range version according to cmp, but this version short circuits as
@@ -3049,7 +3050,10 @@ CheckJob::continuation begin(CheckJob *job) {
#if DEBUG_VERBOSE && !defined(NDEBUG) #if DEBUG_VERBOSE && !defined(NDEBUG)
fprintf(stderr, "Check point read: %s\n", printable(key).c_str()); fprintf(stderr, "Check point read: %s\n", printable(key).c_str());
#endif #endif
for (;; ++job->tls->point_read_iterations_accum) { return iter(job);
}
CheckJob::continuation iter(CheckJob *job) {
if (job->begin.size() == 0) { if (job->begin.size() == 0) {
if (job->n->entryPresent) { if (job->n->entryPresent) {
job->setResult(job->n->entry.pointVersion <= job->readVersion); job->setResult(job->n->entry.pointVersion <= job->readVersion);
@@ -3080,8 +3084,8 @@ CheckJob::continuation begin(CheckJob *job) {
if (job->n->partialKeyLen > 0) { if (job->n->partialKeyLen > 0) {
int commonLen = std::min<int>(job->n->partialKeyLen, job->begin.size()); int commonLen = std::min<int>(job->n->partialKeyLen, job->begin.size());
int i = longestCommonPrefix(job->n->partialKey(), job->begin.data(), int i =
commonLen); longestCommonPrefix(job->n->partialKey(), job->begin.data(), commonLen);
if (i < commonLen) { if (i < commonLen) {
auto c = job->n->partialKey()[i] <=> job->begin[i]; auto c = job->n->partialKey()[i] <=> job->begin[i];
if (c > 0) { if (c > 0) {
@@ -3097,8 +3101,7 @@ CheckJob::continuation begin(CheckJob *job) {
} }
if (commonLen == job->n->partialKeyLen) { if (commonLen == job->n->partialKeyLen) {
// partial key matches // partial key matches
job->begin = job->begin = job->begin.subspan(commonLen, job->begin.size() - commonLen);
job->begin.subspan(commonLen, job->begin.size() - commonLen);
} else if (job->n->partialKeyLen > int(job->begin.size())) { } else if (job->n->partialKeyLen > int(job->begin.size())) {
// n is the first physical node greater than remaining, and there's no // n is the first physical node greater than remaining, and there's no
// eq node // eq node
@@ -3111,7 +3114,9 @@ CheckJob::continuation begin(CheckJob *job) {
job->setResult(true); job->setResult(true);
return nullptr; // Done return nullptr; // Done
} }
}
++job->tls->point_read_iterations_accum;
return iter;
} }
CheckJob::continuation down_left_spine(CheckJob *job) { CheckJob::continuation down_left_spine(CheckJob *job) {