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

[PATCH 18/20] ref_cache: remove support for storing peeled values

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

Now that the `packed-refs` backend doesn't use `ref_cache`, there is nobody left who might want to store peeled values of references in `ref_cache`. So remove that feature.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
 refs/packed-backend.c |  9 ++++++++-
 refs/ref-cache.c      | 42 +-----------------------------------------
 refs/ref-cache.h      | 32 ++------------------------------
 3 files changed, 11 insertions(+), 72 deletions(-)
diff --git a/refs/packed-backend.c b/refs/packed-backend.c
index 9868a5c198..d76051c7f5 100644
--- a/refs/packed-backend.c
+++ b/refs/packed-backend.c
@@ -2,7 +2,6 @@
 #include "../config.h"
 #include "../refs.h"
 #include "refs-internal.h"
-#include "ref-cache.h"
 #include "packed-backend.h"
 #include "../iterator.h"
 #include "../lockfile.h"
@@ -201,6 +200,14 @@ static NORETURN void die_invalid_line(const char *path,
 
 }
 
+/*
+ * This value is set in `base.flags` if the peeled value of the
+ * current reference is known. In that case, `peeled` contains the
+ * correct peeled value for the reference, which might be `null_sha1`
+ * if the reference is not a tag or if it is broken.
+ */
+#define REF_KNOWS_PEELED 0x40
+
 /*
  * An iterator over a packed-refs file that is currently mmapped.
  */
diff --git a/refs/ref-cache.c b/refs/ref-cache.c
index 54dfb5218c..4f850e1b5c 100644
--- a/refs/ref-cache.c
+++ b/refs/ref-cache.c
@@ -38,7 +38,6 @@ struct ref_entry *create_ref_entry(const char *refname,
 
 	FLEX_ALLOC_STR(ref, name, refname);
 	oidcpy(&ref->u.value.oid, oid);
-	oidclr(&ref->u.value.peeled);
 	ref->flag = flag;
 	return ref;
 }
@@ -491,49 +490,10 @@ static int cache_ref_iterator_advance(struct ref_iterator *ref_iterator)
 	}
 }
 
-enum peel_status peel_entry(struct ref_entry *entry, int repeel)
-{
-	enum peel_status status;
-
-	if (entry->flag & REF_KNOWS_PEELED) {
-		if (repeel) {
-			entry->flag &= ~REF_KNOWS_PEELED;
-			oidclr(&entry->u.value.peeled);
-		} else {
-			return is_null_oid(&entry->u.value.peeled) ?
-				PEEL_NON_TAG : PEEL_PEELED;
-		}
-	}
-	if (entry->flag & REF_ISBROKEN)
-		return PEEL_BROKEN;
-	if (entry->flag & REF_ISSYMREF)
-		return PEEL_IS_SYMREF;
-
-	status = peel_object(entry->u.value.oid.hash, entry->u.value.peeled.hash);
-	if (status == PEEL_PEELED || status == PEEL_NON_TAG)
-		entry->flag |= REF_KNOWS_PEELED;
-	return status;
-}
-
 static int cache_ref_iterator_peel(struct ref_iterator *ref_iterator,
 				   struct object_id *peeled)
 {
-	struct cache_ref_iterator *iter =
-		(struct cache_ref_iterator *)ref_iterator;
-	struct cache_ref_iterator_level *level;
-	struct ref_entry *entry;
-
-	level = &iter->levels[iter->levels_nr - 1];
-
-	if (level->index == -1)
-		die("BUG: peel called before advance for cache iterator");
-
-	entry = level->dir->entries[level->index];
-
-	if (peel_entry(entry, 0))
-		return -1;
-	oidcpy(peeled, &entry->u.value.peeled);
-	return 0;
+	return peel_object(ref_iterator->oid->hash, peeled->hash);
 }
 
 static int cache_ref_iterator_abort(struct ref_iterator *ref_iterator)
diff --git a/refs/ref-cache.h b/refs/ref-cache.h
index a082bfb06c..eda65e73ed 100644
--- a/refs/ref-cache.h
+++ b/refs/ref-cache.h
@@ -38,14 +38,6 @@ struct ref_value {
 	 * referred to by the last reference in the symlink chain.
 	 */
 	struct object_id oid;
-
-	/*
-	 * If REF_KNOWS_PEELED, then this field holds the peeled value
-	 * of this reference, or null if the reference is known not to
-	 * be peelable.  See the documentation for peel_ref() for an
-	 * exact definition of "peelable".
-	 */
-	struct object_id peeled;
 };
 
 /*
@@ -97,21 +89,14 @@ struct ref_dir {
  * public values; see refs.h.
  */
 
-/*
- * The field ref_entry->u.value.peeled of this value entry contains
- * the correct peeled value for the reference, which might be
- * null_sha1 if the reference is not a tag or if it is broken.
- */
-#define REF_KNOWS_PEELED 0x10
-
 /* ref_entry represents a directory of references */
-#define REF_DIR 0x20
+#define REF_DIR 0x10
 
 /*
  * Entry has not yet been read from disk (used only for REF_DIR
  * entries representing loose references)
  */
-#define REF_INCOMPLETE 0x40
+#define REF_INCOMPLETE 0x20
 
 /*
  * A ref_entry represents either a reference or a "subdirectory" of
@@ -252,17 +237,4 @@ struct ref_iterator *cache_ref_iterator_begin(struct ref_cache *cache,
 					      const char *prefix,
 					      int prime_dir);
 
-/*
- * Peel the entry (if possible) and return its new peel_status.  If
- * repeel is true, re-peel the entry even if there is an old peeled
- * value that is already stored in it.
- *
- * It is OK to call this function with a packed reference entry that
- * might be stale and might even refer to an object that has since
- * been garbage-collected.  In such a case, if the entry has
- * REF_KNOWS_PEELED then leave the status unchanged and return
- * PEEL_PEELED or PEEL_NON_TAG; otherwise, return PEEL_INVALID.
- */
-enum peel_status peel_entry(struct ref_entry *entry, int repeel);
-
 #endif /* REFS_REF_CACHE_H */

-- 
2.14.1
Previous: Michael HaggertyNext: Michael Haggerty
Message 16 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.