Skip to content

Commit 96e7cb8

Browse files
pks-tgitster
authored andcommitted
refs/reftable: refactor reflog expiry to use reftable backend
Refactor the callback function that expires reflog entries in the reftable backend to use `reftable_backend_read_ref()` instead of accessing the reftable stack directly. This ensures that the function will benefit from the new caching layer that we're about to introduce. Signed-off-by: Patrick Steinhardt <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent ad6c41f commit 96e7cb8

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

refs/reftable-backend.c

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2444,14 +2444,15 @@ static int reftable_be_reflog_expire(struct ref_store *ref_store,
24442444
reftable_be_downcast(ref_store, REF_STORE_WRITE, "reflog_expire");
24452445
struct reftable_log_record *logs = NULL;
24462446
struct reftable_log_record *rewritten = NULL;
2447-
struct reftable_ref_record ref_record = {0};
24482447
struct reftable_iterator it = {0};
24492448
struct reftable_addition *add = NULL;
24502449
struct reflog_expiry_arg arg = {0};
24512450
struct reftable_backend *be;
24522451
struct object_id oid = {0};
2452+
struct strbuf referent = STRBUF_INIT;
24532453
uint8_t *last_hash = NULL;
24542454
size_t logs_nr = 0, logs_alloc = 0, i;
2455+
unsigned int type = 0;
24552456
int ret;
24562457

24572458
if (refs->err < 0)
@@ -2473,12 +2474,9 @@ static int reftable_be_reflog_expire(struct ref_store *ref_store,
24732474
if (ret < 0)
24742475
goto done;
24752476

2476-
ret = reftable_stack_read_ref(be->stack, refname, &ref_record);
2477+
ret = reftable_backend_read_ref(be, refname, &oid, &referent, &type);
24772478
if (ret < 0)
24782479
goto done;
2479-
if (reftable_ref_record_val1(&ref_record))
2480-
oidread(&oid, reftable_ref_record_val1(&ref_record),
2481-
ref_store->repo->hash_algo);
24822480
prepare_fn(refname, &oid, policy_cb_data);
24832481

24842482
while (1) {
@@ -2545,8 +2543,7 @@ static int reftable_be_reflog_expire(struct ref_store *ref_store,
25452543
}
25462544
}
25472545

2548-
if (flags & EXPIRE_REFLOGS_UPDATE_REF && last_hash &&
2549-
reftable_ref_record_val1(&ref_record))
2546+
if (flags & EXPIRE_REFLOGS_UPDATE_REF && last_hash && !is_null_oid(&oid))
25502547
oidread(&arg.update_oid, last_hash, ref_store->repo->hash_algo);
25512548

25522549
arg.refs = refs;
@@ -2571,11 +2568,11 @@ static int reftable_be_reflog_expire(struct ref_store *ref_store,
25712568
cleanup_fn(policy_cb_data);
25722569
assert(ret != REFTABLE_API_ERROR);
25732570

2574-
reftable_ref_record_release(&ref_record);
25752571
reftable_iterator_destroy(&it);
25762572
reftable_addition_destroy(add);
25772573
for (i = 0; i < logs_nr; i++)
25782574
reftable_log_record_release(&logs[i]);
2575+
strbuf_release(&referent);
25792576
free(logs);
25802577
free(rewritten);
25812578
return ret;

0 commit comments

Comments
 (0)