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

Remove dead code

Browse Source
This commit is contained in:
Andrew Noyes
2024-10-11 23:47:32 -07:00
parent 147f5af16b
commit 2e7e357355
1 changed files with 5 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
ConflictSet.cpp
View File

@@ -3372,9 +3372,8 @@ PRESERVE_NONE void done_common_prefix_iter(CheckJob *job,
MUSTTAIL return complete(job, context); MUSTTAIL return complete(job, context);
} }
// This makes it safe to check maxVersion within checkRangeLeftSide. If this // If this were not true we would have returned above
// were false, then we would have returned above since lcp == begin.size(). assert(job->begin.size() > 0);
assert(!(job->n->parent == nullptr && job->begin.size() == 0));
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],
@@ -3387,43 +3386,15 @@ PRESERVE_NONE void done_common_prefix_iter(CheckJob *job,
job->searchPathLen = 0; job->searchPathLen = 0;
job->prefixLen = job->lcp + 1; job->prefixLen = job->lcp + 1;
if (job->remaining.size() == 0) {
assert(job->searchPathLen >= job->prefixLen);
if (maxVersion(job->n) > job->readVersion) {
job->setResult(false);
MUSTTAIL return complete(job, context);
} else {
job->continuation = done_left_side_iter;
MUSTTAIL return job->continuation(job, context);
}
}
if (job->searchPathLen >= job->prefixLen) {
if (!checkMaxBetweenExclusive(job->n, job->remaining[0], 256,
job->readVersion, context->tls)) {
job->setResult(false);
MUSTTAIL return complete(job, context);
}
}
auto c = getChild(job->n, job->remaining[0]); auto c = getChild(job->n, job->remaining[0]);
Node *child = c; Node *child = c;
if (child == nullptr) { if (child == nullptr) {
auto c = getChildGeq(job->n, job->remaining[0]); auto c = getChildGeq(job->n, job->remaining[0]);
if (c != nullptr) { if (c != nullptr) {
if (job->searchPathLen < job->prefixLen) {
job->n = c;
job->continuation = left_side_down_left_spine;
__builtin_prefetch(job->n);
MUSTTAIL return keepGoing(job, context);
}
job->n = c; job->n = c;
if (maxVersion(job->n) > job->readVersion) { job->continuation = left_side_down_left_spine;
job->setResult(false); __builtin_prefetch(job->n);
MUSTTAIL return complete(job, context); MUSTTAIL return keepGoing(job, context);
}
job->continuation = done_left_side_iter;
MUSTTAIL return job->continuation(job, context);
} else { } else {
job->n = nextSibling(job->n); job->n = nextSibling(job->n);
if (job->n == nullptr) { if (job->n == nullptr) {