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

Merge branch 'ms/fetch-follow-tag-optim'

Browse Source 
The code used in following tags in "git fetch" has been optimized.

* ms/fetch-follow-tag-optim:
  fetch: use oidset to keep the want OIDs for faster lookup
This commit is contained in:
Junio C Hamano
2019-10-07 11:32:57 +09:00
parent 1398171378 b7e2d8bca5
commit 1d8b0dfa8a
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
builtin/fetch.c
View File

@ -7,6 +7,7 @@
#include "refs.h" #include "refs.h"
#include "refspec.h" #include "refspec.h"
#include "object-store.h" #include "object-store.h"
#include "oidset.h"
#include "commit.h" #include "commit.h"
#include "builtin.h" #include "builtin.h"
#include "string-list.h" #include "string-list.h"
@ -245,15 +246,13 @@ static void add_merge_config(struct ref **head,
} }
} }
static int will_fetch(struct ref **head, const unsigned char *sha1) static void create_fetch_oidset(struct ref **head, struct oidset *out)
{ {
struct ref *rm = *head; struct ref *rm = *head;
while (rm) { while (rm) {
if (hasheq(rm->old_oid.hash, sha1)) oidset_insert(out, &rm->old_oid);
return 1;
rm = rm->next; rm = rm->next;
} }
return 0;
} }
struct refname_hash_entry { struct refname_hash_entry {
@ -319,6 +318,7 @@ static void find_non_local_tags(const struct ref *refs,
{ {
struct hashmap existing_refs; struct hashmap existing_refs;
struct hashmap remote_refs; struct hashmap remote_refs;
struct oidset fetch_oids = OIDSET_INIT;
struct string_list remote_refs_list = STRING_LIST_INIT_NODUP; struct string_list remote_refs_list = STRING_LIST_INIT_NODUP;
struct string_list_item *remote_ref_item; struct string_list_item *remote_ref_item;
const struct ref *ref; const struct ref *ref;
@ -326,6 +326,7 @@ static void find_non_local_tags(const struct ref *refs,
refname_hash_init(&existing_refs); refname_hash_init(&existing_refs);
refname_hash_init(&remote_refs); refname_hash_init(&remote_refs);
create_fetch_oidset(head, &fetch_oids);
for_each_ref(add_one_refname, &existing_refs); for_each_ref(add_one_refname, &existing_refs);
for (ref = refs; ref; ref = ref->next) { for (ref = refs; ref; ref = ref->next) {
@ -342,9 +343,9 @@ static void find_non_local_tags(const struct ref *refs,
if (item && if (item &&
!has_object_file_with_flags(&ref->old_oid, !has_object_file_with_flags(&ref->old_oid,
OBJECT_INFO_QUICK) && OBJECT_INFO_QUICK) &&
!will_fetch(head, ref->old_oid.hash) && !oidset_contains(&fetch_oids, &ref->old_oid) &&
!has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) && !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
!will_fetch(head, item->oid.hash)) !oidset_contains(&fetch_oids, &item->oid))
clear_item(item); clear_item(item);
item = NULL; item = NULL;
continue; continue;
@ -358,7 +359,7 @@ static void find_non_local_tags(const struct ref *refs,
*/ */
if (item && if (item &&
!has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) && !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
!will_fetch(head, item->oid.hash)) !oidset_contains(&fetch_oids, &item->oid))
clear_item(item); clear_item(item);
item = NULL; item = NULL;
@ -379,7 +380,7 @@ static void find_non_local_tags(const struct ref *refs,
*/ */
if (item && if (item &&
!has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) && !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
!will_fetch(head, item->oid.hash)) !oidset_contains(&fetch_oids, &item->oid))
clear_item(item); clear_item(item);
/* /*
@ -406,6 +407,7 @@ static void find_non_local_tags(const struct ref *refs,
} }
hashmap_free(&remote_refs, 1); hashmap_free(&remote_refs, 1);
string_list_clear(&remote_refs_list, 0); string_list_clear(&remote_refs_list, 0);
oidset_clear(&fetch_oids);
} }
static struct ref *get_ref_map(struct remote *remote, static struct ref *get_ref_map(struct remote *remote,