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

Add short-circuiting back for range common prefix search

Browse Source
This commit is contained in:
Andrew Noyes
2024-10-12 17:10:19 -07:00
parent f60833a57f
commit e8982074f2
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ConflictSet.cpp
View File

@@ -3318,7 +3318,8 @@ PRESERVE_NONE void begin(CheckJob *job, CheckContext *context) {
MUSTTAIL return done_common_prefix_iter(job, context); MUSTTAIL return done_common_prefix_iter(job, context);
} }
auto c = getChild(job->n, job->remaining[0]); auto [c, maxV] = getChildAndMaxVersion(job->n, job->remaining[0]);
job->maxV = maxV;
job->child = c; job->child = c;
if (job->child == nullptr) { if (job->child == nullptr) {
MUSTTAIL return done_common_prefix_iter(job, context); MUSTTAIL return done_common_prefix_iter(job, context);
@@ -3351,11 +3352,18 @@ void common_prefix_iter(CheckJob *job, CheckContext *context) {
++context->tls->range_read_iterations_accum; ++context->tls->range_read_iterations_accum;
if (job->maxV <= job->readVersion) {
job->setResult(true);
++context->tls->range_read_short_circuit_accum;
MUSTTAIL return complete(job, context);
}
if (job->remaining.size() == 0) { if (job->remaining.size() == 0) {
MUSTTAIL return done_common_prefix_iter(job, context); MUSTTAIL return done_common_prefix_iter(job, context);
} }
auto c = getChild(child, job->remaining[0]); auto [c, maxV] = getChildAndMaxVersion(child, job->remaining[0]);
job->maxV = maxV;
job->child = c; job->child = c;
if (job->child == nullptr) { if (job->child == nullptr) {
MUSTTAIL return done_common_prefix_iter(job, context); MUSTTAIL return done_common_prefix_iter(job, context);