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

[PATCH 09/20] packed_ref_cache: remember the file-wide peeling state

From
Michael Haggerty <mhagger@alum.mit.edu>
Date
Sep 13, 2017, 17:16 UTC
Message-ID
<6b7c9b6bd4160635cc5bebf5c0d6e298f05d4af4.1505319366.git.mhagger@alum.mit.edu>
In-Reply-To
<cover.1505319366.git.mhagger@alum.mit.edu>

Rather than store the peeling state (i.e., the one defined by traits in the `packed-refs` file header line) in a local variable in `read_packed_refs()`, store it permanently in `packed_ref_cache`. This will be needed when we stop reading all packed refs at once.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
 refs/packed-backend.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/refs/packed-backend.c b/refs/packed-backend.c
index 2b80f244c8..ae276f3445 100644
--- a/refs/packed-backend.c
+++ b/refs/packed-backend.c
@@ -18,6 +18,12 @@ struct packed_ref_cache {
 
 	struct ref_cache *cache;
 
+	/*
+	 * What is the peeled state of this cache? (This is usually
+	 * determined from the header of the "packed-refs" file.)
+	 */
+	enum { PEELED_NONE, PEELED_TAGS, PEELED_FULLY } peeled;
+
 	/*
 	 * Count of references to the data structure in this instance,
 	 * including the pointer from files_ref_store::packed if any.
@@ -195,13 +201,13 @@ static struct packed_ref_cache *read_packed_refs(struct packed_ref_store *refs)
 	char *buf;
 	const char *pos, *eol, *eof;
 	struct strbuf tmp = STRBUF_INIT;
-	enum { PEELED_NONE, PEELED_TAGS, PEELED_FULLY } peeled = PEELED_NONE;
 	struct ref_dir *dir;
 
 	packed_refs->refs = refs;
 	acquire_packed_ref_cache(packed_refs);
 	packed_refs->cache = create_ref_cache(NULL, NULL);
 	packed_refs->cache->root->flag &= ~REF_INCOMPLETE;
+	packed_refs->peeled = PEELED_NONE;
 
 	fd = open(refs->path, O_RDONLY);
 	if (fd < 0) {
@@ -244,9 +250,9 @@ static struct packed_ref_cache *read_packed_refs(struct packed_ref_store *refs)
 		string_list_split_in_place(&traits, p, ' ', -1);
 
 		if (unsorted_string_list_has_string(&traits, "fully-peeled"))
-			peeled = PEELED_FULLY;
+			packed_refs->peeled = PEELED_FULLY;
 		else if (unsorted_string_list_has_string(&traits, "peeled"))
-			peeled = PEELED_TAGS;
+			packed_refs->peeled = PEELED_TAGS;
 		/* perhaps other traits later as well */
 
 		/* The "+ 1" is for the LF character. */
@@ -282,8 +288,9 @@ static struct packed_ref_cache *read_packed_refs(struct packed_ref_store *refs)
 			oidclr(&oid);
 			flag |= REF_BAD_NAME | REF_ISBROKEN;
 		}
-		if (peeled == PEELED_FULLY ||
-		    (peeled == PEELED_TAGS && starts_with(refname, "refs/tags/")))
+		if (packed_refs->peeled == PEELED_FULLY ||
+		    (packed_refs->peeled == PEELED_TAGS &&
+		     starts_with(refname, "refs/tags/")))
 			flag |= REF_KNOWS_PEELED;
 		entry = create_ref_entry(refname, &oid, flag);
 		add_ref_entry(dir, entry);

-- 
2.14.1
Previous: Michael HaggertyNext: Michael Haggerty
Message 8 of 27 in “Read `packed-refs` using mmap()”
  1. 00/20 Read `packed-refs` using mmap()Michael Haggerty, Sep 13, 2017
  2. 01/20 ref_iterator: keep track of whether the iterator output is orderedMichael Haggerty, Sep 13, 2017
  3. 02/20 prefix_ref_iterator: break when we leave the prefixMichael Haggerty, Sep 13, 2017
  4. 03/20 packed_ref_cache: add a backlink to the associated `packed_ref_store`Michael Haggerty, Sep 13, 2017
  5. 05/20 read_packed_refs(): use mmap to read the `packed-refs` fileMichael Haggerty, Sep 13, 2017
  6. 06/20 read_packed_refs(): only check for a header at the top of the fileMichael Haggerty, Sep 13, 2017
  7. 07/20 read_packed_refs(): make parsing of the header line more robustMichael Haggerty, Sep 13, 2017
  8. 09/20 packed_ref_cache: remember the file-wide peeling stateMichael Haggerty, Sep 13, 2017
  9. 11/20 mmapped_ref_iterator_advance(): no peeled value for broken refsMichael Haggerty, Sep 13, 2017
  10. 12/20 packed_ref_cache: keep the `packed-refs` file open and mmappedMichael Haggerty, Sep 13, 2017
  11. 17/20 packed_ref_store: get rid of the `ref_cache` entirelyMichael Haggerty, Sep 13, 2017
  12. 19/20 mmapped_ref_iterator: inline into `packed_ref_iterator`Michael Haggerty, Sep 13, 2017
  13. 20/20 packed-backend.c: rename a bunch of things and update commentsMichael Haggerty, Sep 13, 2017
  14. Stefan BellerSep 13, 2017
  15. 14/20 packed_ref_iterator_begin(): iterate using `mmapped_ref_iterator`Michael Haggerty, Sep 13, 2017
  16. 18/20 ref_cache: remove support for storing peeled valuesMichael Haggerty, Sep 13, 2017
  17. 10/20 mmapped_ref_iterator: add iterator over a packed-refs fileMichael Haggerty, Sep 13, 2017
  18. 15/20 packed_read_raw_ref(): read the reference from the mmapped bufferMichael Haggerty, Sep 13, 2017
  19. 16/20 ref_store: implement `refs_peel_ref()` genericallyMichael Haggerty, Sep 13, 2017
  20. 04/20 die_unterminated_line(), die_invalid_line(): new functionsMichael Haggerty, Sep 13, 2017
  21. 13/20 read_packed_refs(): ensure that references are ordered when readMichael Haggerty, Sep 13, 2017
  22. 08/20 read_packed_refs(): read references with minimal copyingMichael Haggerty, Sep 13, 2017
  23. Junio C HamanoSep 13, 2017
  24. Michael HaggertySep 14, 2017
  25. Johannes SchindelinSep 14, 2017
  26. Johannes SchindelinSep 14, 2017
  27. Michael HaggertySep 15, 2017

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.