Teach Git to write a commit graph file by checking all packed objects
to see if they are commits, then store the file in the given pack
directory.
Signed-off-by: Derrick Stolee <dstolee@xxxxxxxxxxxxx>
---
Makefile | 1 +
commit-graph.c | 376 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
commit-graph.h | 20 +++
3 files changed, 397 insertions(+)
create mode 100644 commit-graph.c
create mode 100644 commit-graph.h
diff --git a/Makefile b/Makefile
index aee5d3f7b9..894432b35b 100644
--- a/Makefile
+++ b/Makefile
@@ -773,6 +773,7 @@ LIB_OBJS += color.o
LIB_OBJS += column.o
LIB_OBJS += combine-diff.o
LIB_OBJS += commit.o
+LIB_OBJS += commit-graph.o
LIB_OBJS += compat/obstack.o
LIB_OBJS += compat/terminal.o
LIB_OBJS += config.o
diff --git a/commit-graph.c b/commit-graph.c
new file mode 100644
index 0000000000..db2b7390c7
--- /dev/null
+++ b/commit-graph.c
@@ -0,0 +1,376 @@
+#include "cache.h"
+#include "config.h"
+#include "git-compat-util.h"
+#include "pack.h"
+#include "packfile.h"
+#include "commit.h"
+#include "object.h"
+#include "commit-graph.h"
+
+#define GRAPH_SIGNATURE 0x43475048 /* "CGPH" */
+#define GRAPH_CHUNKID_OIDFANOUT 0x4f494446 /* "OIDF" */
+#define GRAPH_CHUNKID_OIDLOOKUP 0x4f49444c /* "OIDL" */
+#define GRAPH_CHUNKID_DATA 0x43444154 /* "CDAT" */
+#define GRAPH_CHUNKID_LARGEEDGES 0x45444745 /* "EDGE" */
+
+#define GRAPH_DATA_WIDTH 36
+
+#define GRAPH_VERSION_1 0x1
+#define GRAPH_VERSION GRAPH_VERSION_1
+
+#define GRAPH_OID_VERSION_SHA1 1
+#define GRAPH_OID_LEN_SHA1 20
+#define GRAPH_OID_VERSION GRAPH_OID_VERSION_SHA1
+#define GRAPH_OID_LEN GRAPH_OID_LEN_SHA1
+
+#define GRAPH_LARGE_EDGES_NEEDED 0x80000000
+#define GRAPH_PARENT_MISSING 0x7fffffff
+#define GRAPH_EDGE_LAST_MASK 0x7fffffff
+#define GRAPH_PARENT_NONE 0x70000000
+
+#define GRAPH_LAST_EDGE 0x80000000
+
+#define GRAPH_FANOUT_SIZE (4*256)
+#define GRAPH_CHUNKLOOKUP_SIZE (5 * 12)
+#define GRAPH_MIN_SIZE (GRAPH_CHUNKLOOKUP_SIZE + GRAPH_FANOUT_SIZE + \
+ GRAPH_OID_LEN + sizeof(struct commit_graph_header))
+
+char* get_commit_graph_filename_hash(const char *pack_dir,
+ struct object_id *hash)
+{
+ size_t len;
+ struct strbuf head_path = STRBUF_INIT;
+ strbuf_addstr(&head_path, pack_dir);
+ strbuf_addstr(&head_path, "/graph-");
+ strbuf_addstr(&head_path, oid_to_hex(hash));
+ strbuf_addstr(&head_path, ".graph");
+
+ return strbuf_detach(&head_path, &len);
+}
+
+static void write_graph_chunk_fanout(struct sha1file *f,
+ struct commit **commits,
+ int nr_commits)
+{
+ uint32_t i, count = 0;
+ struct commit **list = commits;
+ struct commit **last = commits + nr_commits;
+
+ /*
+ * Write the first-level table (the list is sorted,
+ * but we use a 256-entry lookup to be able to avoid
+ * having to do eight extra binary search iterations).
+ */
+ for (i = 0; i < 256; i++) {
+ uint32_t swap_count;
+
+ while (list < last) {
+ if ((*list)->object.oid.hash[0] != i)
+ break;
+ count++;
+ list++;
+ }
+
+ swap_count = htonl(count);
+ sha1write(f, &swap_count, 4);
+ }
+}
+
+static void write_graph_chunk_oids(struct sha1file *f, int hash_len,
+ struct commit **commits, int nr_commits)
+{
+ struct commit **list, **last = commits + nr_commits;
+ for (list = commits; list < last; list++)
+ sha1write(f, (*list)->object.oid.hash, (int)hash_len);
+}
+
+static int commit_pos(struct commit **commits, int nr_commits,
+ const struct object_id *oid, uint32_t *pos)
+{
+ uint32_t first = 0, last = nr_commits;
+
+ while (first < last) {
+ uint32_t mid = first + (last - first) / 2;
+ struct object_id *current;
+ int cmp;
+
+ current = &(commits[mid]->object.oid);
+ cmp = oidcmp(oid, current);
+ if (!cmp) {
+ *pos = mid;
+ return 1;
+ }
+ if (cmp > 0) {
+ first = mid + 1;
+ continue;
+ }
+ last = mid;
+ }
+
+ *pos = first;
+ return 0;
+}
+
+static void write_graph_chunk_data(struct sha1file *f, int hash_len,
+ struct commit **commits, int nr_commits)
+{
+ struct commit **list = commits;
+ struct commit **last = commits + nr_commits;
+ uint32_t num_large_edges = 0;
+
+ while (list < last) {
+ struct commit_list *parent;
+ uint32_t int_id, swap_int_id;
+ uint32_t packedDate[2];
+
+ parse_commit(*list);
+ sha1write(f, (*list)->tree->object.oid.hash, hash_len);
+
+ parent = (*list)->parents;
+
+ if (!parent)
+ swap_int_id = htonl(GRAPH_PARENT_NONE);
+ else if (commit_pos(commits, nr_commits,
+ &(parent->item->object.oid), &int_id))
+ swap_int_id = htonl(int_id);
+ else
+ swap_int_id = htonl(GRAPH_PARENT_MISSING);
+
+ sha1write(f, &swap_int_id, 4);
+
+ if (parent)
+ parent = parent->next;
+
+ if (!parent)
+ swap_int_id = htonl(GRAPH_PARENT_NONE);
+ else if (parent->next)
+ swap_int_id = htonl(GRAPH_LARGE_EDGES_NEEDED | num_large_edges);
+ else if (commit_pos(commits, nr_commits,
+ &(parent->item->object.oid), &int_id))
+ swap_int_id = htonl(int_id);
+ else
+ swap_int_id = htonl(GRAPH_PARENT_MISSING);
+
+ sha1write(f, &swap_int_id, 4);
+
+ if (parent && parent->next) {
+ do {
+ num_large_edges++;
+ parent = parent->next;
+ } while (parent);
+ }
+
+ if (sizeof((*list)->date) > 4)
+ packedDate[0] = htonl(((*list)->date >> 32) & 0x3);
+ else
+ packedDate[0] = 0;
+
+ packedDate[1] = htonl((*list)->date);
+ sha1write(f, packedDate, 8);
+
+ list++;
+ }
+}
+
+static void write_graph_chunk_large_edges(struct sha1file *f,
+ struct commit **commits,
+ int nr_commits)
+{
+ struct commit **list = commits;
+ struct commit **last = commits + nr_commits;
+ struct commit_list *parent;
+
+ while (list < last) {
+ int num_parents = 0;
+ for (parent = (*list)->parents; num_parents < 3 && parent;
+ parent = parent->next)
+ num_parents++;
+
+ if (num_parents <= 2) {
+ list++;
+ continue;
+ }
+
+ for (parent = (*list)->parents; parent; parent = parent->next) {
+ uint32_t int_id, swap_int_id;
+ uint32_t last_edge = 0;
+
+ if (parent == (*list)->parents)
+ continue;
+
+ if (!parent->next)
+ last_edge |= GRAPH_LAST_EDGE;
+
+ if (commit_pos(commits, nr_commits,
+ &(parent->item->object.oid),
+ &int_id))
+ swap_int_id = htonl(int_id | last_edge);
+ else
+ swap_int_id = htonl(GRAPH_PARENT_MISSING | last_edge);
+
+ sha1write(f, &swap_int_id, 4);
+ }
+
+ list++;
+ }
+}
+
+static int commit_compare(const void *_a, const void *_b)
+{
+ struct object_id *a = *(struct object_id **)_a;
+ struct object_id *b = *(struct object_id **)_b;
+ return oidcmp(a, b);
+}
+
+struct packed_commit_list {
+ struct commit **list;
+ int num;
+ int size;
+};
+
+struct packed_oid_list {
+ struct object_id **list;
+ int num;
+ int size;
+};
+
+static int if_packed_commit_add_to_list(const struct object_id *oid,
+ struct packed_git *pack,
+ uint32_t pos,
+ void *data)
+{
+ struct packed_oid_list *list = (struct packed_oid_list*)data;
+ enum object_type type;
+ unsigned long size;
+ void *inner_data;
+ off_t offset = nth_packed_object_offset(pack, pos);
+ inner_data = unpack_entry(pack, offset, &type, &size);
+
+ if (inner_data)
+ free(inner_data);
+
+ if (type != OBJ_COMMIT)
+ return 0;
+
+ ALLOC_GROW(list->list, list->num + 1, list->size);
+ list->list[list->num] = (struct object_id *)malloc(sizeof(struct object_id));
+ oidcpy(list->list[list->num], oid);
+ (list->num)++;
+
+ return 0;
+}
+
+struct object_id *construct_commit_graph(const char *pack_dir)
+{
+ struct packed_oid_list oids;
+ struct packed_commit_list commits;
+ struct commit_graph_header hdr;
+ struct sha1file *f;
+ int i, count_distinct = 0;
+ struct strbuf tmp_file = STRBUF_INIT;
+ unsigned char final_hash[GIT_MAX_RAWSZ];
+ char *graph_name;
+ int fd;
+ uint32_t chunk_ids[5];
+ uint64_t chunk_offsets[5];
+ int num_long_edges;
+ struct object_id *f_hash;
+ char *fname;
+ struct commit_list *parent;
+
+ oids.num = 0;
+ oids.size = 1024;
+ ALLOC_ARRAY(oids.list, oids.size);
+ for_each_packed_object(if_packed_commit_add_to_list, &oids, 0);
+ QSORT(oids.list, oids.num, commit_compare);
+
+ count_distinct = 1;
+ for (i = 1; i < oids.num; i++) {
+ if (oidcmp(oids.list[i-1], oids.list[i]))
+ count_distinct++;
+ }
+
+ commits.num = 0;
+ commits.size = count_distinct;
+ ALLOC_ARRAY(commits.list, commits.size);
+
+ num_long_edges = 0;
+ for (i = 0; i < oids.num; i++) {
+ int num_parents = 0;
+ if (i > 0 && !oidcmp(oids.list[i-1], oids.list[i]))
+ continue;
+
+ commits.list[commits.num] = lookup_commit(oids.list[i]);
+ parse_commit(commits.list[commits.num]);
+
+ for (parent = commits.list[commits.num]->parents;
+ parent; parent = parent->next)
+ num_parents++;
+
+ if (num_parents > 2)
+ num_long_edges += num_parents - 1;
+
+ commits.num++;
+ }
+
+ strbuf_addstr(&tmp_file, pack_dir);
+ strbuf_addstr(&tmp_file, "/tmp_graph_XXXXXX");
+
+ fd = git_mkstemp_mode(tmp_file.buf, 0444);
+ if (fd < 0)
+ die_errno("unable to create '%s'", tmp_file.buf);
+
+ graph_name = strbuf_detach(&tmp_file, NULL);
+ f = sha1fd(fd, graph_name);
+
+ hdr.graph_signature = htonl(GRAPH_SIGNATURE);
+ hdr.graph_version = GRAPH_VERSION;
+ hdr.hash_version = GRAPH_OID_VERSION;
+ hdr.hash_len = GRAPH_OID_LEN;
+ hdr.num_chunks = 4;
+
+ assert(sizeof(hdr) == 8);
+ sha1write(f, &hdr, sizeof(hdr));
+
+ chunk_ids[0] = GRAPH_CHUNKID_OIDFANOUT;
+ chunk_ids[1] = GRAPH_CHUNKID_OIDLOOKUP;
+ chunk_ids[2] = GRAPH_CHUNKID_DATA;
+ chunk_ids[3] = GRAPH_CHUNKID_LARGEEDGES;
+ chunk_ids[4] = 0;
+
+ chunk_offsets[0] = sizeof(hdr) + GRAPH_CHUNKLOOKUP_SIZE;
+ chunk_offsets[1] = chunk_offsets[0] + GRAPH_FANOUT_SIZE;
+ chunk_offsets[2] = chunk_offsets[1] + GRAPH_OID_LEN * commits.num;
+ chunk_offsets[3] = chunk_offsets[2] + (GRAPH_OID_LEN + 16) * commits.num;
+ chunk_offsets[4] = chunk_offsets[3] + 4 * num_long_edges;
+
+ for (i = 0; i <= hdr.num_chunks; i++) {
+ uint32_t chunk_write[3];
+
+ chunk_write[0] = htonl(chunk_ids[i]);
+ chunk_write[1] = htonl(chunk_offsets[i] >> 32);
+ chunk_write[2] = htonl(chunk_offsets[i] & 0xffffffff);
+ sha1write(f, chunk_write, 12);
+ }
+
+ write_graph_chunk_fanout(f, commits.list, commits.num);
+ write_graph_chunk_oids(f, GRAPH_OID_LEN, commits.list, commits.num);
+ write_graph_chunk_data(f, GRAPH_OID_LEN, commits.list, commits.num);
+ write_graph_chunk_large_edges(f, commits.list, commits.num);
+
+ sha1close(f, final_hash, CSUM_CLOSE | CSUM_FSYNC);
+
+ f_hash = (struct object_id *)malloc(sizeof(struct object_id));
+ memcpy(f_hash->hash, final_hash, GIT_MAX_RAWSZ);
+ fname = get_commit_graph_filename_hash(pack_dir, f_hash);
+
+ if (rename(graph_name, fname))
+ die("failed to rename %s to %s", graph_name, fname);
+
+ free(oids.list);
+ oids.size = 0;
+ oids.num = 0;
+
+ return f_hash;
+}
+
diff --git a/commit-graph.h b/commit-graph.h
new file mode 100644
index 0000000000..7b3469a7df
--- /dev/null
+++ b/commit-graph.h
@@ -0,0 +1,20 @@
+#ifndef COMMIT_GRAPH_H
+#define COMMIT_GRAPH_H
+
+#include "git-compat-util.h"
+#include "commit.h"
+
+extern char* get_commit_graph_filename_hash(const char *pack_dir,
+ struct object_id *hash);
+
+struct commit_graph_header {
+ uint32_t graph_signature;
+ unsigned char graph_version;
+ unsigned char hash_version;
+ unsigned char hash_len;
+ unsigned char num_chunks;
+};
+
+extern struct object_id *construct_commit_graph(const char *pack_dir);
+
+#endif
--
2.16.0.15.g9c3cf44.dirty
