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

Re: [PATCH v3 1/1] builtin/pack-objects.c: freshen objects from existing cruft packs

From
Patrick Steinhardt <ps@pks.im>
Date
Mar 6, 2025, 10:31 UTC
Message-ID
<Z8l5hxNjEOALl_g-@pks.im>
In-Reply-To
<6e93471f9a8e6a3dde36342088748ba17e4f7f95.1741133712.git.me@ttaylorr.com>
On Tue, Mar 04, 2025 at 07:15:18PM -0500, Taylor Blau wrote:
Show 60 quoted lines
> diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
> index 58a9b161262..79e1e6fb52b 100644
> --- a/builtin/pack-objects.c
> +++ b/builtin/pack-objects.c
> @@ -1502,8 +1503,60 @@ static int have_duplicate_entry(const struct object_id *oid,
>  	return 1;
>  }
>  
> +static int want_cruft_object_mtime(struct repository *r,
> +				   const struct object_id *oid,
> +				   unsigned flags, uint32_t mtime)
> +{
> +	struct packed_git **cache;
> +
> +	for (cache = kept_pack_cache(r, flags); *cache; cache++) {
> +		struct packed_git *p = *cache;
> +		off_t ofs;
> +		uint32_t candidate_mtime;
> +
> +		ofs = find_pack_entry_one(oid, p);
> +		if (!ofs)
> +			continue;
> +
> +		/*
> +		 * We have a copy of the object 'oid' in a non-cruft
> +		 * pack. We can avoid packing an additional copy
> +		 * regardless of what the existing copy's mtime is since
> +		 * it is outside of a cruft pack.
> +		 */
> +		if (!p->is_cruft)
> +			return 0;
> +
> +		/*
> +		 * If we have a copy of the object 'oid' in a cruft
> +		 * pack, then either read the cruft pack's mtime for
> +		 * that object, or, if that can't be loaded, assume the
> +		 * pack's mtime itself.
> +		 */
> +		if (!load_pack_mtimes(p)) {
> +			uint32_t pos;
> +			if (offset_to_pack_pos(p, ofs, &pos) < 0)
> +				continue;
> +			candidate_mtime = nth_packed_mtime(p, pos);
> +		} else {
> +			candidate_mtime = p->mtime;
> +		}
> +
> +		/*
> +		 * We have a surviving copy of the object in a cruft
> +		 * pack whose mtime is greater than or equal to the one
> +		 * we are considering. We can thus avoid packing an
> +		 * additional copy of that object.
> +		 */
> +		if (mtime <= candidate_mtime)
> +			return 0;
> +	}
> +
> +	return -1;
> +}
> +

Minor nit: it is a bit unusual that a negative value, which typically indicates an error, is used as a boolean value here to indicate that we don't want to have the object.

Show 10 quoted lines
> diff --git a/t/t7704-repack-cruft.sh b/t/t7704-repack-cruft.sh
> index 959e6e26488..f427150de5b 100755
> --- a/t/t7704-repack-cruft.sh
> +++ b/t/t7704-repack-cruft.sh
> @@ -304,6 +304,69 @@ test_expect_success '--max-cruft-size with freshened objects (packed)' '
>  	)
>  '
>  
> +test_expect_success '--max-cruft-size with freshened objects (previously cruft)' '
> +	git init max-cruft-size-threshold &&
Let's also delete the repository via `test_when_finished`.
Patrick
Previous: Taylor BlauNext: Taylor Blau
Message 22 of 54 in “pack-objects: freshen objects with multi-cruft packs”
  1. 0/2 pack-objects: freshen objects with multi-cruft packsTaylor Blau, Feb 27, 2025
  2. 1/2 builtin/repack.c: simplify cruft pack aggregationTaylor Blau, Feb 27, 2025
  3. Elijah NewrenFeb 27, 2025
  4. Taylor BlauFeb 27, 2025
  5. Patrick SteinhardtFeb 28, 2025
  6. Elijah NewrenMar 4, 2025
  7. Junio C HamanoMar 5, 2025
  8. Taylor BlauMar 5, 2025
  9. 2/2 builtin/pack-objects.c: freshen objects from existing cruft packsTaylor Blau, Feb 27, 2025
  10. Elijah NewrenFeb 27, 2025
  11. Taylor BlauFeb 27, 2025
  12. Elijah NewrenFeb 27, 2025
  13. Taylor BlauFeb 27, 2025
  14. 0/2 pack-objects: freshen objects with multi-cruft packsTaylor Blau, Mar 4, 2025
  15. 1/2 builtin/repack.c: simplify cruft pack aggregationTaylor Blau, Mar 4, 2025
  16. 2/2 builtin/pack-objects.c: freshen objects from existing cruft packsTaylor Blau, Mar 4, 2025
  17. Elijah NewrenMar 4, 2025
  18. Taylor BlauMar 5, 2025
  19. Taylor BlauMar 5, 2025
  20. 0/1 pack-objects: freshen objects with multi-cruft packsTaylor Blau, Mar 5, 2025
  21. 1/1 builtin/pack-objects.c: freshen objects from existing cruft packsTaylor Blau, Mar 5, 2025
  22. Patrick SteinhardtMar 6, 2025
  23. Taylor BlauMar 13, 2025
  24. Patrick SteinhardtMar 6, 2025
  25. 0/6 pack-objects: freshen objects with multi-cruft packsTaylor Blau, Mar 11, 2025
  26. 1/6 t/t5329-pack-objects-cruft.sh: evict 'repack'-related testsTaylor Blau, Mar 11, 2025
  27. 2/6 t7704-repack-cruft.sh: consolidate `write_blob()`Taylor Blau, Mar 11, 2025
  28. 3/6 t/lib-cruft.sh: extract some cruft-related helpersTaylor Blau, Mar 11, 2025
  29. 4/6 pack-objects: generate cruft packs at most one object over thresholdTaylor Blau, Mar 11, 2025
  30. Junio C HamanoMar 11, 2025
  31. Taylor BlauMar 12, 2025
  32. Junio C HamanoMar 12, 2025
  33. Taylor BlauMar 12, 2025
  34. Elijah NewrenMar 12, 2025
  35. Taylor BlauMar 12, 2025
  36. Junio C HamanoMar 12, 2025
  37. Elijah NewrenMar 12, 2025
  38. Junio C HamanoMar 13, 2025
  39. Elijah NewrenMar 13, 2025
  40. Junio C HamanoMar 13, 2025
  41. 5/6 builtin/repack.c: simplify cruft pack aggregationTaylor Blau, Mar 11, 2025
  42. 6/6 builtin/pack-objects.c: freshen objects from existing cruft packsTaylor Blau, Mar 11, 2025
  43. Junio C HamanoMar 11, 2025
  44. Taylor BlauMar 12, 2025
  45. Junio C HamanoMar 12, 2025
  46. Taylor BlauMar 12, 2025
  47. Junio C HamanoMar 12, 2025
  48. Taylor BlauMar 12, 2025
  49. Junio C HamanoMar 13, 2025
  50. Taylor BlauMar 13, 2025
  51. Jeff KingMar 13, 2025
  52. Junio C HamanoMar 13, 2025
  53. builtin/pack-objects.c: freshen objects from existing cruft packsTaylor Blau, Mar 13, 2025
  54. Junio C HamanoMar 13, 2025

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.