git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 27/28] read_packed_refs(): keep track of the directory being worked in

From
mhagger@alum.mit.edu <mhagger@alum.mit.edu>
Date
Oct 28, 2011, 12:28 UTC
Message-ID
<1319804921-17545-28-git-send-email-mhagger@alum.mit.edu>
In-Reply-To
<1319804921-17545-1-git-send-email-mhagger@alum.mit.edu>
From: Michael Haggerty <mhagger@alum.mit.edu>

Packed references are stored in $GIT_DIR/packed-refs sorted, so adjacent ones are pretty likely to be in the same directory. So while reading them, keep track of the last directory used, and reuse it if possible to avoid searching the reference namespace from the root each time.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
 refs.c |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/refs.c b/refs.c
index 6a7f9c3..6a19d19 100644
--- a/refs.c
+++ b/refs.c
@@ -831,6 +831,7 @@ static const char *parse_ref_line(char *line, unsigned char *sha1)
 static void read_packed_refs(FILE *f, struct ref_entry *direntry)
 {
 	struct ref_entry *last = NULL;
+	struct ref_entry *current_direntry = NULL;
 	char refline[PATH_MAX];
 	int flag = REF_ISPACKED;
 
@@ -850,8 +851,21 @@ static void read_packed_refs(FILE *f, struct ref_entry *direntry)
 
 		refname = parse_ref_line(refline, sha1);
 		if (refname) {
+			if (current_direntry) {
+				char *slash = strrchr(refname, '/');
+				if (!slash
+				    || strncmp(current_direntry->name, refname,
+					       slash - refname + 1)
+				    || current_direntry->name[slash - refname + 1] != '\0')
+					/* The new refname does not go in current_direntry */
+					current_direntry = NULL;
+			}
+			if (!current_direntry)
+				current_direntry = find_containing_direntry(
+						direntry, refname, 1);
+
 			last = create_ref_entry(refname, sha1, flag);
-			add_ref(direntry, last);
+			add_entry(current_direntry, last);
 			continue;
 		}
 		if (last &&

-- 
1.7.7
Previous: Junio C HamanoNext: mhagger@alum.mit.edu
Message 32 of 36 in “Store references hierarchically in cache”
  1. 00/28 Store references hierarchically in cachemhagger@alum.mit.edu, Oct 28, 2011
  2. 01/28 refs.c: reorder definitions more logicallymhagger@alum.mit.edu, Oct 28, 2011
  3. 02/28 free_ref_entry(): new functionmhagger@alum.mit.edu, Oct 28, 2011
  4. 03/28 check_refname_component(): return 0 for zero-length componentsmhagger@alum.mit.edu, Oct 28, 2011
  5. 04/28 struct ref_entry: nest the value part in a unionmhagger@alum.mit.edu, Oct 28, 2011
  6. 05/28 refs.c: rename ref_array -> ref_dirmhagger@alum.mit.edu, Oct 28, 2011
  7. 06/28 refs: store references hierarchicallymhagger@alum.mit.edu, Oct 28, 2011
  8. 07/28 sort_ref_dir(): do not sort if already sortedmhagger@alum.mit.edu, Oct 28, 2011
  9. 08/28 refs: sort ref_dirs lazilymhagger@alum.mit.edu, Oct 28, 2011
  10. 09/28 do_for_each_ref(): only iterate over the subtree that was requestedmhagger@alum.mit.edu, Oct 28, 2011
  11. 10/28 get_ref_dir(): keep track of the current ref_dirmhagger@alum.mit.edu, Oct 28, 2011
  12. 11/28 refs: wrap top-level ref_dirs in ref_entriesmhagger@alum.mit.edu, Oct 28, 2011
  13. 12/28 get_packed_refs(): return (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Oct 28, 2011
  14. 13/28 get_loose_refs(): return (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Oct 28, 2011
  15. 14/28 is_refname_available(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Oct 28, 2011
  16. 15/28 find_ref(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Oct 28, 2011
  17. 16/28 read_packed_refs(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Oct 28, 2011
  18. 17/28 add_ref(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Oct 28, 2011
  19. 18/28 find_containing_direntry(): use (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Oct 28, 2011
  20. 19/28 search_ref_dir(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Oct 28, 2011
  21. 20/28 add_entry(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Oct 28, 2011
  22. 21/28 do_for_each_ref_in_dir*(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Oct 28, 2011
  23. 22/28 sort_ref_dir(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Oct 28, 2011
  24. 23/28 struct ref_dir: store a reference to the enclosing ref_cachemhagger@alum.mit.edu, Oct 28, 2011
  25. 24/28 read_loose_refs(): take a (ref_entry *) as argumentmhagger@alum.mit.edu, Oct 28, 2011
  26. 25/28 refs: read loose references lazilymhagger@alum.mit.edu, Oct 28, 2011
  27. 26/28 is_refname_available(): query only possibly-conflicting referencesmhagger@alum.mit.edu, Oct 28, 2011
  28. Fix "is_refname_available(): query only possibly-conflicting references"mhagger@alum.mit.edu, Nov 15, 2011
  29. Junio C HamanoNov 15, 2011
  30. Michael HaggertyNov 15, 2011
  31. Junio C HamanoNov 15, 2011
  32. 27/28 read_packed_refs(): keep track of the directory being worked inmhagger@alum.mit.edu, Oct 28, 2011
  33. 28/28 repack_without_ref(): call clear_packed_ref_cache()mhagger@alum.mit.edu, Oct 28, 2011
  34. Ramkumar RamachandraOct 28, 2011
  35. Michael HaggertyOct 28, 2011
  36. Michael HaggertyNov 16, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.