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

Use CheckJob::setResult

Browse Source
This commit is contained in:
Andrew Noyes
2024-10-12 00:01:35 -07:00
parent 2e7e357355
commit 352c07cbc9
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ConflictSet.cpp
View File

@@ -3365,10 +3365,8 @@ PRESERVE_NONE void done_common_prefix_iter(CheckJob *job,
job->commonPrefixNode = job->n; job->commonPrefixNode = job->n;
if (job->lcp == int(job->begin.size())) { if (job->lcp == int(job->begin.size())) {
*job->result = checkRangeRightSide(job->n, job->end, job->lcp, job->setResult(checkRangeRightSide(job->n, job->end, job->lcp,
job->readVersion, context->tls) job->readVersion, context->tls));
? ConflictSet::Commit
: ConflictSet::Conflict;
MUSTTAIL return complete(job, context); MUSTTAIL return complete(job, context);
} }
@@ -3378,7 +3376,7 @@ PRESERVE_NONE void done_common_prefix_iter(CheckJob *job,
if (!checkRangeStartsWith(job->n, job->begin.subspan(0, job->lcp), if (!checkRangeStartsWith(job->n, job->begin.subspan(0, job->lcp),
job->begin[job->lcp], job->end[job->lcp], job->begin[job->lcp], job->end[job->lcp],
job->readVersion, context->tls)) { job->readVersion, context->tls)) {
*job->result = ConflictSet::Conflict; job->setResult(false);
MUSTTAIL return complete(job, context); MUSTTAIL return complete(job, context);
} }
@@ -3479,7 +3477,7 @@ PRESERVE_NONE void left_side_iter(CheckJob *job, CheckContext *context) {
if (job->remaining.size() == 0) { if (job->remaining.size() == 0) {
assert(job->searchPathLen >= job->prefixLen); assert(job->searchPathLen >= job->prefixLen);
if (maxVersion(n) > job->readVersion) { if (maxVersion(n) > job->readVersion) {
*job->result = ConflictSet::Conflict; job->setResult(false);
MUSTTAIL return complete(job, context); MUSTTAIL return complete(job, context);
} else { } else {
job->continuation = done_left_side_iter; job->continuation = done_left_side_iter;
@@ -3490,7 +3488,7 @@ PRESERVE_NONE void left_side_iter(CheckJob *job, CheckContext *context) {
if (job->searchPathLen >= job->prefixLen) { if (job->searchPathLen >= job->prefixLen) {
if (!checkMaxBetweenExclusive(n, job->remaining[0], 256, job->readVersion, if (!checkMaxBetweenExclusive(n, job->remaining[0], 256, job->readVersion,
context->tls)) { context->tls)) {
*job->result = ConflictSet::Conflict; job->setResult(false);
MUSTTAIL return complete(job, context); MUSTTAIL return complete(job, context);
} }
} }
@@ -3508,7 +3506,7 @@ PRESERVE_NONE void left_side_iter(CheckJob *job, CheckContext *context) {
} }
job->n = c; job->n = c;
if (maxVersion(job->n) > job->readVersion) { if (maxVersion(job->n) > job->readVersion) {
*job->result = ConflictSet::Conflict; job->setResult(false);
MUSTTAIL return complete(job, context); MUSTTAIL return complete(job, context);
} }
job->continuation = done_left_side_iter; job->continuation = done_left_side_iter;