prune: lazily perform reachability traversal

The general strategy of "git prune" is to do a full reachability walk,
then for each loose object see if we found it in our walk. But if we
don't have any loose objects, we don't need to do the expensive walk in
the first place.

This patch postpones that walk until the first time we need to see its
results.

Note that this is really a specific case of a more general optimization,
which is that we could traverse only far enough to find the object under
consideration (i.e., stop the traversal when we find it, then pick up
again when asked about the next object, etc). That could save us in some
instances from having to do a full walk. But it's actually a bit tricky
to do with our traversal code, and you'd need to do a full walk anyway
if you have even a single unreachable object (which you generally do, if
any objects are actually left after running git-repack).

So in practice this lazy-load of the full walk catches one easy but
common case (i.e., you've just repacked via git-gc, and there's nothing
unreachable).

The perf script is fairly contrived, but it does show off the
improvement:

Test                            HEAD^             HEAD
-------------------------------------------------------------------------
5304.4: prune with no objects   3.66(3.60+0.05)   0.00(0.00+0.00) -100.0%

and would let us know if we accidentally regress this optimization.

Note also that we need to take special care with prune_shallow(), which
relies on us having performed the traversal. So this optimization can
only kick in for a non-shallow repository. Since this is easy to get
wrong and is not covered by existing tests, let's add an extra test to
t5304 that covers this case explicitly.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/prune.c b/builtin/prune.c
index 1ec9ddd751df6644d2c39ace41a1494800082638..04b657394575168da1eb0bbe7974863145281ad7 100644 (file)
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -31,16 +31,40 @@ static int prune_tmp_file(const char *fullpath)
        return 0;
 }
 
        return 0;
 }
 

-static int prune_object(const struct object_id *oid, const char *fullpath,
-                       void *data)
+static void perform_reachability_traversal(struct rev_info *revs)

 {
 {

-       struct stat st;
+       static int initialized;
+       struct progress *progress = NULL;
+
+       if (initialized)
+               return;
+
+       if (show_progress)
+               progress = start_delayed_progress(_("Checking connectivity"), 0);
+       mark_reachable_objects(revs, 1, expire, progress);
+       stop_progress(&progress);
+       initialized = 1;
+}
+
+static int is_object_reachable(const struct object_id *oid,
+                              struct rev_info *revs)
+{
+       perform_reachability_traversal(revs);

 
        /*
         * Do we know about this object?
         * It must have been reachable
         */
 
        /*
         * Do we know about this object?
         * It must have been reachable
         */

-       if (lookup_object(the_repository, oid->hash))
+       return !!lookup_object(the_repository, oid->hash);
+}
+
+static int prune_object(const struct object_id *oid, const char *fullpath,
+                       void *data)
+{
+       struct rev_info *revs = data;
+       struct stat st;
+
+       if (is_object_reachable(oid, revs))

                return 0;
 
        if (lstat(fullpath, &st)) {
                return 0;
 
        if (lstat(fullpath, &st)) {


@@ -102,7 +126,6 @@ static void remove_temporary_files(const char *path)
 int cmd_prune(int argc, const char **argv, const char *prefix)
 {
        struct rev_info revs;
 int cmd_prune(int argc, const char **argv, const char *prefix)
 {
        struct rev_info revs;

-       struct progress *progress = NULL;

        int exclude_promisor_objects = 0;
        const struct option options[] = {
                OPT__DRY_RUN(&show_only, N_("do not remove, show only")),
        int exclude_promisor_objects = 0;
        const struct option options[] = {
                OPT__DRY_RUN(&show_only, N_("do not remove, show only")),


@@ -142,17 +165,13 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
 
        if (show_progress == -1)
                show_progress = isatty(2);
 
        if (show_progress == -1)
                show_progress = isatty(2);

-       if (show_progress)
-               progress = start_delayed_progress(_("Checking connectivity"), 0);

        if (exclude_promisor_objects) {
                fetch_if_missing = 0;
                revs.exclude_promisor_objects = 1;
        }
 
        if (exclude_promisor_objects) {
                fetch_if_missing = 0;
                revs.exclude_promisor_objects = 1;
        }
 

-       mark_reachable_objects(&revs, 1, expire, progress);
-       stop_progress(&progress);

        for_each_loose_file_in_objdir(get_object_directory(), prune_object,
        for_each_loose_file_in_objdir(get_object_directory(), prune_object,

-                                     prune_cruft, prune_subdir, NULL);
+                                     prune_cruft, prune_subdir, &revs);

 
        prune_packed_objects(show_only ? PRUNE_PACKED_DRY_RUN : 0);
        remove_temporary_files(get_object_directory());
 
        prune_packed_objects(show_only ? PRUNE_PACKED_DRY_RUN : 0);
        remove_temporary_files(get_object_directory());


@@ -160,8 +179,10 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
        remove_temporary_files(s);
        free(s);
 
        remove_temporary_files(s);
        free(s);
 

-       if (is_repository_shallow(the_repository))
+       if (is_repository_shallow(the_repository)) {
+               perform_reachability_traversal(&revs);

                prune_shallow(show_only ? PRUNE_SHOW_ONLY : 0);
                prune_shallow(show_only ? PRUNE_SHOW_ONLY : 0);

+       }

 
        return 0;
 }
 
        return 0;
 }

diff --git a/t/perf/p5304-prune.sh b/t/perf/p5304-prune.sh
new file mode 100755 (executable)
index 0000000..3c85208
--- /dev/null
+++ b/t/perf/p5304-prune.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+test_description='performance tests of prune'
+. ./perf-lib.sh
+
+test_perf_default_repo
+
+test_expect_success 'remove reachable loose objects' '
+       git repack -ad
+'
+
+test_expect_success 'remove unreachable loose objects' '
+       git prune
+'
+
+test_expect_success 'confirm there are no loose objects' '
+       git count-objects | grep ^0
+'
+
+test_perf 'prune with no objects' '
+       git prune
+'
+
+test_done

diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh
index 270da21ac3e2931a42683392536500c4bb1fb5c3..2c19a790c1be2eac2ba13903933c2b96692d620c 100755 (executable)
--- a/t/t5304-prune.sh
+++ b/t/t5304-prune.sh
@@ -274,6 +274,18 @@ test_expect_success 'prune .git/shallow' '
        test_path_is_missing .git/shallow
 '
 
        test_path_is_missing .git/shallow
 '
 

+test_expect_success 'prune .git/shallow when there are no loose objects' '
+       SHA1=$(echo hi|git commit-tree HEAD^{tree}) &&
+       echo $SHA1 >.git/shallow &&
+       git update-ref refs/heads/shallow-tip $SHA1 &&
+       git repack -ad &&
+       # verify assumption that all loose objects are gone
+       git count-objects | grep ^0 &&
+       git prune &&
+       echo $SHA1 >expect &&
+       test_cmp expect .git/shallow
+'
+

 test_expect_success 'prune: handle alternate object database' '
        test_create_repo A &&
        git -C A commit --allow-empty -m "initial commit" &&
 test_expect_success 'prune: handle alternate object database' '
        test_create_repo A &&
        git -C A commit --allow-empty -m "initial commit" &&