1 #include "git-compat-util.h"
10 #include "hash-lookup.h"
11 #include "commit-graph.h"
12 #include "object-store.h"
15 #include "replace-object.h"
18 #include "commit-slab.h"
20 #include "json-writer.h"
22 #include "chunk-format.h"
24 void git_test_write_commit_graph_or_die(void)
27 if (!git_env_bool(GIT_TEST_COMMIT_GRAPH
, 0))
30 if (git_env_bool(GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS
, 0))
31 flags
= COMMIT_GRAPH_WRITE_BLOOM_FILTERS
;
33 if (write_commit_graph_reachable(the_repository
->objects
->odb
,
35 die("failed to write commit-graph under GIT_TEST_COMMIT_GRAPH");
38 #define GRAPH_SIGNATURE 0x43475048 /* "CGPH" */
39 #define GRAPH_CHUNKID_OIDFANOUT 0x4f494446 /* "OIDF" */
40 #define GRAPH_CHUNKID_OIDLOOKUP 0x4f49444c /* "OIDL" */
41 #define GRAPH_CHUNKID_DATA 0x43444154 /* "CDAT" */
42 #define GRAPH_CHUNKID_GENERATION_DATA 0x47444154 /* "GDAT" */
43 #define GRAPH_CHUNKID_GENERATION_DATA_OVERFLOW 0x47444f56 /* "GDOV" */
44 #define GRAPH_CHUNKID_EXTRAEDGES 0x45444745 /* "EDGE" */
45 #define GRAPH_CHUNKID_BLOOMINDEXES 0x42494458 /* "BIDX" */
46 #define GRAPH_CHUNKID_BLOOMDATA 0x42444154 /* "BDAT" */
47 #define GRAPH_CHUNKID_BASE 0x42415345 /* "BASE" */
49 #define GRAPH_DATA_WIDTH (the_hash_algo->rawsz + 16)
51 #define GRAPH_VERSION_1 0x1
52 #define GRAPH_VERSION GRAPH_VERSION_1
54 #define GRAPH_EXTRA_EDGES_NEEDED 0x80000000
55 #define GRAPH_EDGE_LAST_MASK 0x7fffffff
56 #define GRAPH_PARENT_NONE 0x70000000
58 #define GRAPH_LAST_EDGE 0x80000000
60 #define GRAPH_HEADER_SIZE 8
61 #define GRAPH_FANOUT_SIZE (4 * 256)
62 #define GRAPH_MIN_SIZE (GRAPH_HEADER_SIZE + 4 * CHUNK_TOC_ENTRY_SIZE \
63 + GRAPH_FANOUT_SIZE + the_hash_algo->rawsz)
65 #define CORRECTED_COMMIT_DATE_OFFSET_OVERFLOW (1ULL << 31)
67 /* Remember to update object flag allocation in object.h */
68 #define REACHABLE (1u<<15)
70 define_commit_slab(topo_level_slab
, uint32_t);
72 /* Keep track of the order in which commits are added to our list. */
73 define_commit_slab(commit_pos
, int);
74 static struct commit_pos commit_pos
= COMMIT_SLAB_INIT(1, commit_pos
);
76 static void set_commit_pos(struct repository
*r
, const struct object_id
*oid
)
78 static int32_t max_pos
;
79 struct commit
*commit
= lookup_commit(r
, oid
);
82 return; /* should never happen, but be lenient */
84 *commit_pos_at(&commit_pos
, commit
) = max_pos
++;
87 static int commit_pos_cmp(const void *va
, const void *vb
)
89 const struct commit
*a
= *(const struct commit
**)va
;
90 const struct commit
*b
= *(const struct commit
**)vb
;
91 return commit_pos_at(&commit_pos
, a
) -
92 commit_pos_at(&commit_pos
, b
);
95 define_commit_slab(commit_graph_data_slab
, struct commit_graph_data
);
96 static struct commit_graph_data_slab commit_graph_data_slab
=
97 COMMIT_SLAB_INIT(1, commit_graph_data_slab
);
99 static int get_configured_generation_version(struct repository
*r
)
102 repo_config_get_int(r
, "commitgraph.generationversion", &version
);
106 uint32_t commit_graph_position(const struct commit
*c
)
108 struct commit_graph_data
*data
=
109 commit_graph_data_slab_peek(&commit_graph_data_slab
, c
);
111 return data
? data
->graph_pos
: COMMIT_NOT_FROM_GRAPH
;
114 timestamp_t
commit_graph_generation(const struct commit
*c
)
116 struct commit_graph_data
*data
=
117 commit_graph_data_slab_peek(&commit_graph_data_slab
, c
);
120 return GENERATION_NUMBER_INFINITY
;
121 else if (data
->graph_pos
== COMMIT_NOT_FROM_GRAPH
)
122 return GENERATION_NUMBER_INFINITY
;
124 return data
->generation
;
127 static struct commit_graph_data
*commit_graph_data_at(const struct commit
*c
)
129 unsigned int i
, nth_slab
;
130 struct commit_graph_data
*data
=
131 commit_graph_data_slab_peek(&commit_graph_data_slab
, c
);
136 nth_slab
= c
->index
/ commit_graph_data_slab
.slab_size
;
137 data
= commit_graph_data_slab_at(&commit_graph_data_slab
, c
);
140 * commit-slab initializes elements with zero, overwrite this with
141 * COMMIT_NOT_FROM_GRAPH for graph_pos.
143 * We avoid initializing generation with checking if graph position
144 * is not COMMIT_NOT_FROM_GRAPH.
146 for (i
= 0; i
< commit_graph_data_slab
.slab_size
; i
++) {
147 commit_graph_data_slab
.slab
[nth_slab
][i
].graph_pos
=
148 COMMIT_NOT_FROM_GRAPH
;
155 * Should be used only while writing commit-graph as it compares
156 * generation value of commits by directly accessing commit-slab.
158 static int commit_gen_cmp(const void *va
, const void *vb
)
160 const struct commit
*a
= *(const struct commit
**)va
;
161 const struct commit
*b
= *(const struct commit
**)vb
;
163 const timestamp_t generation_a
= commit_graph_data_at(a
)->generation
;
164 const timestamp_t generation_b
= commit_graph_data_at(b
)->generation
;
165 /* lower generation commits first */
166 if (generation_a
< generation_b
)
168 else if (generation_a
> generation_b
)
171 /* use date as a heuristic when generations are equal */
172 if (a
->date
< b
->date
)
174 else if (a
->date
> b
->date
)
179 char *get_commit_graph_filename(struct object_directory
*obj_dir
)
181 return xstrfmt("%s/info/commit-graph", obj_dir
->path
);
184 static char *get_split_graph_filename(struct object_directory
*odb
,
187 return xstrfmt("%s/info/commit-graphs/graph-%s.graph", odb
->path
,
191 char *get_commit_graph_chain_filename(struct object_directory
*odb
)
193 return xstrfmt("%s/info/commit-graphs/commit-graph-chain", odb
->path
);
196 static uint8_t oid_version(void)
198 switch (hash_algo_by_ptr(the_hash_algo
)) {
201 case GIT_HASH_SHA256
:
204 die(_("invalid hash version"));
208 static struct commit_graph
*alloc_commit_graph(void)
210 struct commit_graph
*g
= xcalloc(1, sizeof(*g
));
215 extern int read_replace_refs
;
217 static int commit_graph_compatible(struct repository
*r
)
222 if (read_replace_refs
) {
223 prepare_replace_object(r
);
224 if (hashmap_get_size(&r
->objects
->replace_map
->map
))
228 prepare_commit_graft(r
);
229 if (r
->parsed_objects
&&
230 (r
->parsed_objects
->grafts_nr
|| r
->parsed_objects
->substituted_parent
))
232 if (is_repository_shallow(r
))
238 int open_commit_graph(const char *graph_file
, int *fd
, struct stat
*st
)
240 *fd
= git_open(graph_file
);
243 if (fstat(*fd
, st
)) {
250 struct commit_graph
*load_commit_graph_one_fd_st(struct repository
*r
,
251 int fd
, struct stat
*st
,
252 struct object_directory
*odb
)
256 struct commit_graph
*ret
;
258 graph_size
= xsize_t(st
->st_size
);
260 if (graph_size
< GRAPH_MIN_SIZE
) {
262 error(_("commit-graph file is too small"));
265 graph_map
= xmmap(NULL
, graph_size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
267 ret
= parse_commit_graph(r
, graph_map
, graph_size
);
272 munmap(graph_map
, graph_size
);
277 static int verify_commit_graph_lite(struct commit_graph
*g
)
280 * Basic validation shared between parse_commit_graph()
281 * which'll be called every time the graph is used, and the
282 * much more expensive verify_commit_graph() used by
283 * "commit-graph verify".
285 * There should only be very basic checks here to ensure that
286 * we don't e.g. segfault in fill_commit_in_graph(), but
287 * because this is a very hot codepath nothing that e.g. loops
288 * over g->num_commits, or runs a checksum on the commit-graph
291 if (!g
->chunk_oid_fanout
) {
292 error("commit-graph is missing the OID Fanout chunk");
295 if (!g
->chunk_oid_lookup
) {
296 error("commit-graph is missing the OID Lookup chunk");
299 if (!g
->chunk_commit_data
) {
300 error("commit-graph is missing the Commit Data chunk");
307 static int graph_read_oid_lookup(const unsigned char *chunk_start
,
308 size_t chunk_size
, void *data
)
310 struct commit_graph
*g
= data
;
311 g
->chunk_oid_lookup
= chunk_start
;
312 g
->num_commits
= chunk_size
/ g
->hash_len
;
316 static int graph_read_bloom_data(const unsigned char *chunk_start
,
317 size_t chunk_size
, void *data
)
319 struct commit_graph
*g
= data
;
320 uint32_t hash_version
;
321 g
->chunk_bloom_data
= chunk_start
;
322 hash_version
= get_be32(chunk_start
);
324 if (hash_version
!= 1)
327 g
->bloom_filter_settings
= xmalloc(sizeof(struct bloom_filter_settings
));
328 g
->bloom_filter_settings
->hash_version
= hash_version
;
329 g
->bloom_filter_settings
->num_hashes
= get_be32(chunk_start
+ 4);
330 g
->bloom_filter_settings
->bits_per_entry
= get_be32(chunk_start
+ 8);
331 g
->bloom_filter_settings
->max_changed_paths
= DEFAULT_BLOOM_MAX_CHANGES
;
336 struct commit_graph
*parse_commit_graph(struct repository
*r
,
337 void *graph_map
, size_t graph_size
)
339 const unsigned char *data
;
340 struct commit_graph
*graph
;
341 uint32_t graph_signature
;
342 unsigned char graph_version
, hash_version
;
343 struct chunkfile
*cf
= NULL
;
348 if (graph_size
< GRAPH_MIN_SIZE
)
351 data
= (const unsigned char *)graph_map
;
353 graph_signature
= get_be32(data
);
354 if (graph_signature
!= GRAPH_SIGNATURE
) {
355 error(_("commit-graph signature %X does not match signature %X"),
356 graph_signature
, GRAPH_SIGNATURE
);
360 graph_version
= *(unsigned char*)(data
+ 4);
361 if (graph_version
!= GRAPH_VERSION
) {
362 error(_("commit-graph version %X does not match version %X"),
363 graph_version
, GRAPH_VERSION
);
367 hash_version
= *(unsigned char*)(data
+ 5);
368 if (hash_version
!= oid_version()) {
369 error(_("commit-graph hash version %X does not match version %X"),
370 hash_version
, oid_version());
374 prepare_repo_settings(r
);
376 graph
= alloc_commit_graph();
378 graph
->hash_len
= the_hash_algo
->rawsz
;
379 graph
->num_chunks
= *(unsigned char*)(data
+ 6);
380 graph
->data
= graph_map
;
381 graph
->data_len
= graph_size
;
383 if (graph_size
< GRAPH_HEADER_SIZE
+
384 (graph
->num_chunks
+ 1) * CHUNK_TOC_ENTRY_SIZE
+
385 GRAPH_FANOUT_SIZE
+ the_hash_algo
->rawsz
) {
386 error(_("commit-graph file is too small to hold %u chunks"),
392 cf
= init_chunkfile(NULL
);
394 if (read_table_of_contents(cf
, graph
->data
, graph_size
,
395 GRAPH_HEADER_SIZE
, graph
->num_chunks
))
396 goto free_and_return
;
398 pair_chunk(cf
, GRAPH_CHUNKID_OIDFANOUT
,
399 (const unsigned char **)&graph
->chunk_oid_fanout
);
400 read_chunk(cf
, GRAPH_CHUNKID_OIDLOOKUP
, graph_read_oid_lookup
, graph
);
401 pair_chunk(cf
, GRAPH_CHUNKID_DATA
, &graph
->chunk_commit_data
);
402 pair_chunk(cf
, GRAPH_CHUNKID_EXTRAEDGES
, &graph
->chunk_extra_edges
);
403 pair_chunk(cf
, GRAPH_CHUNKID_BASE
, &graph
->chunk_base_graphs
);
405 if (get_configured_generation_version(r
) >= 2) {
406 pair_chunk(cf
, GRAPH_CHUNKID_GENERATION_DATA
,
407 &graph
->chunk_generation_data
);
408 pair_chunk(cf
, GRAPH_CHUNKID_GENERATION_DATA_OVERFLOW
,
409 &graph
->chunk_generation_data_overflow
);
412 if (r
->settings
.commit_graph_read_changed_paths
) {
413 pair_chunk(cf
, GRAPH_CHUNKID_BLOOMINDEXES
,
414 &graph
->chunk_bloom_indexes
);
415 read_chunk(cf
, GRAPH_CHUNKID_BLOOMDATA
,
416 graph_read_bloom_data
, graph
);
419 if (graph
->chunk_bloom_indexes
&& graph
->chunk_bloom_data
) {
420 init_bloom_filters();
422 /* We need both the bloom chunks to exist together. Else ignore the data */
423 graph
->chunk_bloom_indexes
= NULL
;
424 graph
->chunk_bloom_data
= NULL
;
425 FREE_AND_NULL(graph
->bloom_filter_settings
);
428 oidread(&graph
->oid
, graph
->data
+ graph
->data_len
- graph
->hash_len
);
430 if (verify_commit_graph_lite(graph
))
431 goto free_and_return
;
438 free(graph
->bloom_filter_settings
);
443 static struct commit_graph
*load_commit_graph_one(struct repository
*r
,
444 const char *graph_file
,
445 struct object_directory
*odb
)
450 struct commit_graph
*g
;
451 int open_ok
= open_commit_graph(graph_file
, &fd
, &st
);
456 g
= load_commit_graph_one_fd_st(r
, fd
, &st
, odb
);
459 g
->filename
= xstrdup(graph_file
);
464 static struct commit_graph
*load_commit_graph_v1(struct repository
*r
,
465 struct object_directory
*odb
)
467 char *graph_name
= get_commit_graph_filename(odb
);
468 struct commit_graph
*g
= load_commit_graph_one(r
, graph_name
, odb
);
474 static int add_graph_to_chain(struct commit_graph
*g
,
475 struct commit_graph
*chain
,
476 struct object_id
*oids
,
479 struct commit_graph
*cur_g
= chain
;
481 if (n
&& !g
->chunk_base_graphs
) {
482 warning(_("commit-graph has no base graphs chunk"));
490 !oideq(&oids
[n
], &cur_g
->oid
) ||
491 !hasheq(oids
[n
].hash
, g
->chunk_base_graphs
+ g
->hash_len
* n
)) {
492 warning(_("commit-graph chain does not match"));
496 cur_g
= cur_g
->base_graph
;
499 g
->base_graph
= chain
;
502 g
->num_commits_in_base
= chain
->num_commits
+ chain
->num_commits_in_base
;
507 static struct commit_graph
*load_commit_graph_chain(struct repository
*r
,
508 struct object_directory
*odb
)
510 struct commit_graph
*graph_chain
= NULL
;
511 struct strbuf line
= STRBUF_INIT
;
513 struct object_id
*oids
;
514 int i
= 0, valid
= 1, count
;
515 char *chain_name
= get_commit_graph_chain_filename(odb
);
519 fp
= fopen(chain_name
, "r");
520 stat_res
= stat(chain_name
, &st
);
525 st
.st_size
<= the_hash_algo
->hexsz
)
528 count
= st
.st_size
/ (the_hash_algo
->hexsz
+ 1);
529 CALLOC_ARRAY(oids
, count
);
533 for (i
= 0; i
< count
; i
++) {
534 struct object_directory
*odb
;
536 if (strbuf_getline_lf(&line
, fp
) == EOF
)
539 if (get_oid_hex(line
.buf
, &oids
[i
])) {
540 warning(_("invalid commit-graph chain: line '%s' not a hash"),
547 for (odb
= r
->objects
->odb
; odb
; odb
= odb
->next
) {
548 char *graph_name
= get_split_graph_filename(odb
, line
.buf
);
549 struct commit_graph
*g
= load_commit_graph_one(r
, graph_name
, odb
);
554 if (add_graph_to_chain(g
, graph_chain
, oids
, i
)) {
564 warning(_("unable to find all commit-graph files"));
571 strbuf_release(&line
);
577 * returns 1 if and only if all graphs in the chain have
578 * corrected commit dates stored in the generation_data chunk.
580 static int validate_mixed_generation_chain(struct commit_graph
*g
)
582 int read_generation_data
= 1;
583 struct commit_graph
*p
= g
;
585 while (read_generation_data
&& p
) {
586 read_generation_data
= p
->read_generation_data
;
590 if (read_generation_data
)
594 g
->read_generation_data
= 0;
601 struct commit_graph
*read_commit_graph_one(struct repository
*r
,
602 struct object_directory
*odb
)
604 struct commit_graph
*g
= load_commit_graph_v1(r
, odb
);
607 g
= load_commit_graph_chain(r
, odb
);
609 validate_mixed_generation_chain(g
);
614 static void prepare_commit_graph_one(struct repository
*r
,
615 struct object_directory
*odb
)
618 if (r
->objects
->commit_graph
)
621 r
->objects
->commit_graph
= read_commit_graph_one(r
, odb
);
625 * Return 1 if commit_graph is non-NULL, and 0 otherwise.
627 * On the first invocation, this function attempts to load the commit
628 * graph if the_repository is configured to have one.
630 static int prepare_commit_graph(struct repository
*r
)
632 struct object_directory
*odb
;
635 * This must come before the "already attempted?" check below, because
636 * we want to disable even an already-loaded graph file.
638 if (r
->commit_graph_disabled
)
641 if (r
->objects
->commit_graph_attempted
)
642 return !!r
->objects
->commit_graph
;
643 r
->objects
->commit_graph_attempted
= 1;
645 prepare_repo_settings(r
);
647 if (!git_env_bool(GIT_TEST_COMMIT_GRAPH
, 0) &&
648 r
->settings
.core_commit_graph
!= 1)
650 * This repository is not configured to use commit graphs, so
651 * do not load one. (But report commit_graph_attempted anyway
652 * so that commit graph loading is not attempted again for this
657 if (!commit_graph_compatible(r
))
661 for (odb
= r
->objects
->odb
;
662 !r
->objects
->commit_graph
&& odb
;
664 prepare_commit_graph_one(r
, odb
);
665 return !!r
->objects
->commit_graph
;
668 int generation_numbers_enabled(struct repository
*r
)
670 uint32_t first_generation
;
671 struct commit_graph
*g
;
672 if (!prepare_commit_graph(r
))
675 g
= r
->objects
->commit_graph
;
680 first_generation
= get_be32(g
->chunk_commit_data
+
681 g
->hash_len
+ 8) >> 2;
683 return !!first_generation
;
686 int corrected_commit_dates_enabled(struct repository
*r
)
688 struct commit_graph
*g
;
689 if (!prepare_commit_graph(r
))
692 g
= r
->objects
->commit_graph
;
697 return g
->read_generation_data
;
700 struct bloom_filter_settings
*get_bloom_filter_settings(struct repository
*r
)
702 struct commit_graph
*g
= r
->objects
->commit_graph
;
704 if (g
->bloom_filter_settings
)
705 return g
->bloom_filter_settings
;
711 static void close_commit_graph_one(struct commit_graph
*g
)
716 clear_commit_graph_data_slab(&commit_graph_data_slab
);
717 close_commit_graph_one(g
->base_graph
);
718 free_commit_graph(g
);
721 void close_commit_graph(struct raw_object_store
*o
)
723 close_commit_graph_one(o
->commit_graph
);
724 o
->commit_graph
= NULL
;
727 static int bsearch_graph(struct commit_graph
*g
, const struct object_id
*oid
, uint32_t *pos
)
729 return bsearch_hash(oid
->hash
, g
->chunk_oid_fanout
,
730 g
->chunk_oid_lookup
, g
->hash_len
, pos
);
733 static void load_oid_from_graph(struct commit_graph
*g
,
735 struct object_id
*oid
)
739 while (g
&& pos
< g
->num_commits_in_base
)
743 BUG("NULL commit-graph");
745 if (pos
>= g
->num_commits
+ g
->num_commits_in_base
)
746 die(_("invalid commit position. commit-graph is likely corrupt"));
748 lex_index
= pos
- g
->num_commits_in_base
;
750 oidread(oid
, g
->chunk_oid_lookup
+ g
->hash_len
* lex_index
);
753 static struct commit_list
**insert_parent_or_die(struct repository
*r
,
754 struct commit_graph
*g
,
756 struct commit_list
**pptr
)
759 struct object_id oid
;
761 if (pos
>= g
->num_commits
+ g
->num_commits_in_base
)
762 die("invalid parent position %"PRIu32
, pos
);
764 load_oid_from_graph(g
, pos
, &oid
);
765 c
= lookup_commit(r
, &oid
);
767 die(_("could not find commit %s"), oid_to_hex(&oid
));
768 commit_graph_data_at(c
)->graph_pos
= pos
;
769 return &commit_list_insert(c
, pptr
)->next
;
772 static void fill_commit_graph_info(struct commit
*item
, struct commit_graph
*g
, uint32_t pos
)
774 const unsigned char *commit_data
;
775 struct commit_graph_data
*graph_data
;
776 uint32_t lex_index
, offset_pos
;
777 uint64_t date_high
, date_low
, offset
;
779 while (pos
< g
->num_commits_in_base
)
782 if (pos
>= g
->num_commits
+ g
->num_commits_in_base
)
783 die(_("invalid commit position. commit-graph is likely corrupt"));
785 lex_index
= pos
- g
->num_commits_in_base
;
786 commit_data
= g
->chunk_commit_data
+ GRAPH_DATA_WIDTH
* lex_index
;
788 graph_data
= commit_graph_data_at(item
);
789 graph_data
->graph_pos
= pos
;
791 date_high
= get_be32(commit_data
+ g
->hash_len
+ 8) & 0x3;
792 date_low
= get_be32(commit_data
+ g
->hash_len
+ 12);
793 item
->date
= (timestamp_t
)((date_high
<< 32) | date_low
);
795 if (g
->read_generation_data
) {
796 offset
= (timestamp_t
)get_be32(g
->chunk_generation_data
+ sizeof(uint32_t) * lex_index
);
798 if (offset
& CORRECTED_COMMIT_DATE_OFFSET_OVERFLOW
) {
799 if (!g
->chunk_generation_data_overflow
)
800 die(_("commit-graph requires overflow generation data but has none"));
802 offset_pos
= offset
^ CORRECTED_COMMIT_DATE_OFFSET_OVERFLOW
;
803 graph_data
->generation
= get_be64(g
->chunk_generation_data_overflow
+ 8 * offset_pos
);
805 graph_data
->generation
= item
->date
+ offset
;
807 graph_data
->generation
= get_be32(commit_data
+ g
->hash_len
+ 8) >> 2;
810 *topo_level_slab_at(g
->topo_levels
, item
) = get_be32(commit_data
+ g
->hash_len
+ 8) >> 2;
813 static inline void set_commit_tree(struct commit
*c
, struct tree
*t
)
818 static int fill_commit_in_graph(struct repository
*r
,
820 struct commit_graph
*g
, uint32_t pos
)
823 uint32_t *parent_data_ptr
;
824 struct commit_list
**pptr
;
825 const unsigned char *commit_data
;
828 while (pos
< g
->num_commits_in_base
)
831 fill_commit_graph_info(item
, g
, pos
);
833 lex_index
= pos
- g
->num_commits_in_base
;
834 commit_data
= g
->chunk_commit_data
+ (g
->hash_len
+ 16) * lex_index
;
836 item
->object
.parsed
= 1;
838 set_commit_tree(item
, NULL
);
840 pptr
= &item
->parents
;
842 edge_value
= get_be32(commit_data
+ g
->hash_len
);
843 if (edge_value
== GRAPH_PARENT_NONE
)
845 pptr
= insert_parent_or_die(r
, g
, edge_value
, pptr
);
847 edge_value
= get_be32(commit_data
+ g
->hash_len
+ 4);
848 if (edge_value
== GRAPH_PARENT_NONE
)
850 if (!(edge_value
& GRAPH_EXTRA_EDGES_NEEDED
)) {
851 pptr
= insert_parent_or_die(r
, g
, edge_value
, pptr
);
855 parent_data_ptr
= (uint32_t*)(g
->chunk_extra_edges
+
856 4 * (uint64_t)(edge_value
& GRAPH_EDGE_LAST_MASK
));
858 edge_value
= get_be32(parent_data_ptr
);
859 pptr
= insert_parent_or_die(r
, g
,
860 edge_value
& GRAPH_EDGE_LAST_MASK
,
863 } while (!(edge_value
& GRAPH_LAST_EDGE
));
868 static int search_commit_pos_in_graph(const struct object_id
*id
, struct commit_graph
*g
, uint32_t *pos
)
870 struct commit_graph
*cur_g
= g
;
873 while (cur_g
&& !bsearch_graph(cur_g
, id
, &lex_index
))
874 cur_g
= cur_g
->base_graph
;
877 *pos
= lex_index
+ cur_g
->num_commits_in_base
;
884 static int find_commit_pos_in_graph(struct commit
*item
, struct commit_graph
*g
, uint32_t *pos
)
886 uint32_t graph_pos
= commit_graph_position(item
);
887 if (graph_pos
!= COMMIT_NOT_FROM_GRAPH
) {
891 return search_commit_pos_in_graph(&item
->object
.oid
, g
, pos
);
895 struct commit
*lookup_commit_in_graph(struct repository
*repo
, const struct object_id
*id
)
897 struct commit
*commit
;
900 if (!repo
->objects
->commit_graph
)
902 if (!search_commit_pos_in_graph(id
, repo
->objects
->commit_graph
, &pos
))
904 if (!repo_has_object_file(repo
, id
))
907 commit
= lookup_commit(repo
, id
);
910 if (commit
->object
.parsed
)
913 if (!fill_commit_in_graph(repo
, commit
, repo
->objects
->commit_graph
, pos
))
919 static int parse_commit_in_graph_one(struct repository
*r
,
920 struct commit_graph
*g
,
925 if (item
->object
.parsed
)
928 if (find_commit_pos_in_graph(item
, g
, &pos
))
929 return fill_commit_in_graph(r
, item
, g
, pos
);
934 int parse_commit_in_graph(struct repository
*r
, struct commit
*item
)
936 static int checked_env
= 0;
939 git_env_bool(GIT_TEST_COMMIT_GRAPH_DIE_ON_PARSE
, 0))
940 die("dying as requested by the '%s' variable on commit-graph parse!",
941 GIT_TEST_COMMIT_GRAPH_DIE_ON_PARSE
);
944 if (!prepare_commit_graph(r
))
946 return parse_commit_in_graph_one(r
, r
->objects
->commit_graph
, item
);
949 void load_commit_graph_info(struct repository
*r
, struct commit
*item
)
952 if (!prepare_commit_graph(r
))
954 if (find_commit_pos_in_graph(item
, r
->objects
->commit_graph
, &pos
))
955 fill_commit_graph_info(item
, r
->objects
->commit_graph
, pos
);
958 static struct tree
*load_tree_for_commit(struct repository
*r
,
959 struct commit_graph
*g
,
962 struct object_id oid
;
963 const unsigned char *commit_data
;
964 uint32_t graph_pos
= commit_graph_position(c
);
966 while (graph_pos
< g
->num_commits_in_base
)
969 commit_data
= g
->chunk_commit_data
+
970 GRAPH_DATA_WIDTH
* (graph_pos
- g
->num_commits_in_base
);
972 oidread(&oid
, commit_data
);
973 set_commit_tree(c
, lookup_tree(r
, &oid
));
975 return c
->maybe_tree
;
978 static struct tree
*get_commit_tree_in_graph_one(struct repository
*r
,
979 struct commit_graph
*g
,
980 const struct commit
*c
)
983 return c
->maybe_tree
;
984 if (commit_graph_position(c
) == COMMIT_NOT_FROM_GRAPH
)
985 BUG("get_commit_tree_in_graph_one called from non-commit-graph commit");
987 return load_tree_for_commit(r
, g
, (struct commit
*)c
);
990 struct tree
*get_commit_tree_in_graph(struct repository
*r
, const struct commit
*c
)
992 return get_commit_tree_in_graph_one(r
, r
->objects
->commit_graph
, c
);
995 struct packed_commit_list
{
996 struct commit
**list
;
1001 struct write_commit_graph_context
{
1002 struct repository
*r
;
1003 struct object_directory
*odb
;
1005 struct oid_array oids
;
1006 struct packed_commit_list commits
;
1007 int num_extra_edges
;
1008 int num_generation_data_overflows
;
1009 unsigned long approx_nr_objects
;
1010 struct progress
*progress
;
1012 uint64_t progress_cnt
;
1014 char *base_graph_name
;
1015 int num_commit_graphs_before
;
1016 int num_commit_graphs_after
;
1017 char **commit_graph_filenames_before
;
1018 char **commit_graph_filenames_after
;
1019 char **commit_graph_hash_after
;
1020 uint32_t new_num_commits_in_base
;
1021 struct commit_graph
*new_base_graph
;
1028 write_generation_data
:1,
1029 trust_generation_numbers
:1;
1031 struct topo_level_slab
*topo_levels
;
1032 const struct commit_graph_opts
*opts
;
1033 size_t total_bloom_filter_data_size
;
1034 const struct bloom_filter_settings
*bloom_settings
;
1036 int count_bloom_filter_computed
;
1037 int count_bloom_filter_not_computed
;
1038 int count_bloom_filter_trunc_empty
;
1039 int count_bloom_filter_trunc_large
;
1042 static int write_graph_chunk_fanout(struct hashfile
*f
,
1045 struct write_commit_graph_context
*ctx
= data
;
1047 struct commit
**list
= ctx
->commits
.list
;
1050 * Write the first-level table (the list is sorted,
1051 * but we use a 256-entry lookup to be able to avoid
1052 * having to do eight extra binary search iterations).
1054 for (i
= 0; i
< 256; i
++) {
1055 while (count
< ctx
->commits
.nr
) {
1056 if ((*list
)->object
.oid
.hash
[0] != i
)
1058 display_progress(ctx
->progress
, ++ctx
->progress_cnt
);
1063 hashwrite_be32(f
, count
);
1069 static int write_graph_chunk_oids(struct hashfile
*f
,
1072 struct write_commit_graph_context
*ctx
= data
;
1073 struct commit
**list
= ctx
->commits
.list
;
1075 for (count
= 0; count
< ctx
->commits
.nr
; count
++, list
++) {
1076 display_progress(ctx
->progress
, ++ctx
->progress_cnt
);
1077 hashwrite(f
, (*list
)->object
.oid
.hash
, the_hash_algo
->rawsz
);
1083 static const struct object_id
*commit_to_oid(size_t index
, const void *table
)
1085 const struct commit
* const *commits
= table
;
1086 return &commits
[index
]->object
.oid
;
1089 static int write_graph_chunk_data(struct hashfile
*f
,
1092 struct write_commit_graph_context
*ctx
= data
;
1093 struct commit
**list
= ctx
->commits
.list
;
1094 struct commit
**last
= ctx
->commits
.list
+ ctx
->commits
.nr
;
1095 uint32_t num_extra_edges
= 0;
1097 while (list
< last
) {
1098 struct commit_list
*parent
;
1099 struct object_id
*tree
;
1101 uint32_t packedDate
[2];
1102 display_progress(ctx
->progress
, ++ctx
->progress_cnt
);
1104 if (repo_parse_commit_no_graph(ctx
->r
, *list
))
1105 die(_("unable to parse commit %s"),
1106 oid_to_hex(&(*list
)->object
.oid
));
1107 tree
= get_commit_tree_oid(*list
);
1108 hashwrite(f
, tree
->hash
, the_hash_algo
->rawsz
);
1110 parent
= (*list
)->parents
;
1113 edge_value
= GRAPH_PARENT_NONE
;
1115 edge_value
= oid_pos(&parent
->item
->object
.oid
,
1120 if (edge_value
>= 0)
1121 edge_value
+= ctx
->new_num_commits_in_base
;
1122 else if (ctx
->new_base_graph
) {
1124 if (find_commit_pos_in_graph(parent
->item
,
1125 ctx
->new_base_graph
,
1131 BUG("missing parent %s for commit %s",
1132 oid_to_hex(&parent
->item
->object
.oid
),
1133 oid_to_hex(&(*list
)->object
.oid
));
1136 hashwrite_be32(f
, edge_value
);
1139 parent
= parent
->next
;
1142 edge_value
= GRAPH_PARENT_NONE
;
1143 else if (parent
->next
)
1144 edge_value
= GRAPH_EXTRA_EDGES_NEEDED
| num_extra_edges
;
1146 edge_value
= oid_pos(&parent
->item
->object
.oid
,
1151 if (edge_value
>= 0)
1152 edge_value
+= ctx
->new_num_commits_in_base
;
1153 else if (ctx
->new_base_graph
) {
1155 if (find_commit_pos_in_graph(parent
->item
,
1156 ctx
->new_base_graph
,
1162 BUG("missing parent %s for commit %s",
1163 oid_to_hex(&parent
->item
->object
.oid
),
1164 oid_to_hex(&(*list
)->object
.oid
));
1167 hashwrite_be32(f
, edge_value
);
1169 if (edge_value
& GRAPH_EXTRA_EDGES_NEEDED
) {
1172 parent
= parent
->next
;
1176 if (sizeof((*list
)->date
) > 4)
1177 packedDate
[0] = htonl(((*list
)->date
>> 32) & 0x3);
1181 packedDate
[0] |= htonl(*topo_level_slab_at(ctx
->topo_levels
, *list
) << 2);
1183 packedDate
[1] = htonl((*list
)->date
);
1184 hashwrite(f
, packedDate
, 8);
1192 static int write_graph_chunk_generation_data(struct hashfile
*f
,
1195 struct write_commit_graph_context
*ctx
= data
;
1196 int i
, num_generation_data_overflows
= 0;
1198 for (i
= 0; i
< ctx
->commits
.nr
; i
++) {
1199 struct commit
*c
= ctx
->commits
.list
[i
];
1201 repo_parse_commit(ctx
->r
, c
);
1202 offset
= commit_graph_data_at(c
)->generation
- c
->date
;
1203 display_progress(ctx
->progress
, ++ctx
->progress_cnt
);
1205 if (offset
> GENERATION_NUMBER_V2_OFFSET_MAX
) {
1206 offset
= CORRECTED_COMMIT_DATE_OFFSET_OVERFLOW
| num_generation_data_overflows
;
1207 num_generation_data_overflows
++;
1210 hashwrite_be32(f
, offset
);
1216 static int write_graph_chunk_generation_data_overflow(struct hashfile
*f
,
1219 struct write_commit_graph_context
*ctx
= data
;
1221 for (i
= 0; i
< ctx
->commits
.nr
; i
++) {
1222 struct commit
*c
= ctx
->commits
.list
[i
];
1223 timestamp_t offset
= commit_graph_data_at(c
)->generation
- c
->date
;
1224 display_progress(ctx
->progress
, ++ctx
->progress_cnt
);
1226 if (offset
> GENERATION_NUMBER_V2_OFFSET_MAX
) {
1227 hashwrite_be32(f
, offset
>> 32);
1228 hashwrite_be32(f
, (uint32_t) offset
);
1235 static int write_graph_chunk_extra_edges(struct hashfile
*f
,
1238 struct write_commit_graph_context
*ctx
= data
;
1239 struct commit
**list
= ctx
->commits
.list
;
1240 struct commit
**last
= ctx
->commits
.list
+ ctx
->commits
.nr
;
1241 struct commit_list
*parent
;
1243 while (list
< last
) {
1244 int num_parents
= 0;
1246 display_progress(ctx
->progress
, ++ctx
->progress_cnt
);
1248 for (parent
= (*list
)->parents
; num_parents
< 3 && parent
;
1249 parent
= parent
->next
)
1252 if (num_parents
<= 2) {
1257 /* Since num_parents > 2, this initializer is safe. */
1258 for (parent
= (*list
)->parents
->next
; parent
; parent
= parent
->next
) {
1259 int edge_value
= oid_pos(&parent
->item
->object
.oid
,
1264 if (edge_value
>= 0)
1265 edge_value
+= ctx
->new_num_commits_in_base
;
1266 else if (ctx
->new_base_graph
) {
1268 if (find_commit_pos_in_graph(parent
->item
,
1269 ctx
->new_base_graph
,
1275 BUG("missing parent %s for commit %s",
1276 oid_to_hex(&parent
->item
->object
.oid
),
1277 oid_to_hex(&(*list
)->object
.oid
));
1278 else if (!parent
->next
)
1279 edge_value
|= GRAPH_LAST_EDGE
;
1281 hashwrite_be32(f
, edge_value
);
1290 static int write_graph_chunk_bloom_indexes(struct hashfile
*f
,
1293 struct write_commit_graph_context
*ctx
= data
;
1294 struct commit
**list
= ctx
->commits
.list
;
1295 struct commit
**last
= ctx
->commits
.list
+ ctx
->commits
.nr
;
1296 uint32_t cur_pos
= 0;
1298 while (list
< last
) {
1299 struct bloom_filter
*filter
= get_bloom_filter(ctx
->r
, *list
);
1300 size_t len
= filter
? filter
->len
: 0;
1302 display_progress(ctx
->progress
, ++ctx
->progress_cnt
);
1303 hashwrite_be32(f
, cur_pos
);
1310 static void trace2_bloom_filter_settings(struct write_commit_graph_context
*ctx
)
1312 struct json_writer jw
= JSON_WRITER_INIT
;
1314 jw_object_begin(&jw
, 0);
1315 jw_object_intmax(&jw
, "hash_version", ctx
->bloom_settings
->hash_version
);
1316 jw_object_intmax(&jw
, "num_hashes", ctx
->bloom_settings
->num_hashes
);
1317 jw_object_intmax(&jw
, "bits_per_entry", ctx
->bloom_settings
->bits_per_entry
);
1318 jw_object_intmax(&jw
, "max_changed_paths", ctx
->bloom_settings
->max_changed_paths
);
1321 trace2_data_json("bloom", ctx
->r
, "settings", &jw
);
1326 static int write_graph_chunk_bloom_data(struct hashfile
*f
,
1329 struct write_commit_graph_context
*ctx
= data
;
1330 struct commit
**list
= ctx
->commits
.list
;
1331 struct commit
**last
= ctx
->commits
.list
+ ctx
->commits
.nr
;
1333 trace2_bloom_filter_settings(ctx
);
1335 hashwrite_be32(f
, ctx
->bloom_settings
->hash_version
);
1336 hashwrite_be32(f
, ctx
->bloom_settings
->num_hashes
);
1337 hashwrite_be32(f
, ctx
->bloom_settings
->bits_per_entry
);
1339 while (list
< last
) {
1340 struct bloom_filter
*filter
= get_bloom_filter(ctx
->r
, *list
);
1341 size_t len
= filter
? filter
->len
: 0;
1343 display_progress(ctx
->progress
, ++ctx
->progress_cnt
);
1345 hashwrite(f
, filter
->data
, len
* sizeof(unsigned char));
1352 static int add_packed_commits(const struct object_id
*oid
,
1353 struct packed_git
*pack
,
1357 struct write_commit_graph_context
*ctx
= (struct write_commit_graph_context
*)data
;
1358 enum object_type type
;
1359 off_t offset
= nth_packed_object_offset(pack
, pos
);
1360 struct object_info oi
= OBJECT_INFO_INIT
;
1363 display_progress(ctx
->progress
, ++ctx
->progress_done
);
1366 if (packed_object_info(ctx
->r
, pack
, offset
, &oi
) < 0)
1367 die(_("unable to get type of object %s"), oid_to_hex(oid
));
1369 if (type
!= OBJ_COMMIT
)
1372 oid_array_append(&ctx
->oids
, oid
);
1373 set_commit_pos(ctx
->r
, oid
);
1378 static void add_missing_parents(struct write_commit_graph_context
*ctx
, struct commit
*commit
)
1380 struct commit_list
*parent
;
1381 for (parent
= commit
->parents
; parent
; parent
= parent
->next
) {
1382 if (!(parent
->item
->object
.flags
& REACHABLE
)) {
1383 oid_array_append(&ctx
->oids
, &parent
->item
->object
.oid
);
1384 parent
->item
->object
.flags
|= REACHABLE
;
1389 static void close_reachable(struct write_commit_graph_context
*ctx
)
1392 struct commit
*commit
;
1393 enum commit_graph_split_flags flags
= ctx
->opts
?
1394 ctx
->opts
->split_flags
: COMMIT_GRAPH_SPLIT_UNSPECIFIED
;
1396 if (ctx
->report_progress
)
1397 ctx
->progress
= start_delayed_progress(
1398 _("Loading known commits in commit graph"),
1400 for (i
= 0; i
< ctx
->oids
.nr
; i
++) {
1401 display_progress(ctx
->progress
, i
+ 1);
1402 commit
= lookup_commit(ctx
->r
, &ctx
->oids
.oid
[i
]);
1404 commit
->object
.flags
|= REACHABLE
;
1406 stop_progress(&ctx
->progress
);
1409 * As this loop runs, ctx->oids.nr may grow, but not more
1410 * than the number of missing commits in the reachable
1413 if (ctx
->report_progress
)
1414 ctx
->progress
= start_delayed_progress(
1415 _("Expanding reachable commits in commit graph"),
1417 for (i
= 0; i
< ctx
->oids
.nr
; i
++) {
1418 display_progress(ctx
->progress
, i
+ 1);
1419 commit
= lookup_commit(ctx
->r
, &ctx
->oids
.oid
[i
]);
1424 if ((!repo_parse_commit(ctx
->r
, commit
) &&
1425 commit_graph_position(commit
) == COMMIT_NOT_FROM_GRAPH
) ||
1426 flags
== COMMIT_GRAPH_SPLIT_REPLACE
)
1427 add_missing_parents(ctx
, commit
);
1428 } else if (!repo_parse_commit_no_graph(ctx
->r
, commit
))
1429 add_missing_parents(ctx
, commit
);
1431 stop_progress(&ctx
->progress
);
1433 if (ctx
->report_progress
)
1434 ctx
->progress
= start_delayed_progress(
1435 _("Clearing commit marks in commit graph"),
1437 for (i
= 0; i
< ctx
->oids
.nr
; i
++) {
1438 display_progress(ctx
->progress
, i
+ 1);
1439 commit
= lookup_commit(ctx
->r
, &ctx
->oids
.oid
[i
]);
1442 commit
->object
.flags
&= ~REACHABLE
;
1444 stop_progress(&ctx
->progress
);
1447 static void compute_topological_levels(struct write_commit_graph_context
*ctx
)
1450 struct commit_list
*list
= NULL
;
1452 if (ctx
->report_progress
)
1453 ctx
->progress
= start_delayed_progress(
1454 _("Computing commit graph topological levels"),
1456 for (i
= 0; i
< ctx
->commits
.nr
; i
++) {
1457 struct commit
*c
= ctx
->commits
.list
[i
];
1460 repo_parse_commit(ctx
->r
, c
);
1461 level
= *topo_level_slab_at(ctx
->topo_levels
, c
);
1463 display_progress(ctx
->progress
, i
+ 1);
1464 if (level
!= GENERATION_NUMBER_ZERO
)
1467 commit_list_insert(c
, &list
);
1469 struct commit
*current
= list
->item
;
1470 struct commit_list
*parent
;
1471 int all_parents_computed
= 1;
1472 uint32_t max_level
= 0;
1474 for (parent
= current
->parents
; parent
; parent
= parent
->next
) {
1475 repo_parse_commit(ctx
->r
, parent
->item
);
1476 level
= *topo_level_slab_at(ctx
->topo_levels
, parent
->item
);
1478 if (level
== GENERATION_NUMBER_ZERO
) {
1479 all_parents_computed
= 0;
1480 commit_list_insert(parent
->item
, &list
);
1484 if (level
> max_level
)
1488 if (all_parents_computed
) {
1491 if (max_level
> GENERATION_NUMBER_V1_MAX
- 1)
1492 max_level
= GENERATION_NUMBER_V1_MAX
- 1;
1493 *topo_level_slab_at(ctx
->topo_levels
, current
) = max_level
+ 1;
1497 stop_progress(&ctx
->progress
);
1500 static void compute_generation_numbers(struct write_commit_graph_context
*ctx
)
1503 struct commit_list
*list
= NULL
;
1505 if (ctx
->report_progress
)
1506 ctx
->progress
= start_delayed_progress(
1507 _("Computing commit graph generation numbers"),
1510 if (!ctx
->trust_generation_numbers
) {
1511 for (i
= 0; i
< ctx
->commits
.nr
; i
++) {
1512 struct commit
*c
= ctx
->commits
.list
[i
];
1513 repo_parse_commit(ctx
->r
, c
);
1514 commit_graph_data_at(c
)->generation
= GENERATION_NUMBER_ZERO
;
1518 for (i
= 0; i
< ctx
->commits
.nr
; i
++) {
1519 struct commit
*c
= ctx
->commits
.list
[i
];
1520 timestamp_t corrected_commit_date
;
1522 repo_parse_commit(ctx
->r
, c
);
1523 corrected_commit_date
= commit_graph_data_at(c
)->generation
;
1525 display_progress(ctx
->progress
, i
+ 1);
1526 if (corrected_commit_date
!= GENERATION_NUMBER_ZERO
)
1529 commit_list_insert(c
, &list
);
1531 struct commit
*current
= list
->item
;
1532 struct commit_list
*parent
;
1533 int all_parents_computed
= 1;
1534 timestamp_t max_corrected_commit_date
= 0;
1536 for (parent
= current
->parents
; parent
; parent
= parent
->next
) {
1537 repo_parse_commit(ctx
->r
, parent
->item
);
1538 corrected_commit_date
= commit_graph_data_at(parent
->item
)->generation
;
1540 if (corrected_commit_date
== GENERATION_NUMBER_ZERO
) {
1541 all_parents_computed
= 0;
1542 commit_list_insert(parent
->item
, &list
);
1546 if (corrected_commit_date
> max_corrected_commit_date
)
1547 max_corrected_commit_date
= corrected_commit_date
;
1550 if (all_parents_computed
) {
1553 if (current
->date
&& current
->date
> max_corrected_commit_date
)
1554 max_corrected_commit_date
= current
->date
- 1;
1555 commit_graph_data_at(current
)->generation
= max_corrected_commit_date
+ 1;
1557 if (commit_graph_data_at(current
)->generation
- current
->date
> GENERATION_NUMBER_V2_OFFSET_MAX
)
1558 ctx
->num_generation_data_overflows
++;
1562 stop_progress(&ctx
->progress
);
1565 static void trace2_bloom_filter_write_statistics(struct write_commit_graph_context
*ctx
)
1567 trace2_data_intmax("commit-graph", ctx
->r
, "filter-computed",
1568 ctx
->count_bloom_filter_computed
);
1569 trace2_data_intmax("commit-graph", ctx
->r
, "filter-not-computed",
1570 ctx
->count_bloom_filter_not_computed
);
1571 trace2_data_intmax("commit-graph", ctx
->r
, "filter-trunc-empty",
1572 ctx
->count_bloom_filter_trunc_empty
);
1573 trace2_data_intmax("commit-graph", ctx
->r
, "filter-trunc-large",
1574 ctx
->count_bloom_filter_trunc_large
);
1577 static void compute_bloom_filters(struct write_commit_graph_context
*ctx
)
1580 struct progress
*progress
= NULL
;
1581 struct commit
**sorted_commits
;
1582 int max_new_filters
;
1584 init_bloom_filters();
1586 if (ctx
->report_progress
)
1587 progress
= start_delayed_progress(
1588 _("Computing commit changed paths Bloom filters"),
1591 ALLOC_ARRAY(sorted_commits
, ctx
->commits
.nr
);
1592 COPY_ARRAY(sorted_commits
, ctx
->commits
.list
, ctx
->commits
.nr
);
1594 if (ctx
->order_by_pack
)
1595 QSORT(sorted_commits
, ctx
->commits
.nr
, commit_pos_cmp
);
1597 QSORT(sorted_commits
, ctx
->commits
.nr
, commit_gen_cmp
);
1599 max_new_filters
= ctx
->opts
&& ctx
->opts
->max_new_filters
>= 0 ?
1600 ctx
->opts
->max_new_filters
: ctx
->commits
.nr
;
1602 for (i
= 0; i
< ctx
->commits
.nr
; i
++) {
1603 enum bloom_filter_computed computed
= 0;
1604 struct commit
*c
= sorted_commits
[i
];
1605 struct bloom_filter
*filter
= get_or_compute_bloom_filter(
1608 ctx
->count_bloom_filter_computed
< max_new_filters
,
1609 ctx
->bloom_settings
,
1611 if (computed
& BLOOM_COMPUTED
) {
1612 ctx
->count_bloom_filter_computed
++;
1613 if (computed
& BLOOM_TRUNC_EMPTY
)
1614 ctx
->count_bloom_filter_trunc_empty
++;
1615 if (computed
& BLOOM_TRUNC_LARGE
)
1616 ctx
->count_bloom_filter_trunc_large
++;
1617 } else if (computed
& BLOOM_NOT_COMPUTED
)
1618 ctx
->count_bloom_filter_not_computed
++;
1619 ctx
->total_bloom_filter_data_size
+= filter
1620 ? sizeof(unsigned char) * filter
->len
: 0;
1621 display_progress(progress
, i
+ 1);
1624 if (trace2_is_enabled())
1625 trace2_bloom_filter_write_statistics(ctx
);
1627 free(sorted_commits
);
1628 stop_progress(&progress
);
1631 struct refs_cb_data
{
1632 struct oidset
*commits
;
1633 struct progress
*progress
;
1636 static int add_ref_to_set(const char *refname
,
1637 const struct object_id
*oid
,
1638 int flags
, void *cb_data
)
1640 struct object_id peeled
;
1641 struct refs_cb_data
*data
= (struct refs_cb_data
*)cb_data
;
1643 if (!peel_iterated_oid(oid
, &peeled
))
1645 if (oid_object_info(the_repository
, oid
, NULL
) == OBJ_COMMIT
)
1646 oidset_insert(data
->commits
, oid
);
1648 display_progress(data
->progress
, oidset_size(data
->commits
));
1653 int write_commit_graph_reachable(struct object_directory
*odb
,
1654 enum commit_graph_write_flags flags
,
1655 const struct commit_graph_opts
*opts
)
1657 struct oidset commits
= OIDSET_INIT
;
1658 struct refs_cb_data data
;
1661 memset(&data
, 0, sizeof(data
));
1662 data
.commits
= &commits
;
1663 if (flags
& COMMIT_GRAPH_WRITE_PROGRESS
)
1664 data
.progress
= start_delayed_progress(
1665 _("Collecting referenced commits"), 0);
1667 for_each_ref(add_ref_to_set
, &data
);
1669 stop_progress(&data
.progress
);
1671 result
= write_commit_graph(odb
, NULL
, &commits
,
1674 oidset_clear(&commits
);
1678 static int fill_oids_from_packs(struct write_commit_graph_context
*ctx
,
1679 struct string_list
*pack_indexes
)
1682 struct strbuf progress_title
= STRBUF_INIT
;
1683 struct strbuf packname
= STRBUF_INIT
;
1686 strbuf_addf(&packname
, "%s/pack/", ctx
->odb
->path
);
1687 dirlen
= packname
.len
;
1688 if (ctx
->report_progress
) {
1689 strbuf_addf(&progress_title
,
1690 Q_("Finding commits for commit graph in %d pack",
1691 "Finding commits for commit graph in %d packs",
1694 ctx
->progress
= start_delayed_progress(progress_title
.buf
, 0);
1695 ctx
->progress_done
= 0;
1697 for (i
= 0; i
< pack_indexes
->nr
; i
++) {
1698 struct packed_git
*p
;
1699 strbuf_setlen(&packname
, dirlen
);
1700 strbuf_addstr(&packname
, pack_indexes
->items
[i
].string
);
1701 p
= add_packed_git(packname
.buf
, packname
.len
, 1);
1703 error(_("error adding pack %s"), packname
.buf
);
1706 if (open_pack_index(p
)) {
1707 error(_("error opening index for %s"), packname
.buf
);
1710 for_each_object_in_pack(p
, add_packed_commits
, ctx
,
1711 FOR_EACH_OBJECT_PACK_ORDER
);
1716 stop_progress(&ctx
->progress
);
1717 strbuf_release(&progress_title
);
1718 strbuf_release(&packname
);
1723 static int fill_oids_from_commits(struct write_commit_graph_context
*ctx
,
1724 struct oidset
*commits
)
1726 struct oidset_iter iter
;
1727 struct object_id
*oid
;
1729 if (!oidset_size(commits
))
1732 oidset_iter_init(commits
, &iter
);
1733 while ((oid
= oidset_iter_next(&iter
))) {
1734 oid_array_append(&ctx
->oids
, oid
);
1740 static void fill_oids_from_all_packs(struct write_commit_graph_context
*ctx
)
1742 if (ctx
->report_progress
)
1743 ctx
->progress
= start_delayed_progress(
1744 _("Finding commits for commit graph among packed objects"),
1745 ctx
->approx_nr_objects
);
1746 for_each_packed_object(add_packed_commits
, ctx
,
1747 FOR_EACH_OBJECT_PACK_ORDER
);
1748 if (ctx
->progress_done
< ctx
->approx_nr_objects
)
1749 display_progress(ctx
->progress
, ctx
->approx_nr_objects
);
1750 stop_progress(&ctx
->progress
);
1753 static void copy_oids_to_commits(struct write_commit_graph_context
*ctx
)
1756 enum commit_graph_split_flags flags
= ctx
->opts
?
1757 ctx
->opts
->split_flags
: COMMIT_GRAPH_SPLIT_UNSPECIFIED
;
1759 ctx
->num_extra_edges
= 0;
1760 if (ctx
->report_progress
)
1761 ctx
->progress
= start_delayed_progress(
1762 _("Finding extra edges in commit graph"),
1764 oid_array_sort(&ctx
->oids
);
1765 for (i
= 0; i
< ctx
->oids
.nr
; i
= oid_array_next_unique(&ctx
->oids
, i
)) {
1766 unsigned int num_parents
;
1768 display_progress(ctx
->progress
, i
+ 1);
1770 ALLOC_GROW(ctx
->commits
.list
, ctx
->commits
.nr
+ 1, ctx
->commits
.alloc
);
1771 ctx
->commits
.list
[ctx
->commits
.nr
] = lookup_commit(ctx
->r
, &ctx
->oids
.oid
[i
]);
1773 if (ctx
->split
&& flags
!= COMMIT_GRAPH_SPLIT_REPLACE
&&
1774 commit_graph_position(ctx
->commits
.list
[ctx
->commits
.nr
]) != COMMIT_NOT_FROM_GRAPH
)
1777 if (ctx
->split
&& flags
== COMMIT_GRAPH_SPLIT_REPLACE
)
1778 repo_parse_commit(ctx
->r
, ctx
->commits
.list
[ctx
->commits
.nr
]);
1780 repo_parse_commit_no_graph(ctx
->r
, ctx
->commits
.list
[ctx
->commits
.nr
]);
1782 num_parents
= commit_list_count(ctx
->commits
.list
[ctx
->commits
.nr
]->parents
);
1783 if (num_parents
> 2)
1784 ctx
->num_extra_edges
+= num_parents
- 1;
1788 stop_progress(&ctx
->progress
);
1791 static int write_graph_chunk_base_1(struct hashfile
*f
,
1792 struct commit_graph
*g
)
1799 num
= write_graph_chunk_base_1(f
, g
->base_graph
);
1800 hashwrite(f
, g
->oid
.hash
, the_hash_algo
->rawsz
);
1804 static int write_graph_chunk_base(struct hashfile
*f
,
1807 struct write_commit_graph_context
*ctx
= data
;
1808 int num
= write_graph_chunk_base_1(f
, ctx
->new_base_graph
);
1810 if (num
!= ctx
->num_commit_graphs_after
- 1) {
1811 error(_("failed to write correct number of base graph ids"));
1818 static int write_commit_graph_file(struct write_commit_graph_context
*ctx
)
1823 struct lock_file lk
= LOCK_INIT
;
1824 const unsigned hashsz
= the_hash_algo
->rawsz
;
1825 struct strbuf progress_title
= STRBUF_INIT
;
1826 struct chunkfile
*cf
;
1827 unsigned char file_hash
[GIT_MAX_RAWSZ
];
1830 struct strbuf tmp_file
= STRBUF_INIT
;
1832 strbuf_addf(&tmp_file
,
1833 "%s/info/commit-graphs/tmp_graph_XXXXXX",
1835 ctx
->graph_name
= strbuf_detach(&tmp_file
, NULL
);
1837 ctx
->graph_name
= get_commit_graph_filename(ctx
->odb
);
1840 if (safe_create_leading_directories(ctx
->graph_name
)) {
1841 UNLEAK(ctx
->graph_name
);
1842 error(_("unable to create leading directories of %s"),
1848 char *lock_name
= get_commit_graph_chain_filename(ctx
->odb
);
1850 hold_lock_file_for_update_mode(&lk
, lock_name
,
1851 LOCK_DIE_ON_ERROR
, 0444);
1853 fd
= git_mkstemp_mode(ctx
->graph_name
, 0444);
1855 error(_("unable to create temporary graph layer"));
1859 if (adjust_shared_perm(ctx
->graph_name
)) {
1860 error(_("unable to adjust shared permissions for '%s'"),
1865 f
= hashfd(fd
, ctx
->graph_name
);
1867 hold_lock_file_for_update_mode(&lk
, ctx
->graph_name
,
1868 LOCK_DIE_ON_ERROR
, 0444);
1869 fd
= get_lock_file_fd(&lk
);
1870 f
= hashfd(fd
, get_lock_file_path(&lk
));
1873 cf
= init_chunkfile(f
);
1875 add_chunk(cf
, GRAPH_CHUNKID_OIDFANOUT
, GRAPH_FANOUT_SIZE
,
1876 write_graph_chunk_fanout
);
1877 add_chunk(cf
, GRAPH_CHUNKID_OIDLOOKUP
, hashsz
* ctx
->commits
.nr
,
1878 write_graph_chunk_oids
);
1879 add_chunk(cf
, GRAPH_CHUNKID_DATA
, (hashsz
+ 16) * ctx
->commits
.nr
,
1880 write_graph_chunk_data
);
1882 if (ctx
->write_generation_data
)
1883 add_chunk(cf
, GRAPH_CHUNKID_GENERATION_DATA
,
1884 sizeof(uint32_t) * ctx
->commits
.nr
,
1885 write_graph_chunk_generation_data
);
1886 if (ctx
->num_generation_data_overflows
)
1887 add_chunk(cf
, GRAPH_CHUNKID_GENERATION_DATA_OVERFLOW
,
1888 sizeof(timestamp_t
) * ctx
->num_generation_data_overflows
,
1889 write_graph_chunk_generation_data_overflow
);
1890 if (ctx
->num_extra_edges
)
1891 add_chunk(cf
, GRAPH_CHUNKID_EXTRAEDGES
,
1892 4 * ctx
->num_extra_edges
,
1893 write_graph_chunk_extra_edges
);
1894 if (ctx
->changed_paths
) {
1895 add_chunk(cf
, GRAPH_CHUNKID_BLOOMINDEXES
,
1896 sizeof(uint32_t) * ctx
->commits
.nr
,
1897 write_graph_chunk_bloom_indexes
);
1898 add_chunk(cf
, GRAPH_CHUNKID_BLOOMDATA
,
1899 sizeof(uint32_t) * 3
1900 + ctx
->total_bloom_filter_data_size
,
1901 write_graph_chunk_bloom_data
);
1903 if (ctx
->num_commit_graphs_after
> 1)
1904 add_chunk(cf
, GRAPH_CHUNKID_BASE
,
1905 hashsz
* (ctx
->num_commit_graphs_after
- 1),
1906 write_graph_chunk_base
);
1908 hashwrite_be32(f
, GRAPH_SIGNATURE
);
1910 hashwrite_u8(f
, GRAPH_VERSION
);
1911 hashwrite_u8(f
, oid_version());
1912 hashwrite_u8(f
, get_num_chunks(cf
));
1913 hashwrite_u8(f
, ctx
->num_commit_graphs_after
- 1);
1915 if (ctx
->report_progress
) {
1916 strbuf_addf(&progress_title
,
1917 Q_("Writing out commit graph in %d pass",
1918 "Writing out commit graph in %d passes",
1919 get_num_chunks(cf
)),
1920 get_num_chunks(cf
));
1921 ctx
->progress
= start_delayed_progress(
1923 get_num_chunks(cf
) * ctx
->commits
.nr
);
1926 write_chunkfile(cf
, ctx
);
1928 stop_progress(&ctx
->progress
);
1929 strbuf_release(&progress_title
);
1931 if (ctx
->split
&& ctx
->base_graph_name
&& ctx
->num_commit_graphs_after
> 1) {
1932 char *new_base_hash
= xstrdup(oid_to_hex(&ctx
->new_base_graph
->oid
));
1933 char *new_base_name
= get_split_graph_filename(ctx
->new_base_graph
->odb
, new_base_hash
);
1935 free(ctx
->commit_graph_filenames_after
[ctx
->num_commit_graphs_after
- 2]);
1936 free(ctx
->commit_graph_hash_after
[ctx
->num_commit_graphs_after
- 2]);
1937 ctx
->commit_graph_filenames_after
[ctx
->num_commit_graphs_after
- 2] = new_base_name
;
1938 ctx
->commit_graph_hash_after
[ctx
->num_commit_graphs_after
- 2] = new_base_hash
;
1941 close_commit_graph(ctx
->r
->objects
);
1942 finalize_hashfile(f
, file_hash
, CSUM_HASH_IN_STREAM
| CSUM_FSYNC
);
1946 FILE *chainf
= fdopen_lock_file(&lk
, "w");
1947 char *final_graph_name
;
1953 error(_("unable to open commit-graph chain file"));
1957 if (ctx
->base_graph_name
) {
1959 int idx
= ctx
->num_commit_graphs_after
- 1;
1960 if (ctx
->num_commit_graphs_after
> 1)
1963 dest
= ctx
->commit_graph_filenames_after
[idx
];
1965 if (strcmp(ctx
->base_graph_name
, dest
)) {
1966 result
= rename(ctx
->base_graph_name
, dest
);
1969 error(_("failed to rename base commit-graph file"));
1974 char *graph_name
= get_commit_graph_filename(ctx
->odb
);
1978 ctx
->commit_graph_hash_after
[ctx
->num_commit_graphs_after
- 1] = xstrdup(hash_to_hex(file_hash
));
1979 final_graph_name
= get_split_graph_filename(ctx
->odb
,
1980 ctx
->commit_graph_hash_after
[ctx
->num_commit_graphs_after
- 1]);
1981 ctx
->commit_graph_filenames_after
[ctx
->num_commit_graphs_after
- 1] = final_graph_name
;
1983 result
= rename(ctx
->graph_name
, final_graph_name
);
1985 for (i
= 0; i
< ctx
->num_commit_graphs_after
; i
++)
1986 fprintf(get_lock_file_fp(&lk
), "%s\n", ctx
->commit_graph_hash_after
[i
]);
1989 error(_("failed to rename temporary commit-graph file"));
1994 commit_lock_file(&lk
);
1999 static void split_graph_merge_strategy(struct write_commit_graph_context
*ctx
)
2001 struct commit_graph
*g
;
2002 uint32_t num_commits
;
2003 enum commit_graph_split_flags flags
= COMMIT_GRAPH_SPLIT_UNSPECIFIED
;
2006 int max_commits
= 0;
2010 max_commits
= ctx
->opts
->max_commits
;
2012 if (ctx
->opts
->size_multiple
)
2013 size_mult
= ctx
->opts
->size_multiple
;
2015 flags
= ctx
->opts
->split_flags
;
2018 g
= ctx
->r
->objects
->commit_graph
;
2019 num_commits
= ctx
->commits
.nr
;
2020 if (flags
== COMMIT_GRAPH_SPLIT_REPLACE
)
2021 ctx
->num_commit_graphs_after
= 1;
2023 ctx
->num_commit_graphs_after
= ctx
->num_commit_graphs_before
+ 1;
2025 if (flags
!= COMMIT_GRAPH_SPLIT_MERGE_PROHIBITED
&&
2026 flags
!= COMMIT_GRAPH_SPLIT_REPLACE
) {
2027 while (g
&& (g
->num_commits
<= size_mult
* num_commits
||
2028 (max_commits
&& num_commits
> max_commits
))) {
2029 if (g
->odb
!= ctx
->odb
)
2032 num_commits
+= g
->num_commits
;
2035 ctx
->num_commit_graphs_after
--;
2039 if (flags
!= COMMIT_GRAPH_SPLIT_REPLACE
)
2040 ctx
->new_base_graph
= g
;
2041 else if (ctx
->num_commit_graphs_after
!= 1)
2042 BUG("split_graph_merge_strategy: num_commit_graphs_after "
2043 "should be 1 with --split=replace");
2045 if (ctx
->num_commit_graphs_after
== 2) {
2046 char *old_graph_name
= get_commit_graph_filename(g
->odb
);
2048 if (!strcmp(g
->filename
, old_graph_name
) &&
2049 g
->odb
!= ctx
->odb
) {
2050 ctx
->num_commit_graphs_after
= 1;
2051 ctx
->new_base_graph
= NULL
;
2054 free(old_graph_name
);
2057 CALLOC_ARRAY(ctx
->commit_graph_filenames_after
, ctx
->num_commit_graphs_after
);
2058 CALLOC_ARRAY(ctx
->commit_graph_hash_after
, ctx
->num_commit_graphs_after
);
2060 for (i
= 0; i
< ctx
->num_commit_graphs_after
&&
2061 i
< ctx
->num_commit_graphs_before
; i
++)
2062 ctx
->commit_graph_filenames_after
[i
] = xstrdup(ctx
->commit_graph_filenames_before
[i
]);
2064 i
= ctx
->num_commit_graphs_before
- 1;
2065 g
= ctx
->r
->objects
->commit_graph
;
2068 if (i
< ctx
->num_commit_graphs_after
)
2069 ctx
->commit_graph_hash_after
[i
] = xstrdup(oid_to_hex(&g
->oid
));
2072 * If the topmost remaining layer has generation data chunk, the
2073 * resultant layer also has generation data chunk.
2075 if (i
== ctx
->num_commit_graphs_after
- 2)
2076 ctx
->write_generation_data
= !!g
->chunk_generation_data
;
2083 static void merge_commit_graph(struct write_commit_graph_context
*ctx
,
2084 struct commit_graph
*g
)
2087 uint32_t offset
= g
->num_commits_in_base
;
2089 ALLOC_GROW(ctx
->commits
.list
, ctx
->commits
.nr
+ g
->num_commits
, ctx
->commits
.alloc
);
2091 for (i
= 0; i
< g
->num_commits
; i
++) {
2092 struct object_id oid
;
2093 struct commit
*result
;
2095 display_progress(ctx
->progress
, i
+ 1);
2097 load_oid_from_graph(g
, i
+ offset
, &oid
);
2099 /* only add commits if they still exist in the repo */
2100 result
= lookup_commit_reference_gently(ctx
->r
, &oid
, 1);
2103 ctx
->commits
.list
[ctx
->commits
.nr
] = result
;
2109 static int commit_compare(const void *_a
, const void *_b
)
2111 const struct commit
*a
= *(const struct commit
**)_a
;
2112 const struct commit
*b
= *(const struct commit
**)_b
;
2113 return oidcmp(&a
->object
.oid
, &b
->object
.oid
);
2116 static void sort_and_scan_merged_commits(struct write_commit_graph_context
*ctx
)
2118 uint32_t i
, dedup_i
= 0;
2120 if (ctx
->report_progress
)
2121 ctx
->progress
= start_delayed_progress(
2122 _("Scanning merged commits"),
2125 QSORT(ctx
->commits
.list
, ctx
->commits
.nr
, commit_compare
);
2127 ctx
->num_extra_edges
= 0;
2128 for (i
= 0; i
< ctx
->commits
.nr
; i
++) {
2129 display_progress(ctx
->progress
, i
+ 1);
2131 if (i
&& oideq(&ctx
->commits
.list
[i
- 1]->object
.oid
,
2132 &ctx
->commits
.list
[i
]->object
.oid
)) {
2134 * Silently ignore duplicates. These were likely
2135 * created due to a commit appearing in multiple
2136 * layers of the chain, which is unexpected but
2137 * not invalid. We should make sure there is a
2138 * unique copy in the new layer.
2141 unsigned int num_parents
;
2143 ctx
->commits
.list
[dedup_i
] = ctx
->commits
.list
[i
];
2146 num_parents
= commit_list_count(ctx
->commits
.list
[i
]->parents
);
2147 if (num_parents
> 2)
2148 ctx
->num_extra_edges
+= num_parents
- 1;
2152 ctx
->commits
.nr
= dedup_i
;
2154 stop_progress(&ctx
->progress
);
2157 static void merge_commit_graphs(struct write_commit_graph_context
*ctx
)
2159 struct commit_graph
*g
= ctx
->r
->objects
->commit_graph
;
2160 uint32_t current_graph_number
= ctx
->num_commit_graphs_before
;
2162 while (g
&& current_graph_number
>= ctx
->num_commit_graphs_after
) {
2163 current_graph_number
--;
2165 if (ctx
->report_progress
)
2166 ctx
->progress
= start_delayed_progress(_("Merging commit-graph"), 0);
2168 merge_commit_graph(ctx
, g
);
2169 stop_progress(&ctx
->progress
);
2175 ctx
->new_base_graph
= g
;
2176 ctx
->new_num_commits_in_base
= g
->num_commits
+ g
->num_commits_in_base
;
2179 if (ctx
->new_base_graph
)
2180 ctx
->base_graph_name
= xstrdup(ctx
->new_base_graph
->filename
);
2182 sort_and_scan_merged_commits(ctx
);
2185 static void mark_commit_graphs(struct write_commit_graph_context
*ctx
)
2188 time_t now
= time(NULL
);
2190 for (i
= ctx
->num_commit_graphs_after
- 1; i
< ctx
->num_commit_graphs_before
; i
++) {
2192 struct utimbuf updated_time
;
2194 stat(ctx
->commit_graph_filenames_before
[i
], &st
);
2196 updated_time
.actime
= st
.st_atime
;
2197 updated_time
.modtime
= now
;
2198 utime(ctx
->commit_graph_filenames_before
[i
], &updated_time
);
2202 static void expire_commit_graphs(struct write_commit_graph_context
*ctx
)
2204 struct strbuf path
= STRBUF_INIT
;
2208 timestamp_t expire_time
= time(NULL
);
2210 if (ctx
->opts
&& ctx
->opts
->expire_time
)
2211 expire_time
= ctx
->opts
->expire_time
;
2213 char *chain_file_name
= get_commit_graph_chain_filename(ctx
->odb
);
2214 unlink(chain_file_name
);
2215 free(chain_file_name
);
2216 ctx
->num_commit_graphs_after
= 0;
2219 strbuf_addstr(&path
, ctx
->odb
->path
);
2220 strbuf_addstr(&path
, "/info/commit-graphs");
2221 dir
= opendir(path
.buf
);
2226 strbuf_addch(&path
, '/');
2227 dirnamelen
= path
.len
;
2228 while ((de
= readdir(dir
)) != NULL
) {
2230 uint32_t i
, found
= 0;
2232 strbuf_setlen(&path
, dirnamelen
);
2233 strbuf_addstr(&path
, de
->d_name
);
2235 stat(path
.buf
, &st
);
2237 if (st
.st_mtime
> expire_time
)
2239 if (path
.len
< 6 || strcmp(path
.buf
+ path
.len
- 6, ".graph"))
2242 for (i
= 0; i
< ctx
->num_commit_graphs_after
; i
++) {
2243 if (!strcmp(ctx
->commit_graph_filenames_after
[i
],
2255 strbuf_release(&path
);
2258 int write_commit_graph(struct object_directory
*odb
,
2259 struct string_list
*pack_indexes
,
2260 struct oidset
*commits
,
2261 enum commit_graph_write_flags flags
,
2262 const struct commit_graph_opts
*opts
)
2264 struct repository
*r
= the_repository
;
2265 struct write_commit_graph_context
*ctx
;
2269 struct bloom_filter_settings bloom_settings
= DEFAULT_BLOOM_FILTER_SETTINGS
;
2270 struct topo_level_slab topo_levels
;
2272 prepare_repo_settings(r
);
2273 if (!r
->settings
.core_commit_graph
) {
2274 warning(_("attempting to write a commit-graph, but 'core.commitGraph' is disabled"));
2277 if (!commit_graph_compatible(r
))
2280 CALLOC_ARRAY(ctx
, 1);
2283 ctx
->append
= flags
& COMMIT_GRAPH_WRITE_APPEND
? 1 : 0;
2284 ctx
->report_progress
= flags
& COMMIT_GRAPH_WRITE_PROGRESS
? 1 : 0;
2285 ctx
->split
= flags
& COMMIT_GRAPH_WRITE_SPLIT
? 1 : 0;
2287 ctx
->total_bloom_filter_data_size
= 0;
2288 ctx
->write_generation_data
= (get_configured_generation_version(r
) == 2);
2289 ctx
->num_generation_data_overflows
= 0;
2291 bloom_settings
.bits_per_entry
= git_env_ulong("GIT_TEST_BLOOM_SETTINGS_BITS_PER_ENTRY",
2292 bloom_settings
.bits_per_entry
);
2293 bloom_settings
.num_hashes
= git_env_ulong("GIT_TEST_BLOOM_SETTINGS_NUM_HASHES",
2294 bloom_settings
.num_hashes
);
2295 bloom_settings
.max_changed_paths
= git_env_ulong("GIT_TEST_BLOOM_SETTINGS_MAX_CHANGED_PATHS",
2296 bloom_settings
.max_changed_paths
);
2297 ctx
->bloom_settings
= &bloom_settings
;
2299 init_topo_level_slab(&topo_levels
);
2300 ctx
->topo_levels
= &topo_levels
;
2302 prepare_commit_graph(ctx
->r
);
2303 if (ctx
->r
->objects
->commit_graph
) {
2304 struct commit_graph
*g
= ctx
->r
->objects
->commit_graph
;
2307 g
->topo_levels
= &topo_levels
;
2312 if (flags
& COMMIT_GRAPH_WRITE_BLOOM_FILTERS
)
2313 ctx
->changed_paths
= 1;
2314 if (!(flags
& COMMIT_GRAPH_NO_WRITE_BLOOM_FILTERS
)) {
2315 struct commit_graph
*g
;
2317 g
= ctx
->r
->objects
->commit_graph
;
2319 /* We have changed-paths already. Keep them in the next graph */
2320 if (g
&& g
->chunk_bloom_data
) {
2321 ctx
->changed_paths
= 1;
2322 ctx
->bloom_settings
= g
->bloom_filter_settings
;
2327 struct commit_graph
*g
= ctx
->r
->objects
->commit_graph
;
2330 ctx
->num_commit_graphs_before
++;
2334 if (ctx
->num_commit_graphs_before
) {
2335 ALLOC_ARRAY(ctx
->commit_graph_filenames_before
, ctx
->num_commit_graphs_before
);
2336 i
= ctx
->num_commit_graphs_before
;
2337 g
= ctx
->r
->objects
->commit_graph
;
2340 ctx
->commit_graph_filenames_before
[--i
] = xstrdup(g
->filename
);
2346 replace
= ctx
->opts
->split_flags
& COMMIT_GRAPH_SPLIT_REPLACE
;
2349 ctx
->approx_nr_objects
= approximate_object_count();
2351 if (ctx
->append
&& ctx
->r
->objects
->commit_graph
) {
2352 struct commit_graph
*g
= ctx
->r
->objects
->commit_graph
;
2353 for (i
= 0; i
< g
->num_commits
; i
++) {
2354 struct object_id oid
;
2355 oidread(&oid
, g
->chunk_oid_lookup
+ g
->hash_len
* i
);
2356 oid_array_append(&ctx
->oids
, &oid
);
2361 ctx
->order_by_pack
= 1;
2362 if ((res
= fill_oids_from_packs(ctx
, pack_indexes
)))
2367 if ((res
= fill_oids_from_commits(ctx
, commits
)))
2371 if (!pack_indexes
&& !commits
) {
2372 ctx
->order_by_pack
= 1;
2373 fill_oids_from_all_packs(ctx
);
2376 close_reachable(ctx
);
2378 copy_oids_to_commits(ctx
);
2380 if (ctx
->commits
.nr
>= GRAPH_EDGE_LAST_MASK
) {
2381 error(_("too many commits to write graph"));
2386 if (!ctx
->commits
.nr
&& !replace
)
2390 split_graph_merge_strategy(ctx
);
2393 merge_commit_graphs(ctx
);
2395 ctx
->num_commit_graphs_after
= 1;
2397 ctx
->trust_generation_numbers
= validate_mixed_generation_chain(ctx
->r
->objects
->commit_graph
);
2399 compute_topological_levels(ctx
);
2400 if (ctx
->write_generation_data
)
2401 compute_generation_numbers(ctx
);
2403 if (ctx
->changed_paths
)
2404 compute_bloom_filters(ctx
);
2406 res
= write_commit_graph_file(ctx
);
2409 mark_commit_graphs(ctx
);
2411 expire_commit_graphs(ctx
);
2414 free(ctx
->graph_name
);
2415 free(ctx
->commits
.list
);
2416 oid_array_clear(&ctx
->oids
);
2417 clear_topo_level_slab(&topo_levels
);
2419 if (ctx
->commit_graph_filenames_after
) {
2420 for (i
= 0; i
< ctx
->num_commit_graphs_after
; i
++) {
2421 free(ctx
->commit_graph_filenames_after
[i
]);
2422 free(ctx
->commit_graph_hash_after
[i
]);
2425 for (i
= 0; i
< ctx
->num_commit_graphs_before
; i
++)
2426 free(ctx
->commit_graph_filenames_before
[i
]);
2428 free(ctx
->commit_graph_filenames_after
);
2429 free(ctx
->commit_graph_filenames_before
);
2430 free(ctx
->commit_graph_hash_after
);
2438 #define VERIFY_COMMIT_GRAPH_ERROR_HASH 2
2439 static int verify_commit_graph_error
;
2441 __attribute__((format (printf
, 1, 2)))
2442 static void graph_report(const char *fmt
, ...)
2446 verify_commit_graph_error
= 1;
2448 vfprintf(stderr
, fmt
, ap
);
2449 fprintf(stderr
, "\n");
2453 #define GENERATION_ZERO_EXISTS 1
2454 #define GENERATION_NUMBER_EXISTS 2
2456 static int commit_graph_checksum_valid(struct commit_graph
*g
)
2458 return hashfile_checksum_valid(g
->data
, g
->data_len
);
2461 int verify_commit_graph(struct repository
*r
, struct commit_graph
*g
, int flags
)
2463 uint32_t i
, cur_fanout_pos
= 0;
2464 struct object_id prev_oid
, cur_oid
;
2465 int generation_zero
= 0;
2466 struct progress
*progress
= NULL
;
2467 int local_error
= 0;
2470 graph_report("no commit-graph file loaded");
2474 verify_commit_graph_error
= verify_commit_graph_lite(g
);
2475 if (verify_commit_graph_error
)
2476 return verify_commit_graph_error
;
2478 if (!commit_graph_checksum_valid(g
)) {
2479 graph_report(_("the commit-graph file has incorrect checksum and is likely corrupt"));
2480 verify_commit_graph_error
= VERIFY_COMMIT_GRAPH_ERROR_HASH
;
2483 for (i
= 0; i
< g
->num_commits
; i
++) {
2484 struct commit
*graph_commit
;
2486 oidread(&cur_oid
, g
->chunk_oid_lookup
+ g
->hash_len
* i
);
2488 if (i
&& oidcmp(&prev_oid
, &cur_oid
) >= 0)
2489 graph_report(_("commit-graph has incorrect OID order: %s then %s"),
2490 oid_to_hex(&prev_oid
),
2491 oid_to_hex(&cur_oid
));
2493 oidcpy(&prev_oid
, &cur_oid
);
2495 while (cur_oid
.hash
[0] > cur_fanout_pos
) {
2496 uint32_t fanout_value
= get_be32(g
->chunk_oid_fanout
+ cur_fanout_pos
);
2498 if (i
!= fanout_value
)
2499 graph_report(_("commit-graph has incorrect fanout value: fanout[%d] = %u != %u"),
2500 cur_fanout_pos
, fanout_value
, i
);
2504 graph_commit
= lookup_commit(r
, &cur_oid
);
2505 if (!parse_commit_in_graph_one(r
, g
, graph_commit
))
2506 graph_report(_("failed to parse commit %s from commit-graph"),
2507 oid_to_hex(&cur_oid
));
2510 while (cur_fanout_pos
< 256) {
2511 uint32_t fanout_value
= get_be32(g
->chunk_oid_fanout
+ cur_fanout_pos
);
2513 if (g
->num_commits
!= fanout_value
)
2514 graph_report(_("commit-graph has incorrect fanout value: fanout[%d] = %u != %u"),
2515 cur_fanout_pos
, fanout_value
, i
);
2520 if (verify_commit_graph_error
& ~VERIFY_COMMIT_GRAPH_ERROR_HASH
)
2521 return verify_commit_graph_error
;
2523 if (flags
& COMMIT_GRAPH_WRITE_PROGRESS
)
2524 progress
= start_progress(_("Verifying commits in commit graph"),
2527 for (i
= 0; i
< g
->num_commits
; i
++) {
2528 struct commit
*graph_commit
, *odb_commit
;
2529 struct commit_list
*graph_parents
, *odb_parents
;
2530 timestamp_t max_generation
= 0;
2531 timestamp_t generation
;
2533 display_progress(progress
, i
+ 1);
2534 oidread(&cur_oid
, g
->chunk_oid_lookup
+ g
->hash_len
* i
);
2536 graph_commit
= lookup_commit(r
, &cur_oid
);
2537 odb_commit
= (struct commit
*)create_object(r
, &cur_oid
, alloc_commit_node(r
));
2538 if (parse_commit_internal(odb_commit
, 0, 0)) {
2539 graph_report(_("failed to parse commit %s from object database for commit-graph"),
2540 oid_to_hex(&cur_oid
));
2544 if (!oideq(&get_commit_tree_in_graph_one(r
, g
, graph_commit
)->object
.oid
,
2545 get_commit_tree_oid(odb_commit
)))
2546 graph_report(_("root tree OID for commit %s in commit-graph is %s != %s"),
2547 oid_to_hex(&cur_oid
),
2548 oid_to_hex(get_commit_tree_oid(graph_commit
)),
2549 oid_to_hex(get_commit_tree_oid(odb_commit
)));
2551 graph_parents
= graph_commit
->parents
;
2552 odb_parents
= odb_commit
->parents
;
2554 while (graph_parents
) {
2555 if (odb_parents
== NULL
) {
2556 graph_report(_("commit-graph parent list for commit %s is too long"),
2557 oid_to_hex(&cur_oid
));
2561 /* parse parent in case it is in a base graph */
2562 parse_commit_in_graph_one(r
, g
, graph_parents
->item
);
2564 if (!oideq(&graph_parents
->item
->object
.oid
, &odb_parents
->item
->object
.oid
))
2565 graph_report(_("commit-graph parent for %s is %s != %s"),
2566 oid_to_hex(&cur_oid
),
2567 oid_to_hex(&graph_parents
->item
->object
.oid
),
2568 oid_to_hex(&odb_parents
->item
->object
.oid
));
2570 generation
= commit_graph_generation(graph_parents
->item
);
2571 if (generation
> max_generation
)
2572 max_generation
= generation
;
2574 graph_parents
= graph_parents
->next
;
2575 odb_parents
= odb_parents
->next
;
2578 if (odb_parents
!= NULL
)
2579 graph_report(_("commit-graph parent list for commit %s terminates early"),
2580 oid_to_hex(&cur_oid
));
2582 if (!commit_graph_generation(graph_commit
)) {
2583 if (generation_zero
== GENERATION_NUMBER_EXISTS
)
2584 graph_report(_("commit-graph has generation number zero for commit %s, but non-zero elsewhere"),
2585 oid_to_hex(&cur_oid
));
2586 generation_zero
= GENERATION_ZERO_EXISTS
;
2587 } else if (generation_zero
== GENERATION_ZERO_EXISTS
)
2588 graph_report(_("commit-graph has non-zero generation number for commit %s, but zero elsewhere"),
2589 oid_to_hex(&cur_oid
));
2591 if (generation_zero
== GENERATION_ZERO_EXISTS
)
2595 * If we are using topological level and one of our parents has
2596 * generation GENERATION_NUMBER_V1_MAX, then our generation is
2597 * also GENERATION_NUMBER_V1_MAX. Decrement to avoid extra logic
2598 * in the following condition.
2600 if (!g
->read_generation_data
&& max_generation
== GENERATION_NUMBER_V1_MAX
)
2603 generation
= commit_graph_generation(graph_commit
);
2604 if (generation
< max_generation
+ 1)
2605 graph_report(_("commit-graph generation for commit %s is %"PRItime
" < %"PRItime
),
2606 oid_to_hex(&cur_oid
),
2608 max_generation
+ 1);
2610 if (graph_commit
->date
!= odb_commit
->date
)
2611 graph_report(_("commit date for commit %s in commit-graph is %"PRItime
" != %"PRItime
),
2612 oid_to_hex(&cur_oid
),
2616 stop_progress(&progress
);
2618 local_error
= verify_commit_graph_error
;
2620 if (!(flags
& COMMIT_GRAPH_VERIFY_SHALLOW
) && g
->base_graph
)
2621 local_error
|= verify_commit_graph(r
, g
->base_graph
, flags
);
2626 void free_commit_graph(struct commit_graph
*g
)
2631 munmap((void *)g
->data
, g
->data_len
);
2635 free(g
->bloom_filter_settings
);
2639 void disable_commit_graph(struct repository
*r
)
2641 r
->commit_graph_disabled
= 1;