mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ref_remove_duplicates(): avoid redundant bisection

Browse Source 
The old code called string_list_lookup(), and if that failed called
string_list_insert(), thus doing the bisection search through the
string list twice in the latter code path.

Instead, just call string_list_insert() right away.  If an entry for
that peer reference name already existed, then its util pointer is
always non-NULL.

Of course this doesn't change the fact that the repeated
string_list_insert() calls make the function scale like O(N^2) if the
input reference list is not already approximately sorted.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty
2013-10-30 06:33:07 +01:00
committed by Junio C Hamano
parent 37f0dcbdc1
commit 09ea1f8e0e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
remote.c
View File

@ -750,13 +750,15 @@ void ref_remove_duplicates(struct ref *ref_map)
struct string_list refs = STRING_LIST_INIT_NODUP; struct string_list refs = STRING_LIST_INIT_NODUP;
struct string_list_item *item = NULL; struct string_list_item *item = NULL;
struct ref *prev = NULL, *next = NULL; struct ref *prev = NULL, *next = NULL;
for (; ref_map; prev = ref_map, ref_map = next) { for (; ref_map; prev = ref_map, ref_map = next) {
next = ref_map->next; next = ref_map->next;
if (!ref_map->peer_ref) if (!ref_map->peer_ref)
continue; continue;
item = string_list_lookup(&refs, ref_map->peer_ref->name); item = string_list_insert(&refs, ref_map->peer_ref->name);
if (item) { if (item->util) {
/* Entry already existed */
if (strcmp(((struct ref *)item->util)->name, if (strcmp(((struct ref *)item->util)->name,
ref_map->name)) ref_map->name))
die("%s tracks both %s and %s", die("%s tracks both %s and %s",
@ -767,11 +769,9 @@ void ref_remove_duplicates(struct ref *ref_map)
free(ref_map->peer_ref); free(ref_map->peer_ref);
free(ref_map); free(ref_map);
ref_map = prev; /* skip this; we freed it */ ref_map = prev; /* skip this; we freed it */
continue; } else {
item->util = ref_map;
} }
item = string_list_insert(&refs, ref_map->peer_ref->name);
item->util = ref_map;
} }
string_list_clear(&refs, 0); string_list_clear(&refs, 0);
} }