Now that we have the plumbing in place to generate and read
commit metapacks, we can hook them up to parse_commit to
fill in the traversal information much more quickly.
We only do so if save_commit_buffer is turned off;
otherwise, the callers will expect to be able to read
commit->buffer after parse_commit returns (and since our
cache obviously does not have that information, we must
leave it NULL). As callers learn to handle a NULL
commit->buffer, we can eventually relax this (while it might
seem like a useless no-op to use the cache if we are going
to load the commit anyway, many callers may first filter
based on the traversal, and end up loading the commit
message for only a subset of the commits).
With this patch (and having run "git metapack --all
--commits"), my best-of-five warm-cache "git rev-list
--count --all" traversal of linux-2.6.git drops from 4.219s
to 0.659s.
Similarly, cold-cache drops from 13.696s to 4.763s due to
the compactness of the cache data (but you are penalized, of
course, if you then want to actually look at the commit
messages, since you have not warmed them into the cache).
Signed-off-by: Jeff King <peff@xxxxxxxx>
---
commit.c | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/commit.c b/commit.c
index e8eb0ae..b326201 100644
--- a/commit.c
+++ b/commit.c
@@ -8,6 +8,7 @@
#include "notes.h"
#include "gpg-interface.h"
#include "mergesort.h"
+#include "commit-metapack.h"
static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **);
@@ -306,6 +307,24 @@ int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long s
return 0;
}
+static int parse_commit_metapack(struct commit *item)
+{
+ unsigned char *tree, *p1, *p2;
+ uint32_t ts;
+
+ if (commit_metapack(item->object.sha1, &ts, &tree, &p1, &p2) < 0)
+ return -1;
+
+ item->date = ts;
+ item->tree = lookup_tree(tree);
+ commit_list_insert(lookup_commit(p1), &item->parents);
+ if (!is_null_sha1(p2))
+ commit_list_insert(lookup_commit(p2), &item->parents->next);
+
+ item->object.parsed = 1;
+ return 0;
+}
+
int parse_commit(struct commit *item)
{
enum object_type type;
@@ -317,6 +336,10 @@ int parse_commit(struct commit *item)
return -1;
if (item->object.parsed)
return 0;
+
+ if (!save_commit_buffer && !parse_commit_metapack(item))
+ return 0;
+
buffer = read_sha1_file(item->object.sha1, &type, &size);
if (!buffer)
return error("Could not read %s",
--
1.8.0.2.16.g72e2fc9
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html