@matheusbsbs / matheus-bagliano / commits / cfd971520e

refs: keep track of unresolved reference value in iterators

Since ref iterators do not hold onto the direct value of a reference without resolving it, the only way to get ahold of a direct value of a symbolic ref is to make a separate call to refs_read_symbolic_ref. To make accessing the direct value of a symbolic ref more efficient, let's save the direct value of the ref in the iterators for both the files backend and the reftable backend. Signed-off-by: John Cai <johncai86@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

John Cai committed Aug 9, 2024 at 15:37 UTC cfd971520ed11096aaa11f6bd1ee99b307f3146c

6 files changed +30 -5

refs/files-backend.c

+12 -3

@@ -245,9 +245,12 @@ static void loose_fill_ref_dir_regular_file(struct files_ref_store *refs,

245 {

246 struct object_id oid;

247 int flag;

248 + const char *referent = refs_resolve_ref_unsafe(&refs->base,

249 + refname,

250 + RESOLVE_REF_READING,

251 + &oid, &flag);

252

249 - if (!refs_resolve_ref_unsafe(&refs->base, refname, RESOLVE_REF_READING,

250 - &oid, &flag)) {

253 + if (!referent) {

254 oidclr(&oid, the_repository->hash_algo);

255 flag |= REF_ISBROKEN;

256 } else if (is_null_oid(&oid)) {

@@ -268,7 +271,11 @@ static void loose_fill_ref_dir_regular_file(struct files_ref_store *refs,

271 oidclr(&oid, the_repository->hash_algo);

272 flag |= REF_BAD_NAME | REF_ISBROKEN;

273 }

271 - add_entry_to_dir(dir, create_ref_entry(refname, &oid, flag));

274 +

275 + if (!(flag & REF_ISSYMREF))

276 + referent = NULL;

277 +

278 + add_entry_to_dir(dir, create_ref_entry(refname, referent, &oid, flag));

279 }

280

281 /*

@@ -886,6 +893,8 @@ static int files_ref_iterator_advance(struct ref_iterator *ref_iterator)

893 iter->base.refname = iter->iter0->refname;

894 iter->base.oid = iter->iter0->oid;

895 iter->base.flags = iter->iter0->flags;

896 + iter->base.referent = iter->iter0->referent;

897 +

898 return ITER_OK;

899 }

900

refs/iterator.c

@@ -29,6 +29,7 @@ void base_ref_iterator_init(struct ref_iterator *iter,

29 {

30 iter->vtable = vtable;

31 iter->refname = NULL;

32 + iter->referent = NULL;

33 iter->oid = NULL;

34 iter->flags = 0;

35 }

@@ -199,6 +200,7 @@ static int merge_ref_iterator_advance(struct ref_iterator *ref_iterator)

200 }

201

202 if (selection & ITER_YIELD_CURRENT) {

203 + iter->base.referent = (*iter->current)->referent;

204 iter->base.refname = (*iter->current)->refname;

205 iter->base.oid = (*iter->current)->oid;

206 iter->base.flags = (*iter->current)->flags;

refs/ref-cache.c

@@ -34,6 +34,7 @@ struct ref_dir *get_ref_dir(struct ref_entry *entry)

34 }

36 struct ref_entry *create_ref_entry(const char *refname,

37 + const char *referent,

38 const struct object_id *oid, int flag)

39 {

40 struct ref_entry *ref;

@@ -41,6 +42,8 @@ struct ref_entry *create_ref_entry(const char *refname,

42 FLEX_ALLOC_STR(ref, name, refname);

43 oidcpy(&ref->u.value.oid, oid);

44 ref->flag = flag;

45 + ref->u.value.referent = xstrdup_or_null(referent);

46 +

47 return ref;

48 }

@@ -66,6 +69,7 @@ static void free_ref_entry(struct ref_entry *entry)

69 */

70 clear_ref_dir(&entry->u.subdir);

71 }

72 + free(entry->u.value.referent);

73 free(entry);

74 }

@@ -431,6 +435,7 @@ static int cache_ref_iterator_advance(struct ref_iterator *ref_iterator)

435 level->index = -1;

436 } else {

437 iter->base.refname = entry->name;

438 + iter->base.referent = entry->u.value.referent;

439 iter->base.oid = &entry->u.value.oid;

440 iter->base.flags = entry->flag;

441 return ITER_OK;

refs/ref-cache.h

@@ -42,6 +42,7 @@ struct ref_value {

42 * referred to by the last reference in the symlink chain.

43 */

44 struct object_id oid;

45 + char *referent;

46 };

48 /*

@@ -173,6 +174,7 @@ struct ref_entry *create_dir_entry(struct ref_cache *cache,

174 const char *dirname, size_t len);

175

176 struct ref_entry *create_ref_entry(const char *refname,

177 + const char *referent,

178 const struct object_id *oid, int flag);

179

180 /*

refs/refs-internal.h

@@ -299,6 +299,7 @@ enum do_for_each_ref_flags {

299 struct ref_iterator {

300 struct ref_iterator_vtable *vtable;

301 const char *refname;

302 + const char *referent;

303 const struct object_id *oid;

304 unsigned int flags;

305 };

refs/reftable-backend.c

+8 -2

@@ -455,6 +455,7 @@ static int reftable_ref_iterator_advance(struct ref_iterator *ref_iterator)

455 struct reftable_ref_iterator *iter =

456 (struct reftable_ref_iterator *)ref_iterator;

457 struct reftable_ref_store *refs = iter->refs;

458 + const char *referent = NULL;

459

460 while (!iter->err) {

461 int flags = 0;

@@ -494,8 +495,12 @@ static int reftable_ref_iterator_advance(struct ref_iterator *ref_iterator)

495 the_repository->hash_algo);

496 break;

497 case REFTABLE_REF_SYMREF:

497 - if (!refs_resolve_ref_unsafe(&iter->refs->base, iter->ref.refname,

498 - RESOLVE_REF_READING, &iter->oid, &flags))

498 + referent = refs_resolve_ref_unsafe(&iter->refs->base,

499 + iter->ref.refname,

500 + RESOLVE_REF_READING,

501 + &iter->oid,

502 + &flags);

503 + if (!referent)

504 oidclr(&iter->oid, the_repository->hash_algo);

505 break;

506 default:

@@ -523,6 +528,7 @@ static int reftable_ref_iterator_advance(struct ref_iterator *ref_iterator)

528 continue;

529

530 iter->base.refname = iter->ref.refname;

531 + iter->base.referent = referent;

532 iter->base.oid = &iter->oid;

533 iter->base.flags = flags;

534