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