Skip to content

Commit fd4bb38

Browse files
gitstergitster
committed
Merge branch 'jc/war-on-string-list'
Replace three string-list instances used as look-up tables in "git fetch" with hashmaps. * jc/war-on-string-list: fetch: replace string-list used as a look-up table with a hashmap
2 parents 20d04b4 + e198b3a commit fd4bb38

1 file changed

Lines changed: 100 additions & 46 deletions

File tree

‎builtin/fetch.c‎

Lines changed: 100 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -223,18 +223,6 @@ static void add_merge_config(struct ref **head,
223223
}
224224
}
225225

226-
static int add_existing(const char *refname, const struct object_id *oid,
227-
int flag, void *cbdata)
228-
{
229-
struct string_list *list = (struct string_list *)cbdata;
230-
struct string_list_item *item = string_list_insert(list, refname);
231-
struct object_id *old_oid = xmalloc(sizeof(*old_oid));
232-
233-
oidcpy(old_oid, oid);
234-
item->util = old_oid;
235-
return 0;
236-
}
237-
238226
static int will_fetch(struct ref **head, const unsigned char *sha1)
239227
{
240228
struct ref *rm = *head;
@@ -246,16 +234,72 @@ static int will_fetch(struct ref **head, const unsigned char *sha1)
246234
return 0;
247235
}
248236

237+
struct refname_hash_entry {
238+
struct hashmap_entry ent; /* must be the first member */
239+
struct object_id oid;
240+
char refname[FLEX_ARRAY];
241+
};
242+
243+
static int refname_hash_entry_cmp(const void *hashmap_cmp_fn_data,
244+
const void *e1_,
245+
const void *e2_,
246+
const void *keydata)
247+
{
248+
const struct refname_hash_entry *e1 = e1_;
249+
const struct refname_hash_entry *e2 = e2_;
250+
251+
return strcmp(e1->refname, keydata ? keydata : e2->refname);
252+
}
253+
254+
static struct refname_hash_entry *refname_hash_add(struct hashmap *map,
255+
const char *refname,
256+
const struct object_id *oid)
257+
{
258+
struct refname_hash_entry *ent;
259+
size_t len = strlen(refname);
260+
261+
FLEX_ALLOC_MEM(ent, refname, refname, len);
262+
hashmap_entry_init(ent, strhash(refname));
263+
oidcpy(&ent->oid, oid);
264+
hashmap_add(map, ent);
265+
return ent;
266+
}
267+
268+
static int add_one_refname(const char *refname,
269+
const struct object_id *oid,
270+
int flag, void *cbdata)
271+
{
272+
struct hashmap *refname_map = cbdata;
273+
274+
(void) refname_hash_add(refname_map, refname, oid);
275+
return 0;
276+
}
277+
278+
static void refname_hash_init(struct hashmap *map)
279+
{
280+
hashmap_init(map, refname_hash_entry_cmp, NULL, 0);
281+
}
282+
283+
static int refname_hash_exists(struct hashmap *map, const char *refname)
284+
{
285+
return !!hashmap_get_from_hash(map, strhash(refname), refname);
286+
}
287+
249288
static void find_non_local_tags(const struct ref *refs,
250289
struct ref **head,
251290
struct ref ***tail)
252291
{
253-
struct string_list existing_refs = STRING_LIST_INIT_DUP;
254-
struct string_list remote_refs = STRING_LIST_INIT_NODUP;
292+
struct hashmap existing_refs;
293+
struct hashmap remote_refs;
294+
struct string_list remote_refs_list = STRING_LIST_INIT_NODUP;
295+
struct string_list_item *remote_ref_item;
255296
const struct ref *ref;
256-
struct string_list_item *item = NULL;
297+
struct refname_hash_entry *item = NULL;
298+
299+
refname_hash_init(&existing_refs);
300+
refname_hash_init(&remote_refs);
257301

258-
for_each_ref(add_existing, &existing_refs);
302+
for_each_ref(add_one_refname, &existing_refs);
259303
for (ref = refs; ref; ref = ref->next) {
260304
if (!starts_with(ref->name, "refs/tags/"))
261305
continue;
@@ -271,10 +315,10 @@ static void find_non_local_tags(const struct ref *refs,
271315
!has_object_file_with_flags(&ref->old_oid,
272316
OBJECT_INFO_QUICK) &&
273317
!will_fetch(head, ref->old_oid.hash) &&
274-
!has_sha1_file_with_flags(item->util,
318+
!has_sha1_file_with_flags(item->oid.hash,
275319
OBJECT_INFO_QUICK) &&
276-
!will_fetch(head, item->util))
277-
item->util = NULL;
320+
!will_fetch(head, item->oid.hash))
321+
oidclr(&item->oid);
278322
item = NULL;
279323
continue;
280324
}
@@ -286,48 +330,53 @@ static void find_non_local_tags(const struct ref *refs,
286330
* fetch.
287331
*/
288332
if (item &&
289-
!has_sha1_file_with_flags(item->util, OBJECT_INFO_QUICK) &&
290-
!will_fetch(head, item->util))
291-
item->util = NULL;
333+
!has_sha1_file_with_flags(item->oid.hash, OBJECT_INFO_QUICK) &&
334+
!will_fetch(head, item->oid.hash))
335+
oidclr(&item->oid);
292336

293337
item = NULL;
294338

295339
/* skip duplicates and refs that we already have */
296-
if (string_list_has_string(&remote_refs, ref->name) ||
297-
string_list_has_string(&existing_refs, ref->name))
340+
if (refname_hash_exists(&remote_refs, ref->name) ||
341+
refname_hash_exists(&existing_refs, ref->name))
298342
continue;
299343

300-
item = string_list_insert(&remote_refs, ref->name);
301-
item->util = (void *)&ref->old_oid;
344+
item = refname_hash_add(&remote_refs, ref->name, &ref->old_oid);
345+
string_list_insert(&remote_refs_list, ref->name);
302346
}
303-
string_list_clear(&existing_refs, 1);
347+
hashmap_free(&existing_refs, 1);
304348

305349
/*
306350
* We may have a final lightweight tag that needs to be
307351
* checked to see if it needs fetching.
308352
*/
309353
if (item &&
310-
!has_sha1_file_with_flags(item->util, OBJECT_INFO_QUICK) &&
311-
!will_fetch(head, item->util))
312-
item->util = NULL;
354+
!has_sha1_file_with_flags(item->oid.hash, OBJECT_INFO_QUICK) &&
355+
!will_fetch(head, item->oid.hash))
356+
oidclr(&item->oid);
313357

314358
/*
315-
* For all the tags in the remote_refs string list,
359+
* For all the tags in the remote_refs_list,
316360
* add them to the list of refs to be fetched
317361
*/
318-
for_each_string_list_item(item, &remote_refs) {
362+
for_each_string_list_item(remote_ref_item, &remote_refs_list) {
363+
const char *refname = remote_ref_item->string;
364+
365+
item = hashmap_get_from_hash(&remote_refs, strhash(refname), refname);
366+
if (!item)
367+
BUG("unseen remote ref?");
368+
319369
/* Unless we have already decided to ignore this item... */
320-
if (item->util)
321-
{
322-
struct ref *rm = alloc_ref(item->string);
323-
rm->peer_ref = alloc_ref(item->string);
324-
oidcpy(&rm->old_oid, item->util);
370+
if (!is_null_oid(&item->oid)) {
371+
struct ref *rm = alloc_ref(item->refname);
372+
rm->peer_ref = alloc_ref(item->refname);
373+
oidcpy(&rm->old_oid, &item->oid);
325374
**tail = rm;
326375
*tail = &rm->next;
327376
}
328377
}
329-
330-
string_list_clear(&remote_refs, 0);
378+
hashmap_free(&remote_refs, 1);
379+
string_list_clear(&remote_refs_list, 0);
331380
}
332381

333382
static struct ref *get_ref_map(struct remote *remote,
@@ -343,7 +392,7 @@ static struct ref *get_ref_map(struct remote *remote,
343392
/* opportunistically-updated references: */
344393
struct ref *orefs = NULL, **oref_tail = &orefs;
345394

346-
struct string_list existing_refs = STRING_LIST_INIT_DUP;
395+
struct hashmap existing_refs;
347396

348397
if (rs->nr) {
349398
struct refspec *fetch_refspec;
@@ -437,19 +486,24 @@ static struct ref *get_ref_map(struct remote *remote,
437486

438487
ref_map = ref_remove_duplicates(ref_map);
439488

440-
for_each_ref(add_existing, &existing_refs);
489+
refname_hash_init(&existing_refs);
490+
for_each_ref(add_one_refname, &existing_refs);
491+
441492
for (rm = ref_map; rm; rm = rm->next) {
442493
if (rm->peer_ref) {
443-
struct string_list_item *peer_item =
444-
string_list_lookup(&existing_refs,
445-
rm->peer_ref->name);
494+
const char *refname = rm->peer_ref->name;
495+
struct refname_hash_entry *peer_item;
496+
497+
peer_item = hashmap_get_from_hash(&existing_refs,
498+
strhash(refname),
499+
refname);
446500
if (peer_item) {
447-
struct object_id *old_oid = peer_item->util;
501+
struct object_id *old_oid = &peer_item->oid;
448502
oidcpy(&rm->peer_ref->old_oid, old_oid);
449503
}
450504
}
451505
}
452-
string_list_clear(&existing_refs, 1);
506+
hashmap_free(&existing_refs, 1);
453507

454508
return ref_map;
455509
}

0 commit comments

Comments
 (0)