mirror of
https://github.com/git/git.git
synced 2026-08-08 17:11:48 +00:00
reftable: fix quadratic behavior in the presence of tombstones
When many tombstones are present in a reftable, operations that need to look up or iterate over refs exhibit quadratic behavior. With 8000 refs deleted and re-created, update-ref takes ~15s, quadrupling for each doubling of input size. The root cause is the merged iterator's suppress_deletions flag. When set, merged_iter_next_void() silently consumes tombstone records in a tight internal loop before returning to the caller. This prevents higher-level code from checking iteration bounds (such as prefix or refname comparisons) until after all tombstones have been scanned. This affects any code path that seeks into a range containing tombstones, including: - refs_verify_refnames_available() seeks to "refs/tags/foo-1/" to check for D/F conflicts and must scan through all subsequent tombstones before the caller can see that they are past the prefix of interest. - reftable_backend_read_ref() seeks to a specific refname and must scan through all subsequent tombstones before returning "not found", because the merged iterator skips the matching tombstone and searches for the next live record. Fix this by making suppress_deletions configurable via reftable_stack_options instead of unconditionally enabling it. Git no longer sets the flag, so tombstones are now returned to callers in the reftable backend, which skip them after their existing bounds checks. This allows iteration to terminate as soon as a tombstone past the relevant bound is encountered. Downstream users of the reftable library (e.g. libgit2) can still enable suppress_deletions through the stack options to retain the previous behavior. This also requires adding deletion checks to the log iteration paths, since suppress_deletions applied to both ref and log iterators. Both tests in p1401 go from ~13s to ~0.2s with this change. Reported-by: Jeff King <peff@peff.net> Signed-off-by: Kristofer Karlsson <krka@spotify.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
13d8160f49
commit
146a946321
@@ -84,7 +84,8 @@ static int reftable_backend_read_ref(struct reftable_backend *be,
|
||||
if (ret)
|
||||
goto done;
|
||||
|
||||
if (strcmp(ref.refname, refname)) {
|
||||
if (strcmp(ref.refname, refname) ||
|
||||
reftable_ref_record_is_deletion(&ref)) {
|
||||
ret = 1;
|
||||
goto done;
|
||||
}
|
||||
@@ -110,7 +111,6 @@ static int reftable_backend_read_ref(struct reftable_backend *be,
|
||||
oidread(oid, reftable_ref_record_val1(&ref),
|
||||
&hash_algos[hash_id]);
|
||||
} else {
|
||||
/* We got a tombstone, which should not happen. */
|
||||
BUG("unhandled reference value type %d", ref.value_type);
|
||||
}
|
||||
|
||||
@@ -652,6 +652,9 @@ static int reftable_ref_iterator_advance(struct ref_iterator *ref_iterator)
|
||||
break;
|
||||
}
|
||||
|
||||
if (iter->ref.value_type == REFTABLE_REF_DELETION)
|
||||
continue;
|
||||
|
||||
if (iter->exclude_patterns && should_exclude_current_ref(iter))
|
||||
continue;
|
||||
|
||||
@@ -1532,6 +1535,8 @@ static int write_transaction_table(struct reftable_writer *writer, void *cb_data
|
||||
ret = 0;
|
||||
break;
|
||||
}
|
||||
if (reftable_log_record_is_deletion(&log))
|
||||
continue;
|
||||
|
||||
ALLOC_GROW(logs, logs_nr + 1, logs_alloc);
|
||||
tombstone = &logs[logs_nr++];
|
||||
@@ -1929,6 +1934,8 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)
|
||||
ret = 0;
|
||||
break;
|
||||
}
|
||||
if (reftable_log_record_is_deletion(&old_log))
|
||||
continue;
|
||||
|
||||
free(old_log.refname);
|
||||
|
||||
@@ -2061,6 +2068,9 @@ static int reftable_reflog_iterator_advance(struct ref_iterator *ref_iterator)
|
||||
if (iter->err)
|
||||
break;
|
||||
|
||||
if (reftable_log_record_is_deletion(&iter->log))
|
||||
continue;
|
||||
|
||||
/*
|
||||
* We want the refnames that we have reflogs for, so we skip if
|
||||
* we've already produced this name. This could be faster by
|
||||
@@ -2220,6 +2230,8 @@ static int reftable_be_for_each_reflog_ent_reverse(struct ref_store *ref_store,
|
||||
ret = 0;
|
||||
break;
|
||||
}
|
||||
if (reftable_log_record_is_deletion(&log))
|
||||
continue;
|
||||
|
||||
ret = yield_log_record(refs, &log, fn, cb_data);
|
||||
if (ret)
|
||||
@@ -2272,6 +2284,10 @@ static int reftable_be_for_each_reflog_ent(struct ref_store *ref_store,
|
||||
ret = 0;
|
||||
break;
|
||||
}
|
||||
if (reftable_log_record_is_deletion(&log)) {
|
||||
reftable_log_record_release(&log);
|
||||
continue;
|
||||
}
|
||||
|
||||
ALLOC_GROW(logs, logs_nr + 1, logs_alloc);
|
||||
logs[logs_nr++] = log;
|
||||
@@ -2318,18 +2334,26 @@ static int reftable_be_reflog_exists(struct ref_store *ref_store,
|
||||
goto done;
|
||||
|
||||
/*
|
||||
* Check whether we get at least one log record for the given ref name.
|
||||
* If so, the reflog exists, otherwise it doesn't.
|
||||
* Check whether we get at least one non-deleted log record for the
|
||||
* given ref name. If so, the reflog exists, otherwise it doesn't.
|
||||
*/
|
||||
ret = reftable_iterator_next_log(&it, &log);
|
||||
if (ret < 0)
|
||||
goto done;
|
||||
if (ret > 0) {
|
||||
ret = 0;
|
||||
goto done;
|
||||
while (1) {
|
||||
ret = reftable_iterator_next_log(&it, &log);
|
||||
if (ret < 0)
|
||||
goto done;
|
||||
if (ret > 0) {
|
||||
ret = 0;
|
||||
goto done;
|
||||
}
|
||||
if (strcmp(log.refname, refname)) {
|
||||
ret = 0;
|
||||
goto done;
|
||||
}
|
||||
if (!reftable_log_record_is_deletion(&log))
|
||||
break;
|
||||
}
|
||||
|
||||
ret = strcmp(log.refname, refname) == 0;
|
||||
ret = 1;
|
||||
|
||||
done:
|
||||
reftable_iterator_destroy(&it);
|
||||
@@ -2442,6 +2466,8 @@ static int write_reflog_delete_table(struct reftable_writer *writer, void *cb_da
|
||||
ret = 0;
|
||||
break;
|
||||
}
|
||||
if (reftable_log_record_is_deletion(&log))
|
||||
continue;
|
||||
|
||||
tombstone.refname = (char *)arg->refname;
|
||||
tombstone.value_type = REFTABLE_LOG_DELETION;
|
||||
@@ -2625,6 +2651,10 @@ static int reftable_be_reflog_expire(struct ref_store *ref_store,
|
||||
reftable_log_record_release(&log);
|
||||
break;
|
||||
}
|
||||
if (reftable_log_record_is_deletion(&log)) {
|
||||
reftable_log_record_release(&log);
|
||||
continue;
|
||||
}
|
||||
|
||||
oidread(&old_oid, log.value.update.old_hash,
|
||||
ref_store->repo->hash_algo);
|
||||
@@ -2791,6 +2821,8 @@ static int reftable_be_fsck(struct ref_store *ref_store, struct fsck_options *o,
|
||||
report.path = refname.buf;
|
||||
|
||||
switch (ref.value_type) {
|
||||
case REFTABLE_REF_DELETION:
|
||||
continue;
|
||||
case REFTABLE_REF_VAL1:
|
||||
case REFTABLE_REF_VAL2: {
|
||||
struct object_id oid;
|
||||
|
||||
@@ -42,6 +42,8 @@ struct reftable_stack_options {
|
||||
*/
|
||||
void (*on_reload)(void *payload);
|
||||
void *on_reload_payload;
|
||||
|
||||
int suppress_deletions;
|
||||
};
|
||||
|
||||
/* open a new reftable stack. The tables along with the table list will be
|
||||
|
||||
@@ -337,7 +337,7 @@ static int reftable_stack_reload_once(struct reftable_stack *st,
|
||||
/* Update the stack to point to the new tables. */
|
||||
if (st->merged)
|
||||
reftable_merged_table_free(st->merged);
|
||||
new_merged->suppress_deletions = 1;
|
||||
new_merged->suppress_deletions = st->opts.suppress_deletions;
|
||||
st->merged = new_merged;
|
||||
|
||||
if (st->tables)
|
||||
|
||||
Reference in New Issue
Block a user