]>
Commit | Line | Data |
---|---|---|
a3407730 | 1 | #include "cache.h" |
c4d25228 | 2 | #include "config.h" |
fc59e748 | 3 | #include "csum-file.h" |
396f2570 | 4 | #include "dir.h" |
fc59e748 | 5 | #include "lockfile.h" |
396f2570 | 6 | #include "packfile.h" |
4d80560c | 7 | #include "object-store.h" |
bc626927 | 8 | #include "hash-lookup.h" |
a3407730 | 9 | #include "midx.h" |
144d7033 | 10 | #include "progress.h" |
d829223a | 11 | #include "trace2.h" |
ce1e4a10 | 12 | #include "run-command.h" |
18e449f8 | 13 | #include "repository.h" |
63a8f0e9 | 14 | #include "chunk-format.h" |
38ff7cab | 15 | #include "pack.h" |
c528e179 TB |
16 | #include "pack-bitmap.h" |
17 | #include "refs.h" | |
18 | #include "revision.h" | |
19 | #include "list-objects.h" | |
a3407730 | 20 | |
fc59e748 DS |
21 | #define MIDX_SIGNATURE 0x4d494458 /* "MIDX" */ |
22 | #define MIDX_VERSION 1 | |
4d80560c DS |
23 | #define MIDX_BYTE_FILE_VERSION 4 |
24 | #define MIDX_BYTE_HASH_VERSION 5 | |
25 | #define MIDX_BYTE_NUM_CHUNKS 6 | |
26 | #define MIDX_BYTE_NUM_PACKS 8 | |
fc59e748 | 27 | #define MIDX_HEADER_SIZE 12 |
aaa95dfa | 28 | #define MIDX_MIN_SIZE (MIDX_HEADER_SIZE + the_hash_algo->rawsz) |
fc59e748 | 29 | |
32f3c541 DS |
30 | #define MIDX_CHUNK_ALIGNMENT 4 |
31 | #define MIDX_CHUNKID_PACKNAMES 0x504e414d /* "PNAM" */ | |
d7cacf29 | 32 | #define MIDX_CHUNKID_OIDFANOUT 0x4f494446 /* "OIDF" */ |
0d5b3a5e | 33 | #define MIDX_CHUNKID_OIDLOOKUP 0x4f49444c /* "OIDL" */ |
662148c4 DS |
34 | #define MIDX_CHUNKID_OBJECTOFFSETS 0x4f4f4646 /* "OOFF" */ |
35 | #define MIDX_CHUNKID_LARGEOFFSETS 0x4c4f4646 /* "LOFF" */ | |
95e8383b | 36 | #define MIDX_CHUNKID_REVINDEX 0x52494458 /* "RIDX" */ |
d7cacf29 | 37 | #define MIDX_CHUNK_FANOUT_SIZE (sizeof(uint32_t) * 256) |
662148c4 DS |
38 | #define MIDX_CHUNK_OFFSET_WIDTH (2 * sizeof(uint32_t)) |
39 | #define MIDX_CHUNK_LARGE_OFFSET_WIDTH (sizeof(uint64_t)) | |
40 | #define MIDX_LARGE_OFFSET_NEEDED 0x80000000 | |
32f3c541 | 41 | |
19575c7c DS |
42 | #define PACK_EXPIRED UINT_MAX |
43 | ||
0f533c72 | 44 | const unsigned char *get_midx_checksum(struct multi_pack_index *m) |
f894081d TB |
45 | { |
46 | return m->data + m->data_len - the_hash_algo->rawsz; | |
47 | } | |
48 | ||
60980aed | 49 | void get_midx_filename(struct strbuf *out, const char *object_dir) |
fc59e748 | 50 | { |
60980aed | 51 | strbuf_addf(out, "%s/pack/multi-pack-index", object_dir); |
fc59e748 DS |
52 | } |
53 | ||
60980aed | 54 | void get_midx_rev_filename(struct strbuf *out, struct multi_pack_index *m) |
f894081d | 55 | { |
60980aed TB |
56 | get_midx_filename(out, m->object_dir); |
57 | strbuf_addf(out, "-%s.rev", hash_to_hex(get_midx_checksum(m))); | |
f894081d TB |
58 | } |
59 | ||
6ab3b8b8 DS |
60 | static int midx_read_oid_fanout(const unsigned char *chunk_start, |
61 | size_t chunk_size, void *data) | |
62 | { | |
63 | struct multi_pack_index *m = data; | |
64 | m->chunk_oid_fanout = (uint32_t *)chunk_start; | |
65 | ||
66 | if (chunk_size != 4 * 256) { | |
67 | error(_("multi-pack-index OID fanout is of the wrong size")); | |
68 | return 1; | |
69 | } | |
70 | return 0; | |
71 | } | |
72 | ||
2cf489a3 | 73 | struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local) |
4d80560c DS |
74 | { |
75 | struct multi_pack_index *m = NULL; | |
76 | int fd; | |
77 | struct stat st; | |
78 | size_t midx_size; | |
79 | void *midx_map = NULL; | |
80 | uint32_t hash_version; | |
60980aed | 81 | struct strbuf midx_name = STRBUF_INIT; |
32f3c541 | 82 | uint32_t i; |
3227565c | 83 | const char *cur_pack_name; |
6ab3b8b8 | 84 | struct chunkfile *cf = NULL; |
4d80560c | 85 | |
60980aed TB |
86 | get_midx_filename(&midx_name, object_dir); |
87 | ||
88 | fd = git_open(midx_name.buf); | |
4d80560c DS |
89 | |
90 | if (fd < 0) | |
91 | goto cleanup_fail; | |
92 | if (fstat(fd, &st)) { | |
60980aed | 93 | error_errno(_("failed to read %s"), midx_name.buf); |
4d80560c DS |
94 | goto cleanup_fail; |
95 | } | |
96 | ||
97 | midx_size = xsize_t(st.st_size); | |
98 | ||
99 | if (midx_size < MIDX_MIN_SIZE) { | |
60980aed | 100 | error(_("multi-pack-index file %s is too small"), midx_name.buf); |
4d80560c DS |
101 | goto cleanup_fail; |
102 | } | |
103 | ||
60980aed | 104 | strbuf_release(&midx_name); |
4d80560c DS |
105 | |
106 | midx_map = xmmap(NULL, midx_size, PROT_READ, MAP_PRIVATE, fd, 0); | |
6c7ff7cf | 107 | close(fd); |
4d80560c | 108 | |
577314ca | 109 | FLEX_ALLOC_STR(m, object_dir, object_dir); |
4d80560c DS |
110 | m->data = midx_map; |
111 | m->data_len = midx_size; | |
2cf489a3 | 112 | m->local = local; |
4d80560c DS |
113 | |
114 | m->signature = get_be32(m->data); | |
53ad0407 DS |
115 | if (m->signature != MIDX_SIGNATURE) |
116 | die(_("multi-pack-index signature 0x%08x does not match signature 0x%08x"), | |
4d80560c | 117 | m->signature, MIDX_SIGNATURE); |
4d80560c DS |
118 | |
119 | m->version = m->data[MIDX_BYTE_FILE_VERSION]; | |
53ad0407 DS |
120 | if (m->version != MIDX_VERSION) |
121 | die(_("multi-pack-index version %d not recognized"), | |
4d80560c | 122 | m->version); |
4d80560c DS |
123 | |
124 | hash_version = m->data[MIDX_BYTE_HASH_VERSION]; | |
d9fef9d9 | 125 | if (hash_version != oid_version(the_hash_algo)) { |
d9607542 | 126 | error(_("multi-pack-index hash version %u does not match version %u"), |
d9fef9d9 | 127 | hash_version, oid_version(the_hash_algo)); |
d9607542 DS |
128 | goto cleanup_fail; |
129 | } | |
aaa95dfa | 130 | m->hash_len = the_hash_algo->rawsz; |
4d80560c DS |
131 | |
132 | m->num_chunks = m->data[MIDX_BYTE_NUM_CHUNKS]; | |
133 | ||
134 | m->num_packs = get_be32(m->data + MIDX_BYTE_NUM_PACKS); | |
135 | ||
6ab3b8b8 | 136 | cf = init_chunkfile(NULL); |
32f3c541 | 137 | |
6ab3b8b8 DS |
138 | if (read_table_of_contents(cf, m->data, midx_size, |
139 | MIDX_HEADER_SIZE, m->num_chunks)) | |
140 | goto cleanup_fail; | |
32f3c541 | 141 | |
6ab3b8b8 | 142 | if (pair_chunk(cf, MIDX_CHUNKID_PACKNAMES, &m->chunk_pack_names) == CHUNK_NOT_FOUND) |
32f3c541 | 143 | die(_("multi-pack-index missing required pack-name chunk")); |
6ab3b8b8 | 144 | if (read_chunk(cf, MIDX_CHUNKID_OIDFANOUT, midx_read_oid_fanout, m) == CHUNK_NOT_FOUND) |
d7cacf29 | 145 | die(_("multi-pack-index missing required OID fanout chunk")); |
6ab3b8b8 | 146 | if (pair_chunk(cf, MIDX_CHUNKID_OIDLOOKUP, &m->chunk_oid_lookup) == CHUNK_NOT_FOUND) |
0d5b3a5e | 147 | die(_("multi-pack-index missing required OID lookup chunk")); |
6ab3b8b8 | 148 | if (pair_chunk(cf, MIDX_CHUNKID_OBJECTOFFSETS, &m->chunk_object_offsets) == CHUNK_NOT_FOUND) |
662148c4 | 149 | die(_("multi-pack-index missing required object offsets chunk")); |
32f3c541 | 150 | |
6ab3b8b8 DS |
151 | pair_chunk(cf, MIDX_CHUNKID_LARGEOFFSETS, &m->chunk_large_offsets); |
152 | ||
7f514b7a TB |
153 | if (git_env_bool("GIT_TEST_MIDX_READ_RIDX", 1)) |
154 | pair_chunk(cf, MIDX_CHUNKID_REVINDEX, &m->chunk_revindex); | |
155 | ||
d7cacf29 DS |
156 | m->num_objects = ntohl(m->chunk_oid_fanout[255]); |
157 | ||
ca56dadb RS |
158 | CALLOC_ARRAY(m->pack_names, m->num_packs); |
159 | CALLOC_ARRAY(m->packs, m->num_packs); | |
3227565c DS |
160 | |
161 | cur_pack_name = (const char *)m->chunk_pack_names; | |
162 | for (i = 0; i < m->num_packs; i++) { | |
163 | m->pack_names[i] = cur_pack_name; | |
164 | ||
165 | cur_pack_name += strlen(cur_pack_name) + 1; | |
166 | ||
8e72a3c3 DS |
167 | if (i && strcmp(m->pack_names[i], m->pack_names[i - 1]) <= 0) |
168 | die(_("multi-pack-index pack names out of order: '%s' before '%s'"), | |
3227565c DS |
169 | m->pack_names[i - 1], |
170 | m->pack_names[i]); | |
3227565c DS |
171 | } |
172 | ||
d829223a JH |
173 | trace2_data_intmax("midx", the_repository, "load/num_packs", m->num_packs); |
174 | trace2_data_intmax("midx", the_repository, "load/num_objects", m->num_objects); | |
175 | ||
692305ec | 176 | free_chunkfile(cf); |
4d80560c DS |
177 | return m; |
178 | ||
179 | cleanup_fail: | |
180 | free(m); | |
60980aed | 181 | strbuf_release(&midx_name); |
692305ec | 182 | free_chunkfile(cf); |
4d80560c DS |
183 | if (midx_map) |
184 | munmap(midx_map, midx_size); | |
185 | if (0 <= fd) | |
186 | close(fd); | |
187 | return NULL; | |
188 | } | |
189 | ||
1dcd9f20 | 190 | void close_midx(struct multi_pack_index *m) |
a40498a1 DS |
191 | { |
192 | uint32_t i; | |
1dcd9f20 DS |
193 | |
194 | if (!m) | |
195 | return; | |
196 | ||
9bb6c2e5 TB |
197 | close_midx(m->next); |
198 | ||
a40498a1 | 199 | munmap((unsigned char *)m->data, m->data_len); |
a40498a1 DS |
200 | |
201 | for (i = 0; i < m->num_packs; i++) { | |
af96fe33 DS |
202 | if (m->packs[i]) |
203 | m->packs[i]->multi_pack_index = 0; | |
a40498a1 DS |
204 | } |
205 | FREE_AND_NULL(m->packs); | |
206 | FREE_AND_NULL(m->pack_names); | |
9bb6c2e5 | 207 | free(m); |
a40498a1 DS |
208 | } |
209 | ||
64404a24 | 210 | int prepare_midx_pack(struct repository *r, struct multi_pack_index *m, uint32_t pack_int_id) |
3715a633 DS |
211 | { |
212 | struct strbuf pack_name = STRBUF_INIT; | |
af96fe33 | 213 | struct packed_git *p; |
3715a633 DS |
214 | |
215 | if (pack_int_id >= m->num_packs) | |
d355e46a | 216 | die(_("bad pack-int-id: %u (%u total packs)"), |
cc6af73c | 217 | pack_int_id, m->num_packs); |
3715a633 DS |
218 | |
219 | if (m->packs[pack_int_id]) | |
220 | return 0; | |
221 | ||
222 | strbuf_addf(&pack_name, "%s/pack/%s", m->object_dir, | |
223 | m->pack_names[pack_int_id]); | |
224 | ||
af96fe33 | 225 | p = add_packed_git(pack_name.buf, pack_name.len, m->local); |
3715a633 | 226 | strbuf_release(&pack_name); |
af96fe33 DS |
227 | |
228 | if (!p) | |
229 | return 1; | |
230 | ||
231 | p->multi_pack_index = 1; | |
232 | m->packs[pack_int_id] = p; | |
233 | install_packed_git(r, p); | |
234 | list_add_tail(&p->mru, &r->objects->packed_git_mru); | |
235 | ||
236 | return 0; | |
3715a633 DS |
237 | } |
238 | ||
239 | int bsearch_midx(const struct object_id *oid, struct multi_pack_index *m, uint32_t *result) | |
240 | { | |
241 | return bsearch_hash(oid->hash, m->chunk_oid_fanout, m->chunk_oid_lookup, | |
aaa95dfa | 242 | the_hash_algo->rawsz, result); |
3715a633 DS |
243 | } |
244 | ||
8aac67a1 DS |
245 | struct object_id *nth_midxed_object_oid(struct object_id *oid, |
246 | struct multi_pack_index *m, | |
247 | uint32_t n) | |
248 | { | |
249 | if (n >= m->num_objects) | |
250 | return NULL; | |
251 | ||
92e2cab9 | 252 | oidread(oid, m->chunk_oid_lookup + m->hash_len * n); |
8aac67a1 DS |
253 | return oid; |
254 | } | |
255 | ||
62f2c1b5 | 256 | off_t nth_midxed_offset(struct multi_pack_index *m, uint32_t pos) |
3715a633 DS |
257 | { |
258 | const unsigned char *offset_data; | |
259 | uint32_t offset32; | |
260 | ||
329fac3a | 261 | offset_data = m->chunk_object_offsets + (off_t)pos * MIDX_CHUNK_OFFSET_WIDTH; |
3715a633 DS |
262 | offset32 = get_be32(offset_data + sizeof(uint32_t)); |
263 | ||
264 | if (m->chunk_large_offsets && offset32 & MIDX_LARGE_OFFSET_NEEDED) { | |
d8ac9ee1 | 265 | if (sizeof(off_t) < sizeof(uint64_t)) |
3715a633 DS |
266 | die(_("multi-pack-index stores a 64-bit offset, but off_t is too small")); |
267 | ||
268 | offset32 ^= MIDX_LARGE_OFFSET_NEEDED; | |
269 | return get_be64(m->chunk_large_offsets + sizeof(uint64_t) * offset32); | |
270 | } | |
271 | ||
272 | return offset32; | |
273 | } | |
274 | ||
62f2c1b5 | 275 | uint32_t nth_midxed_pack_int_id(struct multi_pack_index *m, uint32_t pos) |
3715a633 | 276 | { |
329fac3a DS |
277 | return get_be32(m->chunk_object_offsets + |
278 | (off_t)pos * MIDX_CHUNK_OFFSET_WIDTH); | |
3715a633 DS |
279 | } |
280 | ||
893b5635 RS |
281 | int fill_midx_entry(struct repository * r, |
282 | const struct object_id *oid, | |
283 | struct pack_entry *e, | |
284 | struct multi_pack_index *m) | |
3715a633 | 285 | { |
893b5635 | 286 | uint32_t pos; |
3715a633 DS |
287 | uint32_t pack_int_id; |
288 | struct packed_git *p; | |
289 | ||
893b5635 RS |
290 | if (!bsearch_midx(oid, m, &pos)) |
291 | return 0; | |
292 | ||
3715a633 DS |
293 | if (pos >= m->num_objects) |
294 | return 0; | |
295 | ||
296 | pack_int_id = nth_midxed_pack_int_id(m, pos); | |
297 | ||
64404a24 | 298 | if (prepare_midx_pack(r, m, pack_int_id)) |
506ec2fb | 299 | return 0; |
3715a633 DS |
300 | p = m->packs[pack_int_id]; |
301 | ||
302 | /* | |
303 | * We are about to tell the caller where they can locate the | |
304 | * requested object. We better make sure the packfile is | |
305 | * still here and can be accessed before supplying that | |
306 | * answer, as it may have been deleted since the MIDX was | |
307 | * loaded! | |
308 | */ | |
309 | if (!is_pack_valid(p)) | |
310 | return 0; | |
311 | ||
09ef6617 RS |
312 | if (oidset_size(&p->bad_objects) && |
313 | oidset_contains(&p->bad_objects, oid)) | |
314 | return 0; | |
c39b02ae | 315 | |
3715a633 DS |
316 | e->offset = nth_midxed_offset(m, pos); |
317 | e->p = p; | |
318 | ||
319 | return 1; | |
320 | } | |
321 | ||
013fd7ad JK |
322 | /* Match "foo.idx" against either "foo.pack" _or_ "foo.idx". */ |
323 | static int cmp_idx_or_pack_name(const char *idx_or_pack_name, | |
324 | const char *idx_name) | |
325 | { | |
326 | /* Skip past any initial matching prefix. */ | |
327 | while (*idx_name && *idx_name == *idx_or_pack_name) { | |
328 | idx_name++; | |
329 | idx_or_pack_name++; | |
330 | } | |
331 | ||
332 | /* | |
333 | * If we didn't match completely, we may have matched "pack-1234." and | |
334 | * be left with "idx" and "pack" respectively, which is also OK. We do | |
335 | * not have to check for "idx" and "idx", because that would have been | |
336 | * a complete match (and in that case these strcmps will be false, but | |
337 | * we'll correctly return 0 from the final strcmp() below. | |
338 | * | |
339 | * Technically this matches "fooidx" and "foopack", but we'd never have | |
340 | * such names in the first place. | |
341 | */ | |
342 | if (!strcmp(idx_name, "idx") && !strcmp(idx_or_pack_name, "pack")) | |
343 | return 0; | |
344 | ||
345 | /* | |
346 | * This not only checks for a complete match, but also orders based on | |
347 | * the first non-identical character, which means our ordering will | |
348 | * match a raw strcmp(). That makes it OK to use this to binary search | |
349 | * a naively-sorted list. | |
350 | */ | |
351 | return strcmp(idx_or_pack_name, idx_name); | |
352 | } | |
353 | ||
354 | int midx_contains_pack(struct multi_pack_index *m, const char *idx_or_pack_name) | |
a40498a1 DS |
355 | { |
356 | uint32_t first = 0, last = m->num_packs; | |
357 | ||
358 | while (first < last) { | |
359 | uint32_t mid = first + (last - first) / 2; | |
360 | const char *current; | |
361 | int cmp; | |
362 | ||
363 | current = m->pack_names[mid]; | |
013fd7ad | 364 | cmp = cmp_idx_or_pack_name(idx_or_pack_name, current); |
a40498a1 DS |
365 | if (!cmp) |
366 | return 1; | |
367 | if (cmp > 0) { | |
368 | first = mid + 1; | |
369 | continue; | |
370 | } | |
371 | last = mid; | |
372 | } | |
373 | ||
374 | return 0; | |
375 | } | |
376 | ||
2cf489a3 | 377 | int prepare_multi_pack_index_one(struct repository *r, const char *object_dir, int local) |
c4d25228 | 378 | { |
29e2016b | 379 | struct multi_pack_index *m; |
c4d25228 | 380 | struct multi_pack_index *m_search; |
c4d25228 | 381 | |
18e449f8 DS |
382 | prepare_repo_settings(r); |
383 | if (!r->settings.core_multi_pack_index) | |
c4d25228 DS |
384 | return 0; |
385 | ||
29e2016b | 386 | for (m_search = r->objects->multi_pack_index; m_search; m_search = m_search->next) |
c4d25228 DS |
387 | if (!strcmp(object_dir, m_search->object_dir)) |
388 | return 1; | |
389 | ||
29e2016b | 390 | m = load_multi_pack_index(object_dir, local); |
c4d25228 | 391 | |
29e2016b | 392 | if (m) { |
59552fb3 TB |
393 | struct multi_pack_index *mp = r->objects->multi_pack_index; |
394 | if (mp) { | |
395 | m->next = mp->next; | |
396 | mp->next = m; | |
397 | } else | |
398 | r->objects->multi_pack_index = m; | |
c4d25228 DS |
399 | return 1; |
400 | } | |
401 | ||
402 | return 0; | |
403 | } | |
404 | ||
fc59e748 DS |
405 | static size_t write_midx_header(struct hashfile *f, |
406 | unsigned char num_chunks, | |
407 | uint32_t num_packs) | |
408 | { | |
fc59e748 | 409 | hashwrite_be32(f, MIDX_SIGNATURE); |
014f1447 | 410 | hashwrite_u8(f, MIDX_VERSION); |
d9fef9d9 | 411 | hashwrite_u8(f, oid_version(the_hash_algo)); |
014f1447 RS |
412 | hashwrite_u8(f, num_chunks); |
413 | hashwrite_u8(f, 0); /* unused */ | |
fc59e748 DS |
414 | hashwrite_be32(f, num_packs); |
415 | ||
416 | return MIDX_HEADER_SIZE; | |
417 | } | |
418 | ||
d01bf2e6 DS |
419 | struct pack_info { |
420 | uint32_t orig_pack_int_id; | |
421 | char *pack_name; | |
422 | struct packed_git *p; | |
19575c7c | 423 | unsigned expired : 1; |
d01bf2e6 DS |
424 | }; |
425 | ||
426 | static int pack_info_compare(const void *_a, const void *_b) | |
427 | { | |
428 | struct pack_info *a = (struct pack_info *)_a; | |
429 | struct pack_info *b = (struct pack_info *)_b; | |
430 | return strcmp(a->pack_name, b->pack_name); | |
431 | } | |
432 | ||
9218c6a4 TB |
433 | static int idx_or_pack_name_cmp(const void *_va, const void *_vb) |
434 | { | |
435 | const char *pack_name = _va; | |
436 | const struct pack_info *compar = _vb; | |
437 | ||
438 | return cmp_idx_or_pack_name(pack_name, compar->pack_name); | |
439 | } | |
440 | ||
577dc496 | 441 | struct write_midx_context { |
d01bf2e6 | 442 | struct pack_info *info; |
396f2570 | 443 | uint32_t nr; |
d01bf2e6 | 444 | uint32_t alloc; |
a40498a1 | 445 | struct multi_pack_index *m; |
840cef0c WB |
446 | struct progress *progress; |
447 | unsigned pack_paths_checked; | |
31bda9a2 DS |
448 | |
449 | struct pack_midx_entry *entries; | |
450 | uint32_t entries_nr; | |
7a3ada11 DS |
451 | |
452 | uint32_t *pack_perm; | |
38ff7cab | 453 | uint32_t *pack_order; |
7a3ada11 | 454 | unsigned large_offsets_needed:1; |
980f525c | 455 | uint32_t num_large_offsets; |
9218c6a4 TB |
456 | |
457 | int preferred_pack_idx; | |
56d863e9 TB |
458 | |
459 | struct string_list *to_include; | |
396f2570 DS |
460 | }; |
461 | ||
462 | static void add_pack_to_midx(const char *full_path, size_t full_path_len, | |
463 | const char *file_name, void *data) | |
464 | { | |
577dc496 | 465 | struct write_midx_context *ctx = data; |
396f2570 DS |
466 | |
467 | if (ends_with(file_name, ".idx")) { | |
577dc496 | 468 | display_progress(ctx->progress, ++ctx->pack_paths_checked); |
56d863e9 TB |
469 | /* |
470 | * Note that at most one of ctx->m and ctx->to_include are set, | |
471 | * so we are testing midx_contains_pack() and | |
472 | * string_list_has_string() independently (guarded by the | |
473 | * appropriate NULL checks). | |
474 | * | |
475 | * We could support passing to_include while reusing an existing | |
476 | * MIDX, but don't currently since the reuse process drags | |
477 | * forward all packs from an existing MIDX (without checking | |
478 | * whether or not they appear in the to_include list). | |
479 | * | |
480 | * If we added support for that, these next two conditional | |
481 | * should be performed independently (likely checking | |
482 | * to_include before the existing MIDX). | |
483 | */ | |
577dc496 | 484 | if (ctx->m && midx_contains_pack(ctx->m, file_name)) |
a40498a1 | 485 | return; |
56d863e9 TB |
486 | else if (ctx->to_include && |
487 | !string_list_has_string(ctx->to_include, file_name)) | |
488 | return; | |
a40498a1 | 489 | |
577dc496 | 490 | ALLOC_GROW(ctx->info, ctx->nr + 1, ctx->alloc); |
396f2570 | 491 | |
577dc496 DS |
492 | ctx->info[ctx->nr].p = add_packed_git(full_path, |
493 | full_path_len, | |
494 | 0); | |
fe1ed56f | 495 | |
577dc496 | 496 | if (!ctx->info[ctx->nr].p) { |
396f2570 DS |
497 | warning(_("failed to add packfile '%s'"), |
498 | full_path); | |
499 | return; | |
500 | } | |
501 | ||
577dc496 | 502 | if (open_pack_index(ctx->info[ctx->nr].p)) { |
fe1ed56f DS |
503 | warning(_("failed to open pack-index '%s'"), |
504 | full_path); | |
577dc496 DS |
505 | close_pack(ctx->info[ctx->nr].p); |
506 | FREE_AND_NULL(ctx->info[ctx->nr].p); | |
fe1ed56f DS |
507 | return; |
508 | } | |
509 | ||
577dc496 DS |
510 | ctx->info[ctx->nr].pack_name = xstrdup(file_name); |
511 | ctx->info[ctx->nr].orig_pack_int_id = ctx->nr; | |
512 | ctx->info[ctx->nr].expired = 0; | |
513 | ctx->nr++; | |
396f2570 DS |
514 | } |
515 | } | |
516 | ||
fe1ed56f DS |
517 | struct pack_midx_entry { |
518 | struct object_id oid; | |
519 | uint32_t pack_int_id; | |
520 | time_t pack_mtime; | |
521 | uint64_t offset; | |
9218c6a4 | 522 | unsigned preferred : 1; |
fe1ed56f DS |
523 | }; |
524 | ||
525 | static int midx_oid_compare(const void *_a, const void *_b) | |
526 | { | |
527 | const struct pack_midx_entry *a = (const struct pack_midx_entry *)_a; | |
528 | const struct pack_midx_entry *b = (const struct pack_midx_entry *)_b; | |
529 | int cmp = oidcmp(&a->oid, &b->oid); | |
530 | ||
531 | if (cmp) | |
532 | return cmp; | |
533 | ||
9218c6a4 TB |
534 | /* Sort objects in a preferred pack first when multiple copies exist. */ |
535 | if (a->preferred > b->preferred) | |
536 | return -1; | |
537 | if (a->preferred < b->preferred) | |
538 | return 1; | |
539 | ||
fe1ed56f DS |
540 | if (a->pack_mtime > b->pack_mtime) |
541 | return -1; | |
542 | else if (a->pack_mtime < b->pack_mtime) | |
543 | return 1; | |
544 | ||
545 | return a->pack_int_id - b->pack_int_id; | |
546 | } | |
547 | ||
a40498a1 | 548 | static int nth_midxed_pack_midx_entry(struct multi_pack_index *m, |
a40498a1 DS |
549 | struct pack_midx_entry *e, |
550 | uint32_t pos) | |
551 | { | |
552 | if (pos >= m->num_objects) | |
553 | return 1; | |
554 | ||
555 | nth_midxed_object_oid(&e->oid, m, pos); | |
d01bf2e6 | 556 | e->pack_int_id = nth_midxed_pack_int_id(m, pos); |
a40498a1 DS |
557 | e->offset = nth_midxed_offset(m, pos); |
558 | ||
559 | /* consider objects in midx to be from "old" packs */ | |
560 | e->pack_mtime = 0; | |
561 | return 0; | |
562 | } | |
563 | ||
fe1ed56f DS |
564 | static void fill_pack_entry(uint32_t pack_int_id, |
565 | struct packed_git *p, | |
566 | uint32_t cur_object, | |
9218c6a4 TB |
567 | struct pack_midx_entry *entry, |
568 | int preferred) | |
fe1ed56f | 569 | { |
0763671b | 570 | if (nth_packed_object_id(&entry->oid, p, cur_object) < 0) |
fe1ed56f DS |
571 | die(_("failed to locate object %d in packfile"), cur_object); |
572 | ||
573 | entry->pack_int_id = pack_int_id; | |
574 | entry->pack_mtime = p->mtime; | |
575 | ||
576 | entry->offset = nth_packed_object_offset(p, cur_object); | |
9218c6a4 | 577 | entry->preferred = !!preferred; |
fe1ed56f DS |
578 | } |
579 | ||
989d9cbd TB |
580 | struct midx_fanout { |
581 | struct pack_midx_entry *entries; | |
582 | uint32_t nr; | |
583 | uint32_t alloc; | |
584 | }; | |
585 | ||
586 | static void midx_fanout_grow(struct midx_fanout *fanout, uint32_t nr) | |
587 | { | |
588 | ALLOC_GROW(fanout->entries, nr, fanout->alloc); | |
589 | } | |
590 | ||
591 | static void midx_fanout_sort(struct midx_fanout *fanout) | |
592 | { | |
593 | QSORT(fanout->entries, fanout->nr, midx_oid_compare); | |
594 | } | |
595 | ||
852c5301 TB |
596 | static void midx_fanout_add_midx_fanout(struct midx_fanout *fanout, |
597 | struct multi_pack_index *m, | |
598 | int preferred_pack, | |
599 | uint32_t cur_fanout) | |
600 | { | |
601 | uint32_t start = 0, end; | |
602 | uint32_t cur_object; | |
603 | ||
604 | if (cur_fanout) | |
605 | start = ntohl(m->chunk_oid_fanout[cur_fanout - 1]); | |
606 | end = ntohl(m->chunk_oid_fanout[cur_fanout]); | |
607 | ||
608 | for (cur_object = start; cur_object < end; cur_object++) { | |
609 | midx_fanout_grow(fanout, fanout->nr + 1); | |
610 | nth_midxed_pack_midx_entry(m, | |
611 | &fanout->entries[fanout->nr], | |
612 | cur_object); | |
613 | if (nth_midxed_pack_int_id(m, cur_object) == preferred_pack) | |
614 | fanout->entries[fanout->nr].preferred = 1; | |
615 | else | |
616 | fanout->entries[fanout->nr].preferred = 0; | |
617 | fanout->nr++; | |
618 | } | |
619 | } | |
620 | ||
fe1ed56f DS |
621 | /* |
622 | * It is possible to artificially get into a state where there are many | |
623 | * duplicate copies of objects. That can create high memory pressure if | |
624 | * we are to create a list of all objects before de-duplication. To reduce | |
625 | * this memory pressure without a significant performance drop, automatically | |
626 | * group objects by the first byte of their object id. Use the IDX fanout | |
627 | * tables to group the data, copy to a local array, then sort. | |
628 | * | |
629 | * Copy only the de-duplicated entries (selected by most-recent modified time | |
630 | * of a packfile containing the object). | |
631 | */ | |
a40498a1 | 632 | static struct pack_midx_entry *get_sorted_entries(struct multi_pack_index *m, |
d01bf2e6 | 633 | struct pack_info *info, |
fe1ed56f | 634 | uint32_t nr_packs, |
9218c6a4 TB |
635 | uint32_t *nr_objects, |
636 | int preferred_pack) | |
fe1ed56f DS |
637 | { |
638 | uint32_t cur_fanout, cur_pack, cur_object; | |
989d9cbd TB |
639 | uint32_t alloc_objects, total_objects = 0; |
640 | struct midx_fanout fanout = { 0 }; | |
fe1ed56f | 641 | struct pack_midx_entry *deduplicated_entries = NULL; |
a40498a1 | 642 | uint32_t start_pack = m ? m->num_packs : 0; |
fe1ed56f | 643 | |
a40498a1 | 644 | for (cur_pack = start_pack; cur_pack < nr_packs; cur_pack++) |
d01bf2e6 | 645 | total_objects += info[cur_pack].p->num_objects; |
fe1ed56f DS |
646 | |
647 | /* | |
648 | * As we de-duplicate by fanout value, we expect the fanout | |
649 | * slices to be evenly distributed, with some noise. Hence, | |
650 | * allocate slightly more than one 256th. | |
651 | */ | |
989d9cbd | 652 | alloc_objects = fanout.alloc = total_objects > 3200 ? total_objects / 200 : 16; |
fe1ed56f | 653 | |
989d9cbd | 654 | ALLOC_ARRAY(fanout.entries, fanout.alloc); |
fe1ed56f DS |
655 | ALLOC_ARRAY(deduplicated_entries, alloc_objects); |
656 | *nr_objects = 0; | |
657 | ||
658 | for (cur_fanout = 0; cur_fanout < 256; cur_fanout++) { | |
989d9cbd | 659 | fanout.nr = 0; |
fe1ed56f | 660 | |
852c5301 TB |
661 | if (m) |
662 | midx_fanout_add_midx_fanout(&fanout, m, preferred_pack, | |
663 | cur_fanout); | |
a40498a1 DS |
664 | |
665 | for (cur_pack = start_pack; cur_pack < nr_packs; cur_pack++) { | |
fe1ed56f | 666 | uint32_t start = 0, end; |
9218c6a4 | 667 | int preferred = cur_pack == preferred_pack; |
fe1ed56f DS |
668 | |
669 | if (cur_fanout) | |
d01bf2e6 DS |
670 | start = get_pack_fanout(info[cur_pack].p, cur_fanout - 1); |
671 | end = get_pack_fanout(info[cur_pack].p, cur_fanout); | |
fe1ed56f DS |
672 | |
673 | for (cur_object = start; cur_object < end; cur_object++) { | |
989d9cbd | 674 | midx_fanout_grow(&fanout, fanout.nr + 1); |
9218c6a4 TB |
675 | fill_pack_entry(cur_pack, |
676 | info[cur_pack].p, | |
677 | cur_object, | |
989d9cbd | 678 | &fanout.entries[fanout.nr], |
9218c6a4 | 679 | preferred); |
989d9cbd | 680 | fanout.nr++; |
fe1ed56f DS |
681 | } |
682 | } | |
683 | ||
989d9cbd | 684 | midx_fanout_sort(&fanout); |
fe1ed56f DS |
685 | |
686 | /* | |
687 | * The batch is now sorted by OID and then mtime (descending). | |
688 | * Take only the first duplicate. | |
689 | */ | |
989d9cbd TB |
690 | for (cur_object = 0; cur_object < fanout.nr; cur_object++) { |
691 | if (cur_object && oideq(&fanout.entries[cur_object - 1].oid, | |
692 | &fanout.entries[cur_object].oid)) | |
fe1ed56f DS |
693 | continue; |
694 | ||
695 | ALLOC_GROW(deduplicated_entries, *nr_objects + 1, alloc_objects); | |
696 | memcpy(&deduplicated_entries[*nr_objects], | |
989d9cbd | 697 | &fanout.entries[cur_object], |
fe1ed56f DS |
698 | sizeof(struct pack_midx_entry)); |
699 | (*nr_objects)++; | |
700 | } | |
701 | } | |
702 | ||
989d9cbd | 703 | free(fanout.entries); |
fe1ed56f DS |
704 | return deduplicated_entries; |
705 | } | |
706 | ||
0ccd713c | 707 | static int write_midx_pack_names(struct hashfile *f, void *data) |
32f3c541 | 708 | { |
b4d94142 | 709 | struct write_midx_context *ctx = data; |
32f3c541 DS |
710 | uint32_t i; |
711 | unsigned char padding[MIDX_CHUNK_ALIGNMENT]; | |
712 | size_t written = 0; | |
713 | ||
b4d94142 | 714 | for (i = 0; i < ctx->nr; i++) { |
19575c7c DS |
715 | size_t writelen; |
716 | ||
b4d94142 | 717 | if (ctx->info[i].expired) |
19575c7c | 718 | continue; |
32f3c541 | 719 | |
b4d94142 | 720 | if (i && strcmp(ctx->info[i].pack_name, ctx->info[i - 1].pack_name) <= 0) |
32f3c541 | 721 | BUG("incorrect pack-file order: %s before %s", |
b4d94142 DS |
722 | ctx->info[i - 1].pack_name, |
723 | ctx->info[i].pack_name); | |
32f3c541 | 724 | |
b4d94142 DS |
725 | writelen = strlen(ctx->info[i].pack_name) + 1; |
726 | hashwrite(f, ctx->info[i].pack_name, writelen); | |
32f3c541 DS |
727 | written += writelen; |
728 | } | |
729 | ||
730 | /* add padding to be aligned */ | |
731 | i = MIDX_CHUNK_ALIGNMENT - (written % MIDX_CHUNK_ALIGNMENT); | |
732 | if (i < MIDX_CHUNK_ALIGNMENT) { | |
733 | memset(padding, 0, sizeof(padding)); | |
734 | hashwrite(f, padding, i); | |
32f3c541 DS |
735 | } |
736 | ||
0ccd713c | 737 | return 0; |
32f3c541 DS |
738 | } |
739 | ||
0ccd713c DS |
740 | static int write_midx_oid_fanout(struct hashfile *f, |
741 | void *data) | |
d7cacf29 | 742 | { |
31bda9a2 DS |
743 | struct write_midx_context *ctx = data; |
744 | struct pack_midx_entry *list = ctx->entries; | |
745 | struct pack_midx_entry *last = ctx->entries + ctx->entries_nr; | |
d7cacf29 DS |
746 | uint32_t count = 0; |
747 | uint32_t i; | |
748 | ||
749 | /* | |
750 | * Write the first-level table (the list is sorted, | |
751 | * but we use a 256-entry lookup to be able to avoid | |
752 | * having to do eight extra binary search iterations). | |
753 | */ | |
754 | for (i = 0; i < 256; i++) { | |
755 | struct pack_midx_entry *next = list; | |
756 | ||
757 | while (next < last && next->oid.hash[0] == i) { | |
758 | count++; | |
759 | next++; | |
760 | } | |
761 | ||
762 | hashwrite_be32(f, count); | |
763 | list = next; | |
764 | } | |
765 | ||
0ccd713c | 766 | return 0; |
d7cacf29 DS |
767 | } |
768 | ||
0ccd713c DS |
769 | static int write_midx_oid_lookup(struct hashfile *f, |
770 | void *data) | |
0d5b3a5e | 771 | { |
31bda9a2 DS |
772 | struct write_midx_context *ctx = data; |
773 | unsigned char hash_len = the_hash_algo->rawsz; | |
774 | struct pack_midx_entry *list = ctx->entries; | |
0d5b3a5e | 775 | uint32_t i; |
0d5b3a5e | 776 | |
31bda9a2 | 777 | for (i = 0; i < ctx->entries_nr; i++) { |
0d5b3a5e DS |
778 | struct pack_midx_entry *obj = list++; |
779 | ||
31bda9a2 | 780 | if (i < ctx->entries_nr - 1) { |
0d5b3a5e DS |
781 | struct pack_midx_entry *next = list; |
782 | if (oidcmp(&obj->oid, &next->oid) >= 0) | |
783 | BUG("OIDs not in order: %s >= %s", | |
784 | oid_to_hex(&obj->oid), | |
785 | oid_to_hex(&next->oid)); | |
786 | } | |
787 | ||
788 | hashwrite(f, obj->oid.hash, (int)hash_len); | |
0d5b3a5e DS |
789 | } |
790 | ||
0ccd713c | 791 | return 0; |
0d5b3a5e DS |
792 | } |
793 | ||
0ccd713c DS |
794 | static int write_midx_object_offsets(struct hashfile *f, |
795 | void *data) | |
662148c4 | 796 | { |
7a3ada11 DS |
797 | struct write_midx_context *ctx = data; |
798 | struct pack_midx_entry *list = ctx->entries; | |
662148c4 | 799 | uint32_t i, nr_large_offset = 0; |
662148c4 | 800 | |
7a3ada11 | 801 | for (i = 0; i < ctx->entries_nr; i++) { |
662148c4 DS |
802 | struct pack_midx_entry *obj = list++; |
803 | ||
7a3ada11 | 804 | if (ctx->pack_perm[obj->pack_int_id] == PACK_EXPIRED) |
19575c7c DS |
805 | BUG("object %s is in an expired pack with int-id %d", |
806 | oid_to_hex(&obj->oid), | |
807 | obj->pack_int_id); | |
808 | ||
7a3ada11 | 809 | hashwrite_be32(f, ctx->pack_perm[obj->pack_int_id]); |
662148c4 | 810 | |
7a3ada11 | 811 | if (ctx->large_offsets_needed && obj->offset >> 31) |
662148c4 | 812 | hashwrite_be32(f, MIDX_LARGE_OFFSET_NEEDED | nr_large_offset++); |
7a3ada11 | 813 | else if (!ctx->large_offsets_needed && obj->offset >> 32) |
662148c4 DS |
814 | BUG("object %s requires a large offset (%"PRIx64") but the MIDX is not writing large offsets!", |
815 | oid_to_hex(&obj->oid), | |
816 | obj->offset); | |
817 | else | |
818 | hashwrite_be32(f, (uint32_t)obj->offset); | |
662148c4 DS |
819 | } |
820 | ||
0ccd713c | 821 | return 0; |
662148c4 DS |
822 | } |
823 | ||
0ccd713c DS |
824 | static int write_midx_large_offsets(struct hashfile *f, |
825 | void *data) | |
662148c4 | 826 | { |
980f525c DS |
827 | struct write_midx_context *ctx = data; |
828 | struct pack_midx_entry *list = ctx->entries; | |
829 | struct pack_midx_entry *end = ctx->entries + ctx->entries_nr; | |
980f525c | 830 | uint32_t nr_large_offset = ctx->num_large_offsets; |
662148c4 DS |
831 | |
832 | while (nr_large_offset) { | |
61b0fcbb JK |
833 | struct pack_midx_entry *obj; |
834 | uint64_t offset; | |
835 | ||
836 | if (list >= end) | |
837 | BUG("too many large-offset objects"); | |
838 | ||
839 | obj = list++; | |
840 | offset = obj->offset; | |
662148c4 DS |
841 | |
842 | if (!(offset >> 31)) | |
843 | continue; | |
844 | ||
0ccd713c | 845 | hashwrite_be64(f, offset); |
662148c4 DS |
846 | |
847 | nr_large_offset--; | |
848 | } | |
849 | ||
0ccd713c | 850 | return 0; |
662148c4 DS |
851 | } |
852 | ||
95e8383b TB |
853 | static int write_midx_revindex(struct hashfile *f, |
854 | void *data) | |
855 | { | |
856 | struct write_midx_context *ctx = data; | |
857 | uint32_t i; | |
858 | ||
859 | for (i = 0; i < ctx->entries_nr; i++) | |
860 | hashwrite_be32(f, ctx->pack_order[i]); | |
861 | ||
862 | return 0; | |
863 | } | |
864 | ||
30077524 JK |
865 | struct midx_pack_order_data { |
866 | uint32_t nr; | |
867 | uint32_t pack; | |
868 | off_t offset; | |
869 | }; | |
38ff7cab | 870 | |
30077524 JK |
871 | static int midx_pack_order_cmp(const void *va, const void *vb) |
872 | { | |
873 | const struct midx_pack_order_data *a = va, *b = vb; | |
874 | if (a->pack < b->pack) | |
38ff7cab | 875 | return -1; |
30077524 | 876 | else if (a->pack > b->pack) |
38ff7cab | 877 | return 1; |
30077524 | 878 | else if (a->offset < b->offset) |
38ff7cab | 879 | return -1; |
30077524 | 880 | else if (a->offset > b->offset) |
38ff7cab | 881 | return 1; |
30077524 JK |
882 | else |
883 | return 0; | |
38ff7cab TB |
884 | } |
885 | ||
886 | static uint32_t *midx_pack_order(struct write_midx_context *ctx) | |
887 | { | |
30077524 | 888 | struct midx_pack_order_data *data; |
38ff7cab TB |
889 | uint32_t *pack_order; |
890 | uint32_t i; | |
891 | ||
30077524 JK |
892 | ALLOC_ARRAY(data, ctx->entries_nr); |
893 | for (i = 0; i < ctx->entries_nr; i++) { | |
894 | struct pack_midx_entry *e = &ctx->entries[i]; | |
895 | data[i].nr = i; | |
896 | data[i].pack = ctx->pack_perm[e->pack_int_id]; | |
897 | if (!e->preferred) | |
898 | data[i].pack |= (1U << 31); | |
899 | data[i].offset = e->offset; | |
900 | } | |
901 | ||
902 | QSORT(data, ctx->entries_nr, midx_pack_order_cmp); | |
903 | ||
38ff7cab TB |
904 | ALLOC_ARRAY(pack_order, ctx->entries_nr); |
905 | for (i = 0; i < ctx->entries_nr; i++) | |
30077524 JK |
906 | pack_order[i] = data[i].nr; |
907 | free(data); | |
38ff7cab TB |
908 | |
909 | return pack_order; | |
910 | } | |
911 | ||
912 | static void write_midx_reverse_index(char *midx_name, unsigned char *midx_hash, | |
913 | struct write_midx_context *ctx) | |
914 | { | |
915 | struct strbuf buf = STRBUF_INIT; | |
916 | const char *tmp_file; | |
917 | ||
918 | strbuf_addf(&buf, "%s-%s.rev", midx_name, hash_to_hex(midx_hash)); | |
919 | ||
920 | tmp_file = write_rev_file_order(NULL, ctx->pack_order, ctx->entries_nr, | |
921 | midx_hash, WRITE_REV); | |
922 | ||
923 | if (finalize_object_file(tmp_file, buf.buf)) | |
924 | die(_("cannot store reverse index file")); | |
925 | ||
926 | strbuf_release(&buf); | |
927 | } | |
928 | ||
426c00e4 | 929 | static void clear_midx_files_ext(const char *object_dir, const char *ext, |
38ff7cab TB |
930 | unsigned char *keep_hash); |
931 | ||
ec1e28ef TB |
932 | static int midx_checksum_valid(struct multi_pack_index *m) |
933 | { | |
934 | return hashfile_checksum_valid(m->data, m->data_len); | |
935 | } | |
936 | ||
c528e179 TB |
937 | static void prepare_midx_packing_data(struct packing_data *pdata, |
938 | struct write_midx_context *ctx) | |
939 | { | |
940 | uint32_t i; | |
941 | ||
942 | memset(pdata, 0, sizeof(struct packing_data)); | |
943 | prepare_packing_data(the_repository, pdata); | |
944 | ||
945 | for (i = 0; i < ctx->entries_nr; i++) { | |
946 | struct pack_midx_entry *from = &ctx->entries[ctx->pack_order[i]]; | |
947 | struct object_entry *to = packlist_alloc(pdata, &from->oid); | |
948 | ||
949 | oe_set_in_pack(pdata, to, | |
950 | ctx->info[ctx->pack_perm[from->pack_int_id]].p); | |
951 | } | |
952 | } | |
953 | ||
954 | static int add_ref_to_pending(const char *refname, | |
955 | const struct object_id *oid, | |
956 | int flag, void *cb_data) | |
957 | { | |
958 | struct rev_info *revs = (struct rev_info*)cb_data; | |
959 | struct object *object; | |
960 | ||
961 | if ((flag & REF_ISSYMREF) && (flag & REF_ISBROKEN)) { | |
962 | warning("symbolic ref is dangling: %s", refname); | |
963 | return 0; | |
964 | } | |
965 | ||
966 | object = parse_object_or_die(oid, refname); | |
967 | if (object->type != OBJ_COMMIT) | |
968 | return 0; | |
969 | ||
970 | add_pending_object(revs, object, ""); | |
971 | if (bitmap_is_preferred_refname(revs->repo, refname)) | |
972 | object->flags |= NEEDS_BITMAP; | |
973 | return 0; | |
974 | } | |
975 | ||
976 | struct bitmap_commit_cb { | |
977 | struct commit **commits; | |
978 | size_t commits_nr, commits_alloc; | |
979 | ||
980 | struct write_midx_context *ctx; | |
981 | }; | |
982 | ||
983 | static const struct object_id *bitmap_oid_access(size_t index, | |
984 | const void *_entries) | |
985 | { | |
986 | const struct pack_midx_entry *entries = _entries; | |
987 | return &entries[index].oid; | |
988 | } | |
989 | ||
990 | static void bitmap_show_commit(struct commit *commit, void *_data) | |
991 | { | |
992 | struct bitmap_commit_cb *data = _data; | |
993 | int pos = oid_pos(&commit->object.oid, data->ctx->entries, | |
994 | data->ctx->entries_nr, | |
995 | bitmap_oid_access); | |
996 | if (pos < 0) | |
997 | return; | |
998 | ||
999 | ALLOC_GROW(data->commits, data->commits_nr + 1, data->commits_alloc); | |
1000 | data->commits[data->commits_nr++] = commit; | |
1001 | } | |
1002 | ||
08944d1c TB |
1003 | static int read_refs_snapshot(const char *refs_snapshot, |
1004 | struct rev_info *revs) | |
1005 | { | |
1006 | struct strbuf buf = STRBUF_INIT; | |
1007 | struct object_id oid; | |
1008 | FILE *f = xfopen(refs_snapshot, "r"); | |
1009 | ||
1010 | while (strbuf_getline(&buf, f) != EOF) { | |
1011 | struct object *object; | |
1012 | int preferred = 0; | |
1013 | char *hex = buf.buf; | |
1014 | const char *end = NULL; | |
1015 | ||
1016 | if (buf.len && *buf.buf == '+') { | |
1017 | preferred = 1; | |
1018 | hex = &buf.buf[1]; | |
1019 | } | |
1020 | ||
1021 | if (parse_oid_hex(hex, &oid, &end) < 0) | |
1022 | die(_("could not parse line: %s"), buf.buf); | |
1023 | if (*end) | |
1024 | die(_("malformed line: %s"), buf.buf); | |
1025 | ||
1026 | object = parse_object_or_die(&oid, NULL); | |
1027 | if (preferred) | |
1028 | object->flags |= NEEDS_BITMAP; | |
1029 | ||
1030 | add_pending_object(revs, object, ""); | |
1031 | } | |
1032 | ||
1033 | fclose(f); | |
1034 | strbuf_release(&buf); | |
1035 | return 0; | |
1036 | } | |
1037 | ||
c528e179 | 1038 | static struct commit **find_commits_for_midx_bitmap(uint32_t *indexed_commits_nr_p, |
08944d1c | 1039 | const char *refs_snapshot, |
c528e179 TB |
1040 | struct write_midx_context *ctx) |
1041 | { | |
1042 | struct rev_info revs; | |
1043 | struct bitmap_commit_cb cb = {0}; | |
1044 | ||
1045 | cb.ctx = ctx; | |
1046 | ||
1047 | repo_init_revisions(the_repository, &revs, NULL); | |
08944d1c TB |
1048 | if (refs_snapshot) { |
1049 | read_refs_snapshot(refs_snapshot, &revs); | |
1050 | } else { | |
1051 | setup_revisions(0, NULL, &revs, NULL); | |
1052 | for_each_ref(add_ref_to_pending, &revs); | |
1053 | } | |
c528e179 TB |
1054 | |
1055 | /* | |
1056 | * Skipping promisor objects here is intentional, since it only excludes | |
1057 | * them from the list of reachable commits that we want to select from | |
1058 | * when computing the selection of MIDX'd commits to receive bitmaps. | |
1059 | * | |
1060 | * Reachability bitmaps do require that their objects be closed under | |
1061 | * reachability, but fetching any objects missing from promisors at this | |
1062 | * point is too late. But, if one of those objects can be reached from | |
1063 | * an another object that is included in the bitmap, then we will | |
1064 | * complain later that we don't have reachability closure (and fail | |
1065 | * appropriately). | |
1066 | */ | |
1067 | fetch_if_missing = 0; | |
1068 | revs.exclude_promisor_objects = 1; | |
1069 | ||
1070 | if (prepare_revision_walk(&revs)) | |
1071 | die(_("revision walk setup failed")); | |
1072 | ||
1073 | traverse_commit_list(&revs, bitmap_show_commit, NULL, &cb); | |
1074 | if (indexed_commits_nr_p) | |
1075 | *indexed_commits_nr_p = cb.commits_nr; | |
1076 | ||
2108fe4a | 1077 | release_revisions(&revs); |
c528e179 TB |
1078 | return cb.commits; |
1079 | } | |
1080 | ||
1081 | static int write_midx_bitmap(char *midx_name, unsigned char *midx_hash, | |
1082 | struct write_midx_context *ctx, | |
08944d1c | 1083 | const char *refs_snapshot, |
c528e179 TB |
1084 | unsigned flags) |
1085 | { | |
1086 | struct packing_data pdata; | |
1087 | struct pack_idx_entry **index; | |
1088 | struct commit **commits = NULL; | |
1089 | uint32_t i, commits_nr; | |
caca3c9f | 1090 | uint16_t options = 0; |
c528e179 TB |
1091 | char *bitmap_name = xstrfmt("%s-%s.bitmap", midx_name, hash_to_hex(midx_hash)); |
1092 | int ret; | |
1093 | ||
eb57277b TB |
1094 | if (!ctx->entries_nr) |
1095 | BUG("cannot write a bitmap without any objects"); | |
1096 | ||
caca3c9f TB |
1097 | if (flags & MIDX_WRITE_BITMAP_HASH_CACHE) |
1098 | options |= BITMAP_OPT_HASH_CACHE; | |
1099 | ||
c528e179 TB |
1100 | prepare_midx_packing_data(&pdata, ctx); |
1101 | ||
08944d1c | 1102 | commits = find_commits_for_midx_bitmap(&commits_nr, refs_snapshot, ctx); |
c528e179 TB |
1103 | |
1104 | /* | |
1105 | * Build the MIDX-order index based on pdata.objects (which is already | |
1106 | * in MIDX order; c.f., 'midx_pack_order_cmp()' for the definition of | |
1107 | * this order). | |
1108 | */ | |
1109 | ALLOC_ARRAY(index, pdata.nr_objects); | |
1110 | for (i = 0; i < pdata.nr_objects; i++) | |
1111 | index[i] = &pdata.objects[i].idx; | |
1112 | ||
1113 | bitmap_writer_show_progress(flags & MIDX_PROGRESS); | |
1114 | bitmap_writer_build_type_index(&pdata, index, pdata.nr_objects); | |
1115 | ||
1116 | /* | |
1117 | * bitmap_writer_finish expects objects in lex order, but pack_order | |
1118 | * gives us exactly that. use it directly instead of re-sorting the | |
1119 | * array. | |
1120 | * | |
1121 | * This changes the order of objects in 'index' between | |
1122 | * bitmap_writer_build_type_index and bitmap_writer_finish. | |
1123 | * | |
1124 | * The same re-ordering takes place in the single-pack bitmap code via | |
1125 | * write_idx_file(), which is called by finish_tmp_packfile(), which | |
1126 | * happens between bitmap_writer_build_type_index() and | |
1127 | * bitmap_writer_finish(). | |
1128 | */ | |
1129 | for (i = 0; i < pdata.nr_objects; i++) | |
1130 | index[ctx->pack_order[i]] = &pdata.objects[i].idx; | |
1131 | ||
1132 | bitmap_writer_select_commits(commits, commits_nr, -1); | |
1133 | ret = bitmap_writer_build(&pdata); | |
1134 | if (ret < 0) | |
1135 | goto cleanup; | |
1136 | ||
1137 | bitmap_writer_set_checksum(midx_hash); | |
caca3c9f | 1138 | bitmap_writer_finish(index, pdata.nr_objects, bitmap_name, options); |
c528e179 TB |
1139 | |
1140 | cleanup: | |
1141 | free(index); | |
1142 | free(bitmap_name); | |
1143 | return ret; | |
1144 | } | |
1145 | ||
504131ac TB |
1146 | static struct multi_pack_index *lookup_multi_pack_index(struct repository *r, |
1147 | const char *object_dir) | |
1148 | { | |
eafcc6de | 1149 | struct multi_pack_index *result = NULL; |
504131ac | 1150 | struct multi_pack_index *cur; |
eafcc6de DS |
1151 | char *obj_dir_real = real_pathdup(object_dir, 1); |
1152 | struct strbuf cur_path_real = STRBUF_INIT; | |
504131ac TB |
1153 | |
1154 | /* Ensure the given object_dir is local, or a known alternate. */ | |
eafcc6de | 1155 | find_odb(r, obj_dir_real); |
504131ac TB |
1156 | |
1157 | for (cur = get_multi_pack_index(r); cur; cur = cur->next) { | |
eafcc6de DS |
1158 | strbuf_realpath(&cur_path_real, cur->object_dir, 1); |
1159 | if (!strcmp(obj_dir_real, cur_path_real.buf)) { | |
1160 | result = cur; | |
1161 | goto cleanup; | |
1162 | } | |
504131ac TB |
1163 | } |
1164 | ||
eafcc6de DS |
1165 | cleanup: |
1166 | free(obj_dir_real); | |
1167 | strbuf_release(&cur_path_real); | |
1168 | return result; | |
504131ac TB |
1169 | } |
1170 | ||
f57a7396 | 1171 | static int write_midx_internal(const char *object_dir, |
56d863e9 | 1172 | struct string_list *packs_to_include, |
9218c6a4 TB |
1173 | struct string_list *packs_to_drop, |
1174 | const char *preferred_pack_name, | |
08944d1c | 1175 | const char *refs_snapshot, |
9218c6a4 | 1176 | unsigned flags) |
a3407730 | 1177 | { |
60980aed | 1178 | struct strbuf midx_name = STRBUF_INIT; |
9f191611 | 1179 | unsigned char midx_hash[GIT_MAX_RAWSZ]; |
396f2570 | 1180 | uint32_t i; |
fc59e748 DS |
1181 | struct hashfile *f = NULL; |
1182 | struct lock_file lk; | |
577dc496 | 1183 | struct write_midx_context ctx = { 0 }; |
dba6175c | 1184 | int pack_name_concat_len = 0; |
19575c7c DS |
1185 | int dropped_packs = 0; |
1186 | int result = 0; | |
63a8f0e9 | 1187 | struct chunkfile *cf; |
fc59e748 | 1188 | |
60980aed TB |
1189 | get_midx_filename(&midx_name, object_dir); |
1190 | if (safe_create_leading_directories(midx_name.buf)) | |
fc59e748 | 1191 | die_errno(_("unable to create leading directories of %s"), |
60980aed | 1192 | midx_name.buf); |
fc59e748 | 1193 | |
56d863e9 TB |
1194 | if (!packs_to_include) { |
1195 | /* | |
1196 | * Only reference an existing MIDX when not filtering which | |
1197 | * packs to include, since all packs and objects are copied | |
1198 | * blindly from an existing MIDX if one is present. | |
1199 | */ | |
504131ac | 1200 | ctx.m = lookup_multi_pack_index(the_repository, object_dir); |
f57a7396 | 1201 | } |
577dc496 | 1202 | |
ec1e28ef TB |
1203 | if (ctx.m && !midx_checksum_valid(ctx.m)) { |
1204 | warning(_("ignoring existing multi-pack-index; checksum mismatch")); | |
1205 | ctx.m = NULL; | |
1206 | } | |
1207 | ||
577dc496 DS |
1208 | ctx.nr = 0; |
1209 | ctx.alloc = ctx.m ? ctx.m->num_packs : 16; | |
1210 | ctx.info = NULL; | |
1211 | ALLOC_ARRAY(ctx.info, ctx.alloc); | |
1212 | ||
1213 | if (ctx.m) { | |
1214 | for (i = 0; i < ctx.m->num_packs; i++) { | |
1215 | ALLOC_GROW(ctx.info, ctx.nr + 1, ctx.alloc); | |
1216 | ||
1217 | ctx.info[ctx.nr].orig_pack_int_id = i; | |
1218 | ctx.info[ctx.nr].pack_name = xstrdup(ctx.m->pack_names[i]); | |
c528e179 | 1219 | ctx.info[ctx.nr].p = ctx.m->packs[i]; |
577dc496 | 1220 | ctx.info[ctx.nr].expired = 0; |
5d3cd09a TB |
1221 | |
1222 | if (flags & MIDX_WRITE_REV_INDEX) { | |
1223 | /* | |
1224 | * If generating a reverse index, need to have | |
1225 | * packed_git's loaded to compare their | |
1226 | * mtimes and object count. | |
1227 | */ | |
1228 | if (prepare_midx_pack(the_repository, ctx.m, i)) { | |
1229 | error(_("could not load pack")); | |
1230 | result = 1; | |
1231 | goto cleanup; | |
1232 | } | |
1233 | ||
1234 | if (open_pack_index(ctx.m->packs[i])) | |
1235 | die(_("could not open index for %s"), | |
1236 | ctx.m->packs[i]->pack_name); | |
1237 | ctx.info[ctx.nr].p = ctx.m->packs[i]; | |
1238 | } | |
1239 | ||
577dc496 | 1240 | ctx.nr++; |
a40498a1 DS |
1241 | } |
1242 | } | |
1243 | ||
577dc496 | 1244 | ctx.pack_paths_checked = 0; |
840cef0c | 1245 | if (flags & MIDX_PROGRESS) |
577dc496 | 1246 | ctx.progress = start_delayed_progress(_("Adding packfiles to multi-pack-index"), 0); |
840cef0c | 1247 | else |
577dc496 | 1248 | ctx.progress = NULL; |
840cef0c | 1249 | |
56d863e9 TB |
1250 | ctx.to_include = packs_to_include; |
1251 | ||
577dc496 DS |
1252 | for_each_file_in_pack_dir(object_dir, add_pack_to_midx, &ctx); |
1253 | stop_progress(&ctx.progress); | |
396f2570 | 1254 | |
56d863e9 TB |
1255 | if ((ctx.m && ctx.nr == ctx.m->num_packs) && |
1256 | !(packs_to_include || packs_to_drop)) { | |
c528e179 TB |
1257 | struct bitmap_index *bitmap_git; |
1258 | int bitmap_exists; | |
1259 | int want_bitmap = flags & MIDX_WRITE_BITMAP; | |
1260 | ||
bfbb60d3 | 1261 | bitmap_git = prepare_midx_bitmap_git(ctx.m); |
c528e179 TB |
1262 | bitmap_exists = bitmap_git && bitmap_is_midx(bitmap_git); |
1263 | free_bitmap_index(bitmap_git); | |
1264 | ||
1265 | if (bitmap_exists || !want_bitmap) { | |
1266 | /* | |
1267 | * The correct MIDX already exists, and so does a | |
1268 | * corresponding bitmap (or one wasn't requested). | |
1269 | */ | |
1270 | if (!want_bitmap) | |
1271 | clear_midx_files_ext(object_dir, ".bitmap", | |
1272 | NULL); | |
1273 | goto cleanup; | |
1274 | } | |
1275 | } | |
a40498a1 | 1276 | |
9218c6a4 | 1277 | if (preferred_pack_name) { |
177c0d6e | 1278 | int found = 0; |
9218c6a4 TB |
1279 | for (i = 0; i < ctx.nr; i++) { |
1280 | if (!cmp_idx_or_pack_name(preferred_pack_name, | |
1281 | ctx.info[i].pack_name)) { | |
1282 | ctx.preferred_pack_idx = i; | |
177c0d6e | 1283 | found = 1; |
9218c6a4 TB |
1284 | break; |
1285 | } | |
1286 | } | |
177c0d6e TB |
1287 | |
1288 | if (!found) | |
1289 | warning(_("unknown preferred pack: '%s'"), | |
1290 | preferred_pack_name); | |
c528e179 TB |
1291 | } else if (ctx.nr && |
1292 | (flags & (MIDX_WRITE_REV_INDEX | MIDX_WRITE_BITMAP))) { | |
177c0d6e TB |
1293 | struct packed_git *oldest = ctx.info[ctx.preferred_pack_idx].p; |
1294 | ctx.preferred_pack_idx = 0; | |
1295 | ||
1296 | if (packs_to_drop && packs_to_drop->nr) | |
1297 | BUG("cannot write a MIDX bitmap during expiration"); | |
1298 | ||
1299 | /* | |
1300 | * set a preferred pack when writing a bitmap to ensure that | |
1301 | * the pack from which the first object is selected in pseudo | |
1302 | * pack-order has all of its objects selected from that pack | |
1303 | * (and not another pack containing a duplicate) | |
1304 | */ | |
1305 | for (i = 1; i < ctx.nr; i++) { | |
1306 | struct packed_git *p = ctx.info[i].p; | |
1307 | ||
1308 | if (!oldest->num_objects || p->mtime < oldest->mtime) { | |
1309 | oldest = p; | |
1310 | ctx.preferred_pack_idx = i; | |
1311 | } | |
1312 | } | |
1313 | ||
1314 | if (!oldest->num_objects) { | |
1315 | /* | |
1316 | * If all packs are empty; unset the preferred index. | |
1317 | * This is acceptable since there will be no duplicate | |
1318 | * objects to resolve, so the preferred value doesn't | |
1319 | * matter. | |
1320 | */ | |
1321 | ctx.preferred_pack_idx = -1; | |
1322 | } | |
1323 | } else { | |
1324 | /* | |
1325 | * otherwise don't mark any pack as preferred to avoid | |
1326 | * interfering with expiration logic below | |
1327 | */ | |
1328 | ctx.preferred_pack_idx = -1; | |
9218c6a4 TB |
1329 | } |
1330 | ||
5d3cd09a TB |
1331 | if (ctx.preferred_pack_idx > -1) { |
1332 | struct packed_git *preferred = ctx.info[ctx.preferred_pack_idx].p; | |
1333 | if (!preferred->num_objects) { | |
1334 | error(_("cannot select preferred pack %s with no objects"), | |
1335 | preferred->pack_name); | |
1336 | result = 1; | |
1337 | goto cleanup; | |
1338 | } | |
1339 | } | |
1340 | ||
9218c6a4 TB |
1341 | ctx.entries = get_sorted_entries(ctx.m, ctx.info, ctx.nr, &ctx.entries_nr, |
1342 | ctx.preferred_pack_idx); | |
a40498a1 | 1343 | |
7a3ada11 | 1344 | ctx.large_offsets_needed = 0; |
31bda9a2 DS |
1345 | for (i = 0; i < ctx.entries_nr; i++) { |
1346 | if (ctx.entries[i].offset > 0x7fffffff) | |
980f525c | 1347 | ctx.num_large_offsets++; |
31bda9a2 | 1348 | if (ctx.entries[i].offset > 0xffffffff) |
7a3ada11 | 1349 | ctx.large_offsets_needed = 1; |
662148c4 | 1350 | } |
fe1ed56f | 1351 | |
577dc496 | 1352 | QSORT(ctx.info, ctx.nr, pack_info_compare); |
d01bf2e6 | 1353 | |
19575c7c DS |
1354 | if (packs_to_drop && packs_to_drop->nr) { |
1355 | int drop_index = 0; | |
1356 | int missing_drops = 0; | |
1357 | ||
577dc496 DS |
1358 | for (i = 0; i < ctx.nr && drop_index < packs_to_drop->nr; i++) { |
1359 | int cmp = strcmp(ctx.info[i].pack_name, | |
19575c7c DS |
1360 | packs_to_drop->items[drop_index].string); |
1361 | ||
1362 | if (!cmp) { | |
1363 | drop_index++; | |
577dc496 | 1364 | ctx.info[i].expired = 1; |
19575c7c DS |
1365 | } else if (cmp > 0) { |
1366 | error(_("did not see pack-file %s to drop"), | |
1367 | packs_to_drop->items[drop_index].string); | |
1368 | drop_index++; | |
1369 | missing_drops++; | |
1370 | i--; | |
1371 | } else { | |
577dc496 | 1372 | ctx.info[i].expired = 0; |
19575c7c DS |
1373 | } |
1374 | } | |
1375 | ||
1376 | if (missing_drops) { | |
1377 | result = 1; | |
1378 | goto cleanup; | |
1379 | } | |
1380 | } | |
1381 | ||
d01bf2e6 DS |
1382 | /* |
1383 | * pack_perm stores a permutation between pack-int-ids from the | |
1384 | * previous multi-pack-index to the new one we are writing: | |
1385 | * | |
1386 | * pack_perm[old_id] = new_id | |
1387 | */ | |
7a3ada11 | 1388 | ALLOC_ARRAY(ctx.pack_perm, ctx.nr); |
577dc496 DS |
1389 | for (i = 0; i < ctx.nr; i++) { |
1390 | if (ctx.info[i].expired) { | |
19575c7c | 1391 | dropped_packs++; |
7a3ada11 | 1392 | ctx.pack_perm[ctx.info[i].orig_pack_int_id] = PACK_EXPIRED; |
19575c7c | 1393 | } else { |
7a3ada11 | 1394 | ctx.pack_perm[ctx.info[i].orig_pack_int_id] = i - dropped_packs; |
19575c7c | 1395 | } |
d01bf2e6 DS |
1396 | } |
1397 | ||
577dc496 DS |
1398 | for (i = 0; i < ctx.nr; i++) { |
1399 | if (!ctx.info[i].expired) | |
1400 | pack_name_concat_len += strlen(ctx.info[i].pack_name) + 1; | |
19575c7c | 1401 | } |
dba6175c | 1402 | |
9218c6a4 TB |
1403 | /* Check that the preferred pack wasn't expired (if given). */ |
1404 | if (preferred_pack_name) { | |
1405 | struct pack_info *preferred = bsearch(preferred_pack_name, | |
1406 | ctx.info, ctx.nr, | |
1407 | sizeof(*ctx.info), | |
1408 | idx_or_pack_name_cmp); | |
177c0d6e | 1409 | if (preferred) { |
9218c6a4 TB |
1410 | uint32_t perm = ctx.pack_perm[preferred->orig_pack_int_id]; |
1411 | if (perm == PACK_EXPIRED) | |
1412 | warning(_("preferred pack '%s' is expired"), | |
1413 | preferred_pack_name); | |
1414 | } | |
1415 | } | |
1416 | ||
dba6175c DS |
1417 | if (pack_name_concat_len % MIDX_CHUNK_ALIGNMENT) |
1418 | pack_name_concat_len += MIDX_CHUNK_ALIGNMENT - | |
1419 | (pack_name_concat_len % MIDX_CHUNK_ALIGNMENT); | |
1420 | ||
60980aed | 1421 | hold_lock_file_for_update(&lk, midx_name.buf, LOCK_DIE_ON_ERROR); |
acd71602 | 1422 | f = hashfd(get_lock_file_fd(&lk), get_lock_file_path(&lk)); |
fc59e748 | 1423 | |
577dc496 | 1424 | if (ctx.nr - dropped_packs == 0) { |
796d61cd DR |
1425 | error(_("no pack files to index.")); |
1426 | result = 1; | |
1427 | goto cleanup; | |
1428 | } | |
1429 | ||
eb57277b TB |
1430 | if (!ctx.entries_nr) { |
1431 | if (flags & MIDX_WRITE_BITMAP) | |
1432 | warning(_("refusing to write multi-pack .bitmap without any objects")); | |
1433 | flags &= ~(MIDX_WRITE_REV_INDEX | MIDX_WRITE_BITMAP); | |
1434 | } | |
1435 | ||
63a8f0e9 | 1436 | cf = init_chunkfile(f); |
32f3c541 | 1437 | |
63a8f0e9 DS |
1438 | add_chunk(cf, MIDX_CHUNKID_PACKNAMES, pack_name_concat_len, |
1439 | write_midx_pack_names); | |
1440 | add_chunk(cf, MIDX_CHUNKID_OIDFANOUT, MIDX_CHUNK_FANOUT_SIZE, | |
1441 | write_midx_oid_fanout); | |
1442 | add_chunk(cf, MIDX_CHUNKID_OIDLOOKUP, | |
329fac3a | 1443 | (size_t)ctx.entries_nr * the_hash_algo->rawsz, |
63a8f0e9 DS |
1444 | write_midx_oid_lookup); |
1445 | add_chunk(cf, MIDX_CHUNKID_OBJECTOFFSETS, | |
329fac3a | 1446 | (size_t)ctx.entries_nr * MIDX_CHUNK_OFFSET_WIDTH, |
63a8f0e9 | 1447 | write_midx_object_offsets); |
32f3c541 | 1448 | |
63a8f0e9 DS |
1449 | if (ctx.large_offsets_needed) |
1450 | add_chunk(cf, MIDX_CHUNKID_LARGEOFFSETS, | |
329fac3a | 1451 | (size_t)ctx.num_large_offsets * MIDX_CHUNK_LARGE_OFFSET_WIDTH, |
63a8f0e9 | 1452 | write_midx_large_offsets); |
32f3c541 | 1453 | |
95e8383b TB |
1454 | if (flags & (MIDX_WRITE_REV_INDEX | MIDX_WRITE_BITMAP)) { |
1455 | ctx.pack_order = midx_pack_order(&ctx); | |
1456 | add_chunk(cf, MIDX_CHUNKID_REVINDEX, | |
1457 | ctx.entries_nr * sizeof(uint32_t), | |
1458 | write_midx_revindex); | |
1459 | } | |
1460 | ||
63a8f0e9 DS |
1461 | write_midx_header(f, get_num_chunks(cf), ctx.nr - dropped_packs); |
1462 | write_chunkfile(cf, &ctx); | |
fc59e748 | 1463 | |
020406ea NS |
1464 | finalize_hashfile(f, midx_hash, FSYNC_COMPONENT_PACK_METADATA, |
1465 | CSUM_FSYNC | CSUM_HASH_IN_STREAM); | |
63a8f0e9 | 1466 | free_chunkfile(cf); |
38ff7cab | 1467 | |
7f514b7a TB |
1468 | if (flags & MIDX_WRITE_REV_INDEX && |
1469 | git_env_bool("GIT_TEST_MIDX_WRITE_REV", 0)) | |
60980aed | 1470 | write_midx_reverse_index(midx_name.buf, midx_hash, &ctx); |
c528e179 | 1471 | if (flags & MIDX_WRITE_BITMAP) { |
60980aed | 1472 | if (write_midx_bitmap(midx_name.buf, midx_hash, &ctx, |
08944d1c | 1473 | refs_snapshot, flags) < 0) { |
c528e179 TB |
1474 | error(_("could not write multi-pack bitmap")); |
1475 | result = 1; | |
1476 | goto cleanup; | |
1477 | } | |
1478 | } | |
1479 | ||
1480 | if (ctx.m) | |
1481 | close_object_store(the_repository->objects); | |
38ff7cab | 1482 | |
ae22e841 TB |
1483 | if (commit_lock_file(&lk) < 0) |
1484 | die_errno(_("could not write multi-pack-index")); | |
fc59e748 | 1485 | |
c528e179 | 1486 | clear_midx_files_ext(object_dir, ".bitmap", midx_hash); |
f5909d34 TB |
1487 | clear_midx_files_ext(object_dir, ".rev", midx_hash); |
1488 | ||
a40498a1 | 1489 | cleanup: |
577dc496 DS |
1490 | for (i = 0; i < ctx.nr; i++) { |
1491 | if (ctx.info[i].p) { | |
1492 | close_pack(ctx.info[i].p); | |
1493 | free(ctx.info[i].p); | |
396f2570 | 1494 | } |
577dc496 | 1495 | free(ctx.info[i].pack_name); |
396f2570 DS |
1496 | } |
1497 | ||
577dc496 | 1498 | free(ctx.info); |
31bda9a2 | 1499 | free(ctx.entries); |
7a3ada11 | 1500 | free(ctx.pack_perm); |
38ff7cab | 1501 | free(ctx.pack_order); |
60980aed | 1502 | strbuf_release(&midx_name); |
c528e179 | 1503 | |
19575c7c DS |
1504 | return result; |
1505 | } | |
1506 | ||
9218c6a4 TB |
1507 | int write_midx_file(const char *object_dir, |
1508 | const char *preferred_pack_name, | |
08944d1c | 1509 | const char *refs_snapshot, |
9218c6a4 | 1510 | unsigned flags) |
19575c7c | 1511 | { |
56d863e9 | 1512 | return write_midx_internal(object_dir, NULL, NULL, preferred_pack_name, |
08944d1c | 1513 | refs_snapshot, flags); |
56d863e9 TB |
1514 | } |
1515 | ||
1516 | int write_midx_file_only(const char *object_dir, | |
1517 | struct string_list *packs_to_include, | |
1518 | const char *preferred_pack_name, | |
08944d1c | 1519 | const char *refs_snapshot, |
56d863e9 TB |
1520 | unsigned flags) |
1521 | { | |
1522 | return write_midx_internal(object_dir, packs_to_include, NULL, | |
08944d1c | 1523 | preferred_pack_name, refs_snapshot, flags); |
a3407730 | 1524 | } |
525e18c0 | 1525 | |
38ff7cab TB |
1526 | struct clear_midx_data { |
1527 | char *keep; | |
1528 | const char *ext; | |
1529 | }; | |
1530 | ||
1531 | static void clear_midx_file_ext(const char *full_path, size_t full_path_len, | |
1532 | const char *file_name, void *_data) | |
1533 | { | |
1534 | struct clear_midx_data *data = _data; | |
1535 | ||
1536 | if (!(starts_with(file_name, "multi-pack-index-") && | |
1537 | ends_with(file_name, data->ext))) | |
1538 | return; | |
1539 | if (data->keep && !strcmp(data->keep, file_name)) | |
1540 | return; | |
1541 | ||
1542 | if (unlink(full_path)) | |
1543 | die_errno(_("failed to remove %s"), full_path); | |
1544 | } | |
1545 | ||
426c00e4 | 1546 | static void clear_midx_files_ext(const char *object_dir, const char *ext, |
38ff7cab TB |
1547 | unsigned char *keep_hash) |
1548 | { | |
1549 | struct clear_midx_data data; | |
1550 | memset(&data, 0, sizeof(struct clear_midx_data)); | |
1551 | ||
1552 | if (keep_hash) | |
1553 | data.keep = xstrfmt("multi-pack-index-%s%s", | |
1554 | hash_to_hex(keep_hash), ext); | |
1555 | data.ext = ext; | |
1556 | ||
426c00e4 | 1557 | for_each_file_in_pack_dir(object_dir, |
38ff7cab TB |
1558 | clear_midx_file_ext, |
1559 | &data); | |
1560 | ||
1561 | free(data.keep); | |
a3407730 | 1562 | } |
525e18c0 | 1563 | |
1dcd9f20 | 1564 | void clear_midx_file(struct repository *r) |
525e18c0 | 1565 | { |
60980aed TB |
1566 | struct strbuf midx = STRBUF_INIT; |
1567 | ||
1568 | get_midx_filename(&midx, r->objects->odb->path); | |
1dcd9f20 DS |
1569 | |
1570 | if (r->objects && r->objects->multi_pack_index) { | |
1571 | close_midx(r->objects->multi_pack_index); | |
1572 | r->objects->multi_pack_index = NULL; | |
1573 | } | |
525e18c0 | 1574 | |
60980aed TB |
1575 | if (remove_path(midx.buf)) |
1576 | die(_("failed to clear multi-pack-index at %s"), midx.buf); | |
525e18c0 | 1577 | |
c528e179 | 1578 | clear_midx_files_ext(r->objects->odb->path, ".bitmap", NULL); |
426c00e4 | 1579 | clear_midx_files_ext(r->objects->odb->path, ".rev", NULL); |
38ff7cab | 1580 | |
60980aed | 1581 | strbuf_release(&midx); |
525e18c0 | 1582 | } |
56ee7ff1 DS |
1583 | |
1584 | static int verify_midx_error; | |
1585 | ||
48ca53ca | 1586 | __attribute__((format (printf, 1, 2))) |
d4bf1d88 DS |
1587 | static void midx_report(const char *fmt, ...) |
1588 | { | |
1589 | va_list ap; | |
1590 | verify_midx_error = 1; | |
1591 | va_start(ap, fmt); | |
1592 | vfprintf(stderr, fmt, ap); | |
1593 | fprintf(stderr, "\n"); | |
1594 | va_end(ap); | |
1595 | } | |
1596 | ||
5ae18df9 JH |
1597 | struct pair_pos_vs_id |
1598 | { | |
1599 | uint32_t pos; | |
1600 | uint32_t pack_int_id; | |
1601 | }; | |
1602 | ||
1603 | static int compare_pair_pos_vs_id(const void *_a, const void *_b) | |
1604 | { | |
1605 | struct pair_pos_vs_id *a = (struct pair_pos_vs_id *)_a; | |
1606 | struct pair_pos_vs_id *b = (struct pair_pos_vs_id *)_b; | |
1607 | ||
1608 | return b->pack_int_id - a->pack_int_id; | |
1609 | } | |
1610 | ||
430efb8a JH |
1611 | /* |
1612 | * Limit calls to display_progress() for performance reasons. | |
1613 | * The interval here was arbitrarily chosen. | |
1614 | */ | |
1615 | #define SPARSE_PROGRESS_INTERVAL (1 << 12) | |
1616 | #define midx_display_sparse_progress(progress, n) \ | |
1617 | do { \ | |
1618 | uint64_t _n = (n); \ | |
1619 | if ((_n & (SPARSE_PROGRESS_INTERVAL - 1)) == 0) \ | |
1620 | display_progress(progress, _n); \ | |
1621 | } while (0) | |
1622 | ||
efbc3aee | 1623 | int verify_midx_file(struct repository *r, const char *object_dir, unsigned flags) |
56ee7ff1 | 1624 | { |
5ae18df9 | 1625 | struct pair_pos_vs_id *pairs = NULL; |
d4bf1d88 | 1626 | uint32_t i; |
ad60096d | 1627 | struct progress *progress = NULL; |
56ee7ff1 DS |
1628 | struct multi_pack_index *m = load_multi_pack_index(object_dir, 1); |
1629 | verify_midx_error = 0; | |
1630 | ||
d9607542 DS |
1631 | if (!m) { |
1632 | int result = 0; | |
1633 | struct stat sb; | |
60980aed TB |
1634 | struct strbuf filename = STRBUF_INIT; |
1635 | ||
1636 | get_midx_filename(&filename, object_dir); | |
1637 | ||
1638 | if (!stat(filename.buf, &sb)) { | |
d9607542 DS |
1639 | error(_("multi-pack-index file exists, but failed to parse")); |
1640 | result = 1; | |
1641 | } | |
60980aed | 1642 | strbuf_release(&filename); |
d9607542 DS |
1643 | return result; |
1644 | } | |
56ee7ff1 | 1645 | |
f89ecf79 TB |
1646 | if (!midx_checksum_valid(m)) |
1647 | midx_report(_("incorrect checksum")); | |
1648 | ||
ad60096d | 1649 | if (flags & MIDX_PROGRESS) |
efdd2f0d | 1650 | progress = start_delayed_progress(_("Looking for referenced packfiles"), |
ad60096d | 1651 | m->num_packs); |
d4bf1d88 | 1652 | for (i = 0; i < m->num_packs; i++) { |
64404a24 | 1653 | if (prepare_midx_pack(r, m, i)) |
d4bf1d88 | 1654 | midx_report("failed to load pack in position %d", i); |
430efb8a JH |
1655 | |
1656 | display_progress(progress, i + 1); | |
d4bf1d88 | 1657 | } |
430efb8a | 1658 | stop_progress(&progress); |
d4bf1d88 | 1659 | |
2f23d3f3 DS |
1660 | for (i = 0; i < 255; i++) { |
1661 | uint32_t oid_fanout1 = ntohl(m->chunk_oid_fanout[i]); | |
1662 | uint32_t oid_fanout2 = ntohl(m->chunk_oid_fanout[i + 1]); | |
1663 | ||
1664 | if (oid_fanout1 > oid_fanout2) | |
1665 | midx_report(_("oid fanout out of order: fanout[%d] = %"PRIx32" > %"PRIx32" = fanout[%d]"), | |
1666 | i, oid_fanout1, oid_fanout2, i + 1); | |
1667 | } | |
1668 | ||
796d61cd DR |
1669 | if (m->num_objects == 0) { |
1670 | midx_report(_("the midx contains no oid")); | |
1671 | /* | |
1672 | * Remaining tests assume that we have objects, so we can | |
1673 | * return here. | |
1674 | */ | |
492cb394 | 1675 | goto cleanup; |
796d61cd DR |
1676 | } |
1677 | ||
ad60096d WB |
1678 | if (flags & MIDX_PROGRESS) |
1679 | progress = start_sparse_progress(_("Verifying OID order in multi-pack-index"), | |
1680 | m->num_objects - 1); | |
55c5648d DS |
1681 | for (i = 0; i < m->num_objects - 1; i++) { |
1682 | struct object_id oid1, oid2; | |
1683 | ||
1684 | nth_midxed_object_oid(&oid1, m, i); | |
1685 | nth_midxed_object_oid(&oid2, m, i + 1); | |
1686 | ||
1687 | if (oidcmp(&oid1, &oid2) >= 0) | |
1688 | midx_report(_("oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"), | |
1689 | i, oid_to_hex(&oid1), oid_to_hex(&oid2), i + 1); | |
430efb8a JH |
1690 | |
1691 | midx_display_sparse_progress(progress, i + 1); | |
55c5648d | 1692 | } |
430efb8a | 1693 | stop_progress(&progress); |
55c5648d | 1694 | |
5ae18df9 JH |
1695 | /* |
1696 | * Create an array mapping each object to its packfile id. Sort it | |
1697 | * to group the objects by packfile. Use this permutation to visit | |
1698 | * each of the objects and only require 1 packfile to be open at a | |
1699 | * time. | |
1700 | */ | |
1701 | ALLOC_ARRAY(pairs, m->num_objects); | |
1702 | for (i = 0; i < m->num_objects; i++) { | |
1703 | pairs[i].pos = i; | |
1704 | pairs[i].pack_int_id = nth_midxed_pack_int_id(m, i); | |
1705 | } | |
1706 | ||
ad60096d WB |
1707 | if (flags & MIDX_PROGRESS) |
1708 | progress = start_sparse_progress(_("Sorting objects by packfile"), | |
1709 | m->num_objects); | |
5ae18df9 JH |
1710 | display_progress(progress, 0); /* TODO: Measure QSORT() progress */ |
1711 | QSORT(pairs, m->num_objects, compare_pair_pos_vs_id); | |
1712 | stop_progress(&progress); | |
1713 | ||
ad60096d WB |
1714 | if (flags & MIDX_PROGRESS) |
1715 | progress = start_sparse_progress(_("Verifying object offsets"), m->num_objects); | |
cc6af73c DS |
1716 | for (i = 0; i < m->num_objects; i++) { |
1717 | struct object_id oid; | |
1718 | struct pack_entry e; | |
1719 | off_t m_offset, p_offset; | |
1720 | ||
5ae18df9 JH |
1721 | if (i > 0 && pairs[i-1].pack_int_id != pairs[i].pack_int_id && |
1722 | m->packs[pairs[i-1].pack_int_id]) | |
1723 | { | |
1724 | close_pack_fd(m->packs[pairs[i-1].pack_int_id]); | |
1725 | close_pack_index(m->packs[pairs[i-1].pack_int_id]); | |
1726 | } | |
1727 | ||
1728 | nth_midxed_object_oid(&oid, m, pairs[i].pos); | |
1729 | ||
64404a24 | 1730 | if (!fill_midx_entry(r, &oid, &e, m)) { |
cc6af73c | 1731 | midx_report(_("failed to load pack entry for oid[%d] = %s"), |
5ae18df9 | 1732 | pairs[i].pos, oid_to_hex(&oid)); |
cc6af73c DS |
1733 | continue; |
1734 | } | |
1735 | ||
1736 | if (open_pack_index(e.p)) { | |
1737 | midx_report(_("failed to load pack-index for packfile %s"), | |
1738 | e.p->pack_name); | |
1739 | break; | |
1740 | } | |
1741 | ||
1742 | m_offset = e.offset; | |
1743 | p_offset = find_pack_entry_one(oid.hash, e.p); | |
1744 | ||
1745 | if (m_offset != p_offset) | |
1746 | midx_report(_("incorrect object offset for oid[%d] = %s: %"PRIx64" != %"PRIx64), | |
5ae18df9 | 1747 | pairs[i].pos, oid_to_hex(&oid), m_offset, p_offset); |
144d7033 | 1748 | |
430efb8a | 1749 | midx_display_sparse_progress(progress, i + 1); |
cc6af73c | 1750 | } |
144d7033 | 1751 | stop_progress(&progress); |
cc6af73c | 1752 | |
492cb394 | 1753 | cleanup: |
5ae18df9 | 1754 | free(pairs); |
492cb394 | 1755 | close_midx(m); |
5ae18df9 | 1756 | |
56ee7ff1 DS |
1757 | return verify_midx_error; |
1758 | } | |
cff97116 | 1759 | |
efbc3aee | 1760 | int expire_midx_packs(struct repository *r, const char *object_dir, unsigned flags) |
cff97116 | 1761 | { |
19575c7c DS |
1762 | uint32_t i, *count, result = 0; |
1763 | struct string_list packs_to_drop = STRING_LIST_INIT_DUP; | |
98926e0d | 1764 | struct multi_pack_index *m = lookup_multi_pack_index(r, object_dir); |
8dc18f89 | 1765 | struct progress *progress = NULL; |
19575c7c DS |
1766 | |
1767 | if (!m) | |
1768 | return 0; | |
1769 | ||
ca56dadb | 1770 | CALLOC_ARRAY(count, m->num_packs); |
8dc18f89 WB |
1771 | |
1772 | if (flags & MIDX_PROGRESS) | |
efdd2f0d | 1773 | progress = start_delayed_progress(_("Counting referenced objects"), |
8dc18f89 | 1774 | m->num_objects); |
19575c7c DS |
1775 | for (i = 0; i < m->num_objects; i++) { |
1776 | int pack_int_id = nth_midxed_pack_int_id(m, i); | |
1777 | count[pack_int_id]++; | |
8dc18f89 | 1778 | display_progress(progress, i + 1); |
19575c7c | 1779 | } |
8dc18f89 | 1780 | stop_progress(&progress); |
19575c7c | 1781 | |
8dc18f89 | 1782 | if (flags & MIDX_PROGRESS) |
efdd2f0d | 1783 | progress = start_delayed_progress(_("Finding and deleting unreferenced packfiles"), |
8dc18f89 | 1784 | m->num_packs); |
19575c7c DS |
1785 | for (i = 0; i < m->num_packs; i++) { |
1786 | char *pack_name; | |
8dc18f89 | 1787 | display_progress(progress, i + 1); |
19575c7c DS |
1788 | |
1789 | if (count[i]) | |
1790 | continue; | |
1791 | ||
1792 | if (prepare_midx_pack(r, m, i)) | |
1793 | continue; | |
1794 | ||
1795 | if (m->packs[i]->pack_keep) | |
1796 | continue; | |
1797 | ||
1798 | pack_name = xstrdup(m->packs[i]->pack_name); | |
1799 | close_pack(m->packs[i]); | |
1800 | ||
1801 | string_list_insert(&packs_to_drop, m->pack_names[i]); | |
1802 | unlink_pack_path(pack_name, 0); | |
1803 | free(pack_name); | |
1804 | } | |
8dc18f89 | 1805 | stop_progress(&progress); |
19575c7c DS |
1806 | |
1807 | free(count); | |
1808 | ||
98926e0d | 1809 | if (packs_to_drop.nr) |
08944d1c | 1810 | result = write_midx_internal(object_dir, NULL, &packs_to_drop, NULL, NULL, flags); |
19575c7c DS |
1811 | |
1812 | string_list_clear(&packs_to_drop, 0); | |
98926e0d | 1813 | |
19575c7c | 1814 | return result; |
cff97116 | 1815 | } |
2af890bb | 1816 | |
ce1e4a10 DS |
1817 | struct repack_info { |
1818 | timestamp_t mtime; | |
1819 | uint32_t referenced_objects; | |
1820 | uint32_t pack_int_id; | |
1821 | }; | |
1822 | ||
1823 | static int compare_by_mtime(const void *a_, const void *b_) | |
2af890bb | 1824 | { |
ce1e4a10 DS |
1825 | const struct repack_info *a, *b; |
1826 | ||
1827 | a = (const struct repack_info *)a_; | |
1828 | b = (const struct repack_info *)b_; | |
1829 | ||
1830 | if (a->mtime < b->mtime) | |
1831 | return -1; | |
1832 | if (a->mtime > b->mtime) | |
1833 | return 1; | |
1834 | return 0; | |
1835 | } | |
1836 | ||
3ce4ca0a DS |
1837 | static int fill_included_packs_all(struct repository *r, |
1838 | struct multi_pack_index *m, | |
ce1e4a10 DS |
1839 | unsigned char *include_pack) |
1840 | { | |
3ce4ca0a DS |
1841 | uint32_t i, count = 0; |
1842 | int pack_kept_objects = 0; | |
1843 | ||
1844 | repo_config_get_bool(r, "repack.packkeptobjects", &pack_kept_objects); | |
1845 | ||
1846 | for (i = 0; i < m->num_packs; i++) { | |
1847 | if (prepare_midx_pack(r, m, i)) | |
1848 | continue; | |
1849 | if (!pack_kept_objects && m->packs[i]->pack_keep) | |
1850 | continue; | |
ce1e4a10 | 1851 | |
ce1e4a10 | 1852 | include_pack[i] = 1; |
3ce4ca0a DS |
1853 | count++; |
1854 | } | |
ce1e4a10 | 1855 | |
3ce4ca0a | 1856 | return count < 2; |
ce1e4a10 DS |
1857 | } |
1858 | ||
1859 | static int fill_included_packs_batch(struct repository *r, | |
1860 | struct multi_pack_index *m, | |
1861 | unsigned char *include_pack, | |
1862 | size_t batch_size) | |
1863 | { | |
1864 | uint32_t i, packs_to_repack; | |
1865 | size_t total_size; | |
1866 | struct repack_info *pack_info = xcalloc(m->num_packs, sizeof(struct repack_info)); | |
3ce4ca0a DS |
1867 | int pack_kept_objects = 0; |
1868 | ||
1869 | repo_config_get_bool(r, "repack.packkeptobjects", &pack_kept_objects); | |
ce1e4a10 DS |
1870 | |
1871 | for (i = 0; i < m->num_packs; i++) { | |
1872 | pack_info[i].pack_int_id = i; | |
1873 | ||
1874 | if (prepare_midx_pack(r, m, i)) | |
1875 | continue; | |
1876 | ||
1877 | pack_info[i].mtime = m->packs[i]->mtime; | |
1878 | } | |
1879 | ||
1880 | for (i = 0; batch_size && i < m->num_objects; i++) { | |
1881 | uint32_t pack_int_id = nth_midxed_pack_int_id(m, i); | |
1882 | pack_info[pack_int_id].referenced_objects++; | |
1883 | } | |
1884 | ||
1885 | QSORT(pack_info, m->num_packs, compare_by_mtime); | |
1886 | ||
1887 | total_size = 0; | |
1888 | packs_to_repack = 0; | |
1889 | for (i = 0; total_size < batch_size && i < m->num_packs; i++) { | |
1890 | int pack_int_id = pack_info[i].pack_int_id; | |
1891 | struct packed_git *p = m->packs[pack_int_id]; | |
1892 | size_t expected_size; | |
1893 | ||
1894 | if (!p) | |
1895 | continue; | |
3ce4ca0a DS |
1896 | if (!pack_kept_objects && p->pack_keep) |
1897 | continue; | |
ce1e4a10 DS |
1898 | if (open_pack_index(p) || !p->num_objects) |
1899 | continue; | |
1900 | ||
1901 | expected_size = (size_t)(p->pack_size | |
1902 | * pack_info[i].referenced_objects); | |
1903 | expected_size /= p->num_objects; | |
1904 | ||
1905 | if (expected_size >= batch_size) | |
1906 | continue; | |
1907 | ||
1908 | packs_to_repack++; | |
1909 | total_size += expected_size; | |
1910 | include_pack[pack_int_id] = 1; | |
1911 | } | |
1912 | ||
1913 | free(pack_info); | |
1914 | ||
1eb22c7d | 1915 | if (packs_to_repack < 2) |
ce1e4a10 DS |
1916 | return 1; |
1917 | ||
2af890bb DS |
1918 | return 0; |
1919 | } | |
ce1e4a10 | 1920 | |
efbc3aee | 1921 | int midx_repack(struct repository *r, const char *object_dir, size_t batch_size, unsigned flags) |
ce1e4a10 DS |
1922 | { |
1923 | int result = 0; | |
1924 | uint32_t i; | |
1925 | unsigned char *include_pack; | |
1926 | struct child_process cmd = CHILD_PROCESS_INIT; | |
6af3b00a | 1927 | FILE *cmd_in; |
ce1e4a10 | 1928 | struct strbuf base_name = STRBUF_INIT; |
c0f1f9de | 1929 | struct multi_pack_index *m = lookup_multi_pack_index(r, object_dir); |
ce1e4a10 | 1930 | |
e11d86de SLN |
1931 | /* |
1932 | * When updating the default for these configuration | |
1933 | * variables in builtin/repack.c, these must be adjusted | |
1934 | * to match. | |
1935 | */ | |
1936 | int delta_base_offset = 1; | |
1937 | int use_delta_islands = 0; | |
1938 | ||
ce1e4a10 DS |
1939 | if (!m) |
1940 | return 0; | |
1941 | ||
ca56dadb | 1942 | CALLOC_ARRAY(include_pack, m->num_packs); |
ce1e4a10 DS |
1943 | |
1944 | if (batch_size) { | |
1945 | if (fill_included_packs_batch(r, m, include_pack, batch_size)) | |
1946 | goto cleanup; | |
3ce4ca0a | 1947 | } else if (fill_included_packs_all(r, m, include_pack)) |
ce1e4a10 DS |
1948 | goto cleanup; |
1949 | ||
e11d86de SLN |
1950 | repo_config_get_bool(r, "repack.usedeltabaseoffset", &delta_base_offset); |
1951 | repo_config_get_bool(r, "repack.usedeltaislands", &use_delta_islands); | |
1952 | ||
c972bf4c | 1953 | strvec_push(&cmd.args, "pack-objects"); |
ce1e4a10 DS |
1954 | |
1955 | strbuf_addstr(&base_name, object_dir); | |
1956 | strbuf_addstr(&base_name, "/pack/pack"); | |
c972bf4c | 1957 | strvec_push(&cmd.args, base_name.buf); |
64d80e7d | 1958 | |
e11d86de | 1959 | if (delta_base_offset) |
c972bf4c | 1960 | strvec_push(&cmd.args, "--delta-base-offset"); |
e11d86de | 1961 | if (use_delta_islands) |
c972bf4c | 1962 | strvec_push(&cmd.args, "--delta-islands"); |
e11d86de | 1963 | |
64d80e7d | 1964 | if (flags & MIDX_PROGRESS) |
c972bf4c | 1965 | strvec_push(&cmd.args, "--progress"); |
64d80e7d | 1966 | else |
c972bf4c | 1967 | strvec_push(&cmd.args, "-q"); |
64d80e7d | 1968 | |
ce1e4a10 DS |
1969 | strbuf_release(&base_name); |
1970 | ||
1971 | cmd.git_cmd = 1; | |
1972 | cmd.in = cmd.out = -1; | |
1973 | ||
1974 | if (start_command(&cmd)) { | |
1975 | error(_("could not start pack-objects")); | |
1976 | result = 1; | |
1977 | goto cleanup; | |
1978 | } | |
1979 | ||
6af3b00a RS |
1980 | cmd_in = xfdopen(cmd.in, "w"); |
1981 | ||
ce1e4a10 DS |
1982 | for (i = 0; i < m->num_objects; i++) { |
1983 | struct object_id oid; | |
1984 | uint32_t pack_int_id = nth_midxed_pack_int_id(m, i); | |
1985 | ||
1986 | if (!include_pack[pack_int_id]) | |
1987 | continue; | |
1988 | ||
1989 | nth_midxed_object_oid(&oid, m, i); | |
6af3b00a | 1990 | fprintf(cmd_in, "%s\n", oid_to_hex(&oid)); |
ce1e4a10 | 1991 | } |
6af3b00a | 1992 | fclose(cmd_in); |
ce1e4a10 DS |
1993 | |
1994 | if (finish_command(&cmd)) { | |
1995 | error(_("could not finish pack-objects")); | |
1996 | result = 1; | |
1997 | goto cleanup; | |
1998 | } | |
1999 | ||
08944d1c | 2000 | result = write_midx_internal(object_dir, NULL, NULL, NULL, NULL, flags); |
ce1e4a10 DS |
2001 | |
2002 | cleanup: | |
ce1e4a10 DS |
2003 | free(include_pack); |
2004 | return result; | |
2005 | } |