@matheusbsbs / matheus-bagliano / commits / d0d46abc16

pack-objects: refactor unpack-unreachable expiration check

When we are loosening unreachable packed objects, we do not bother to process objects that would simply be pruned immediately anyway. The "would be pruned" check is a simple comparison, but is about to get more complicated. Let's pull it out into a separate function. Note that this is slightly less efficient than the original, which avoided even opening old packs, since no object in them could pass the current check, which cares only about the pack mtime. But the new rules will depend on the exact object, so we need to perform the check even for old packs. Note also that we fix a minor buglet when the pack mtime is exactly the same as the expiration time. The prune code considers that worth pruning, whereas our check here considered it worth keeping. This wasn't a big deal. Besides being unlikely to happen, the result was simply that the object was loosened and then pruned, missing the optimization. Still, we can easily fix it while we are here. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Oct 15, 2014 at 18:41 UTC d0d46abc167d18fdbdbf2ece8ca6df704517c62f

1 file changed +12 -5

builtin/pack-objects.c

+12 -5

@@ -2407,6 +2407,16 @@ static int has_sha1_pack_kept_or_nonlocal(const unsigned char *sha1)

2407 return 0;

2408 }

2409

2410 +static int loosened_object_can_be_discarded(const unsigned char *sha1,

2411 + unsigned long mtime)

2412 +{

2413 + if (!unpack_unreachable_expiration)

2414 + return 0;

2415 + if (mtime > unpack_unreachable_expiration)

2416 + return 0;

2417 + return 1;

2418 +}

2419 +

2420 static void loosen_unused_packed_objects(struct rev_info *revs)

2421 {

2422 struct packed_git *p;

@@ -2417,17 +2427,14 @@ static void loosen_unused_packed_objects(struct rev_info *revs)

2427 if (!p->pack_local || p->pack_keep)

2428 continue;

2429

2420 - if (unpack_unreachable_expiration &&

2421 - p->mtime < unpack_unreachable_expiration)

2422 - continue;

2423 -

2430 if (open_pack_index(p))

2431 die("cannot open pack index");

2432

2433 for (i = 0; i < p->num_objects; i++) {

2434 sha1 = nth_packed_object_sha1(p, i);

2435 if (!packlist_find(&to_pack, sha1, NULL) &&

2430 - !has_sha1_pack_kept_or_nonlocal(sha1))

2436 + !has_sha1_pack_kept_or_nonlocal(sha1) &&

2437 + !loosened_object_can_be_discarded(sha1, p->mtime))

2438 if (force_object_loose(sha1, p->mtime))

2439 die("unable to force loose object");

2440 }