Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1 | #include "cache.h" |
| 2 | #include "commit.h" |
| 3 | #include "tag.h" |
| 4 | #include "diff.h" |
| 5 | #include "revision.h" |
| 6 | #include "progress.h" |
| 7 | #include "list-objects.h" |
| 8 | #include "pack.h" |
| 9 | #include "pack-bitmap.h" |
| 10 | #include "pack-revindex.h" |
| 11 | #include "pack-objects.h" |
Jonathan Tan | 0317f45 | 2017-08-18 15:20:19 -0700 | [diff] [blame] | 12 | #include "packfile.h" |
Stefan Beller | a80d72d | 2018-03-23 18:20:59 +0100 | [diff] [blame] | 13 | #include "repository.h" |
| 14 | #include "object-store.h" |
Jeff King | 6663ae0 | 2020-02-14 13:22:29 -0500 | [diff] [blame] | 15 | #include "list-objects-filter-options.h" |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 16 | #include "midx.h" |
Taylor Blau | 3f267a1 | 2021-03-31 21:32:14 -0400 | [diff] [blame] | 17 | #include "config.h" |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 18 | |
| 19 | /* |
| 20 | * An entry on the bitmap index, representing the bitmap for a given |
| 21 | * commit. |
| 22 | */ |
| 23 | struct stored_bitmap { |
brian m. carlson | 5363653 | 2019-02-19 00:04:55 +0000 | [diff] [blame] | 24 | struct object_id oid; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 25 | struct ewah_bitmap *root; |
| 26 | struct stored_bitmap *xor; |
| 27 | int flags; |
| 28 | }; |
| 29 | |
| 30 | /* |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 31 | * The active bitmap index for a repository. By design, repositories only have |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 32 | * a single bitmap index available (the index for the biggest packfile in |
| 33 | * the repository), since bitmap indexes need full closure. |
| 34 | * |
| 35 | * If there is more than one bitmap index available (e.g. because of alternates), |
| 36 | * the active bitmap index is the largest one. |
| 37 | */ |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 38 | struct bitmap_index { |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 39 | /* |
| 40 | * The pack or multi-pack index (MIDX) that this bitmap index belongs |
| 41 | * to. |
| 42 | * |
| 43 | * Exactly one of these must be non-NULL; this specifies the object |
| 44 | * order used to interpret this bitmap. |
| 45 | */ |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 46 | struct packed_git *pack; |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 47 | struct multi_pack_index *midx; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 48 | |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 49 | /* |
| 50 | * Mark the first `reuse_objects` in the packfile as reused: |
| 51 | * they will be sent as-is without using them for repacking |
| 52 | * calculations |
| 53 | */ |
| 54 | uint32_t reuse_objects; |
| 55 | |
| 56 | /* mmapped buffer of the whole bitmap index */ |
| 57 | unsigned char *map; |
| 58 | size_t map_size; /* size of the mmaped buffer */ |
| 59 | size_t map_pos; /* current position when loading the index */ |
| 60 | |
| 61 | /* |
| 62 | * Type indexes. |
| 63 | * |
| 64 | * Each bitmap marks which objects in the packfile are of the given |
| 65 | * type. This provides type information when yielding the objects from |
| 66 | * the packfile during a walk, which allows for better delta bases. |
| 67 | */ |
| 68 | struct ewah_bitmap *commits; |
| 69 | struct ewah_bitmap *trees; |
| 70 | struct ewah_bitmap *blobs; |
| 71 | struct ewah_bitmap *tags; |
| 72 | |
brian m. carlson | 3c77144 | 2019-02-19 00:04:58 +0000 | [diff] [blame] | 73 | /* Map from object ID -> `stored_bitmap` for all the bitmapped commits */ |
| 74 | kh_oid_map_t *bitmaps; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 75 | |
| 76 | /* Number of bitmapped commits */ |
| 77 | uint32_t entry_count; |
| 78 | |
Jonathan Tan | f3c23db | 2018-06-07 12:04:14 -0700 | [diff] [blame] | 79 | /* If not NULL, this is a name-hash cache pointing into map. */ |
Vicent Marti | ae4f07f | 2013-12-21 09:00:45 -0500 | [diff] [blame] | 80 | uint32_t *hashes; |
| 81 | |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 82 | /* The checksum of the packfile or MIDX; points into map. */ |
| 83 | const unsigned char *checksum; |
| 84 | |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 85 | /* |
| 86 | * Extended index. |
| 87 | * |
| 88 | * When trying to perform bitmap operations with objects that are not |
| 89 | * packed in `pack`, these objects are added to this "fake index" and |
| 90 | * are assumed to appear at the end of the packfile for all operations |
| 91 | */ |
| 92 | struct eindex { |
| 93 | struct object **objects; |
| 94 | uint32_t *hashes; |
| 95 | uint32_t count, alloc; |
brian m. carlson | 3c77144 | 2019-02-19 00:04:58 +0000 | [diff] [blame] | 96 | kh_oid_pos_t *positions; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 97 | } ext_index; |
| 98 | |
| 99 | /* Bitmap result of the last performed walk */ |
| 100 | struct bitmap *result; |
| 101 | |
Jeff King | 30cdc33 | 2018-08-21 15:07:01 -0400 | [diff] [blame] | 102 | /* "have" bitmap from the last performed walk */ |
| 103 | struct bitmap *haves; |
| 104 | |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 105 | /* Version of the bitmap index */ |
| 106 | unsigned int version; |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 107 | }; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 108 | |
| 109 | static struct ewah_bitmap *lookup_stored_bitmap(struct stored_bitmap *st) |
| 110 | { |
| 111 | struct ewah_bitmap *parent; |
| 112 | struct ewah_bitmap *composed; |
| 113 | |
Junio C Hamano | afe8a90 | 2022-05-02 09:50:37 -0700 | [diff] [blame] | 114 | if (!st->xor) |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 115 | return st->root; |
| 116 | |
| 117 | composed = ewah_pool_new(); |
| 118 | parent = lookup_stored_bitmap(st->xor); |
| 119 | ewah_xor(st->root, parent, composed); |
| 120 | |
| 121 | ewah_pool_free(st->root); |
| 122 | st->root = composed; |
| 123 | st->xor = NULL; |
| 124 | |
| 125 | return composed; |
| 126 | } |
| 127 | |
| 128 | /* |
| 129 | * Read a bitmap from the current read position on the mmaped |
| 130 | * index, and increase the read position accordingly |
| 131 | */ |
| 132 | static struct ewah_bitmap *read_bitmap_1(struct bitmap_index *index) |
| 133 | { |
| 134 | struct ewah_bitmap *b = ewah_pool_new(); |
| 135 | |
Jeff King | 1140bf0 | 2018-06-14 23:44:43 -0400 | [diff] [blame] | 136 | ssize_t bitmap_size = ewah_read_mmap(b, |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 137 | index->map + index->map_pos, |
| 138 | index->map_size - index->map_pos); |
| 139 | |
| 140 | if (bitmap_size < 0) { |
| 141 | error("Failed to load bitmap index (corrupted?)"); |
| 142 | ewah_pool_free(b); |
| 143 | return NULL; |
| 144 | } |
| 145 | |
| 146 | index->map_pos += bitmap_size; |
| 147 | return b; |
| 148 | } |
| 149 | |
Taylor Blau | ed18462 | 2021-08-31 16:52:12 -0400 | [diff] [blame] | 150 | static uint32_t bitmap_num_objects(struct bitmap_index *index) |
| 151 | { |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 152 | if (index->midx) |
| 153 | return index->midx->num_objects; |
Taylor Blau | ed18462 | 2021-08-31 16:52:12 -0400 | [diff] [blame] | 154 | return index->pack->num_objects; |
| 155 | } |
| 156 | |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 157 | static int load_bitmap_header(struct bitmap_index *index) |
| 158 | { |
| 159 | struct bitmap_disk_header *header = (void *)index->map; |
Jeff King | ca51090 | 2020-12-08 17:03:19 -0500 | [diff] [blame] | 160 | size_t header_size = sizeof(*header) - GIT_MAX_RAWSZ + the_hash_algo->rawsz; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 161 | |
Jeff King | ca51090 | 2020-12-08 17:03:19 -0500 | [diff] [blame] | 162 | if (index->map_size < header_size + the_hash_algo->rawsz) |
| 163 | return error("Corrupted bitmap index (too small)"); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 164 | |
| 165 | if (memcmp(header->magic, BITMAP_IDX_SIGNATURE, sizeof(BITMAP_IDX_SIGNATURE)) != 0) |
| 166 | return error("Corrupted bitmap index file (wrong header)"); |
| 167 | |
| 168 | index->version = ntohs(header->version); |
| 169 | if (index->version != 1) |
| 170 | return error("Unsupported version for bitmap index file (%d)", index->version); |
| 171 | |
| 172 | /* Parse known bitmap format options */ |
| 173 | { |
| 174 | uint32_t flags = ntohs(header->options); |
Taylor Blau | ed18462 | 2021-08-31 16:52:12 -0400 | [diff] [blame] | 175 | size_t cache_size = st_mult(bitmap_num_objects(index), sizeof(uint32_t)); |
Jeff King | ec6c7b4 | 2020-12-08 17:03:24 -0500 | [diff] [blame] | 176 | unsigned char *index_end = index->map + index->map_size - the_hash_algo->rawsz; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 177 | |
| 178 | if ((flags & BITMAP_OPT_FULL_DAG) == 0) |
| 179 | return error("Unsupported options for bitmap index file " |
| 180 | "(Git requires BITMAP_OPT_FULL_DAG)"); |
Vicent Marti | ae4f07f | 2013-12-21 09:00:45 -0500 | [diff] [blame] | 181 | |
| 182 | if (flags & BITMAP_OPT_HASH_CACHE) { |
Jeff King | ec6c7b4 | 2020-12-08 17:03:24 -0500 | [diff] [blame] | 183 | if (cache_size > index_end - index->map - header_size) |
| 184 | return error("corrupted bitmap index file (too short to fit hash cache)"); |
| 185 | index->hashes = (void *)(index_end - cache_size); |
| 186 | index_end -= cache_size; |
Vicent Marti | ae4f07f | 2013-12-21 09:00:45 -0500 | [diff] [blame] | 187 | } |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 188 | } |
| 189 | |
| 190 | index->entry_count = ntohl(header->entry_count); |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 191 | index->checksum = header->checksum; |
Jeff King | ca51090 | 2020-12-08 17:03:19 -0500 | [diff] [blame] | 192 | index->map_pos += header_size; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 193 | return 0; |
| 194 | } |
| 195 | |
| 196 | static struct stored_bitmap *store_bitmap(struct bitmap_index *index, |
| 197 | struct ewah_bitmap *root, |
Jeff King | 500e4f2 | 2020-02-23 23:32:27 -0500 | [diff] [blame] | 198 | const struct object_id *oid, |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 199 | struct stored_bitmap *xor_with, |
| 200 | int flags) |
| 201 | { |
| 202 | struct stored_bitmap *stored; |
| 203 | khiter_t hash_pos; |
| 204 | int ret; |
| 205 | |
| 206 | stored = xmalloc(sizeof(struct stored_bitmap)); |
| 207 | stored->root = root; |
| 208 | stored->xor = xor_with; |
| 209 | stored->flags = flags; |
Jeff King | 500e4f2 | 2020-02-23 23:32:27 -0500 | [diff] [blame] | 210 | oidcpy(&stored->oid, oid); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 211 | |
brian m. carlson | 3c77144 | 2019-02-19 00:04:58 +0000 | [diff] [blame] | 212 | hash_pos = kh_put_oid_map(index->bitmaps, stored->oid, &ret); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 213 | |
| 214 | /* a 0 return code means the insertion succeeded with no changes, |
| 215 | * because the SHA1 already existed on the map. this is bad, there |
| 216 | * shouldn't be duplicated commits in the index */ |
| 217 | if (ret == 0) { |
Jeff King | 500e4f2 | 2020-02-23 23:32:27 -0500 | [diff] [blame] | 218 | error("Duplicate entry in bitmap index: %s", oid_to_hex(oid)); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 219 | return NULL; |
| 220 | } |
| 221 | |
| 222 | kh_value(index->bitmaps, hash_pos) = stored; |
| 223 | return stored; |
| 224 | } |
| 225 | |
Karsten Blees | b500721 | 2014-11-27 00:24:01 -0500 | [diff] [blame] | 226 | static inline uint32_t read_be32(const unsigned char *buffer, size_t *pos) |
| 227 | { |
| 228 | uint32_t result = get_be32(buffer + *pos); |
| 229 | (*pos) += sizeof(result); |
| 230 | return result; |
| 231 | } |
| 232 | |
| 233 | static inline uint8_t read_u8(const unsigned char *buffer, size_t *pos) |
| 234 | { |
| 235 | return buffer[(*pos)++]; |
| 236 | } |
| 237 | |
René Scharfe | 599dc76 | 2015-05-19 01:24:09 +0200 | [diff] [blame] | 238 | #define MAX_XOR_OFFSET 160 |
| 239 | |
Taylor Blau | 6b4277e | 2021-08-31 16:52:14 -0400 | [diff] [blame] | 240 | static int nth_bitmap_object_oid(struct bitmap_index *index, |
| 241 | struct object_id *oid, |
| 242 | uint32_t n) |
| 243 | { |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 244 | if (index->midx) |
| 245 | return nth_midxed_object_oid(oid, index->midx, n) ? 0 : -1; |
Taylor Blau | 6b4277e | 2021-08-31 16:52:14 -0400 | [diff] [blame] | 246 | return nth_packed_object_id(oid, index->pack, n); |
| 247 | } |
| 248 | |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 249 | static int load_bitmap_entries_v1(struct bitmap_index *index) |
| 250 | { |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 251 | uint32_t i; |
René Scharfe | 599dc76 | 2015-05-19 01:24:09 +0200 | [diff] [blame] | 252 | struct stored_bitmap *recent_bitmaps[MAX_XOR_OFFSET] = { NULL }; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 253 | |
| 254 | for (i = 0; i < index->entry_count; ++i) { |
| 255 | int xor_offset, flags; |
| 256 | struct ewah_bitmap *bitmap = NULL; |
| 257 | struct stored_bitmap *xor_bitmap = NULL; |
| 258 | uint32_t commit_idx_pos; |
Jeff King | 500e4f2 | 2020-02-23 23:32:27 -0500 | [diff] [blame] | 259 | struct object_id oid; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 260 | |
Taylor Blau | c6b0c39 | 2020-12-08 17:04:26 -0500 | [diff] [blame] | 261 | if (index->map_size - index->map_pos < 6) |
| 262 | return error("corrupt ewah bitmap: truncated header for entry %d", i); |
| 263 | |
Karsten Blees | b500721 | 2014-11-27 00:24:01 -0500 | [diff] [blame] | 264 | commit_idx_pos = read_be32(index->map, &index->map_pos); |
| 265 | xor_offset = read_u8(index->map, &index->map_pos); |
| 266 | flags = read_u8(index->map, &index->map_pos); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 267 | |
Taylor Blau | 6b4277e | 2021-08-31 16:52:14 -0400 | [diff] [blame] | 268 | if (nth_bitmap_object_oid(index, &oid, commit_idx_pos) < 0) |
Taylor Blau | c6b0c39 | 2020-12-08 17:04:26 -0500 | [diff] [blame] | 269 | return error("corrupt ewah bitmap: commit index %u out of range", |
| 270 | (unsigned)commit_idx_pos); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 271 | |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 272 | bitmap = read_bitmap_1(index); |
| 273 | if (!bitmap) |
| 274 | return -1; |
| 275 | |
| 276 | if (xor_offset > MAX_XOR_OFFSET || xor_offset > i) |
| 277 | return error("Corrupted bitmap pack index"); |
| 278 | |
| 279 | if (xor_offset > 0) { |
| 280 | xor_bitmap = recent_bitmaps[(i - xor_offset) % MAX_XOR_OFFSET]; |
| 281 | |
Junio C Hamano | afe8a90 | 2022-05-02 09:50:37 -0700 | [diff] [blame] | 282 | if (!xor_bitmap) |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 283 | return error("Invalid XOR offset in bitmap pack index"); |
| 284 | } |
| 285 | |
| 286 | recent_bitmaps[i % MAX_XOR_OFFSET] = store_bitmap( |
Jeff King | 500e4f2 | 2020-02-23 23:32:27 -0500 | [diff] [blame] | 287 | index, bitmap, &oid, xor_bitmap, flags); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 288 | } |
| 289 | |
| 290 | return 0; |
| 291 | } |
| 292 | |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 293 | char *midx_bitmap_filename(struct multi_pack_index *midx) |
| 294 | { |
Taylor Blau | 60980ae | 2021-10-26 17:01:21 -0400 | [diff] [blame] | 295 | struct strbuf buf = STRBUF_INIT; |
| 296 | |
| 297 | get_midx_filename(&buf, midx->object_dir); |
| 298 | strbuf_addf(&buf, "-%s.bitmap", hash_to_hex(get_midx_checksum(midx))); |
| 299 | |
| 300 | return strbuf_detach(&buf, NULL); |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 301 | } |
| 302 | |
| 303 | char *pack_bitmap_filename(struct packed_git *p) |
Junio C Hamano | cb46805 | 2015-01-14 15:40:53 -0800 | [diff] [blame] | 304 | { |
Jeff King | 9ae9701 | 2015-09-24 17:07:09 -0400 | [diff] [blame] | 305 | size_t len; |
Junio C Hamano | cb46805 | 2015-01-14 15:40:53 -0800 | [diff] [blame] | 306 | |
Jeff King | 9ae9701 | 2015-09-24 17:07:09 -0400 | [diff] [blame] | 307 | if (!strip_suffix(p->pack_name, ".pack", &len)) |
Johannes Schindelin | 033abf9 | 2018-05-02 11:38:39 +0200 | [diff] [blame] | 308 | BUG("pack_name does not end in .pack"); |
Jeff King | 9ae9701 | 2015-09-24 17:07:09 -0400 | [diff] [blame] | 309 | return xstrfmt("%.*s.bitmap", (int)len, p->pack_name); |
Junio C Hamano | cb46805 | 2015-01-14 15:40:53 -0800 | [diff] [blame] | 310 | } |
| 311 | |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 312 | static int open_midx_bitmap_1(struct bitmap_index *bitmap_git, |
| 313 | struct multi_pack_index *midx) |
| 314 | { |
| 315 | struct stat st; |
| 316 | char *idx_name = midx_bitmap_filename(midx); |
| 317 | int fd = git_open(idx_name); |
Taylor Blau | 44f9fd6 | 2022-05-24 14:54:22 -0400 | [diff] [blame] | 318 | uint32_t i; |
| 319 | struct packed_git *preferred; |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 320 | |
| 321 | free(idx_name); |
| 322 | |
| 323 | if (fd < 0) |
| 324 | return -1; |
| 325 | |
| 326 | if (fstat(fd, &st)) { |
| 327 | close(fd); |
| 328 | return -1; |
| 329 | } |
| 330 | |
| 331 | if (bitmap_git->pack || bitmap_git->midx) { |
Taylor Blau | 60980ae | 2021-10-26 17:01:21 -0400 | [diff] [blame] | 332 | struct strbuf buf = STRBUF_INIT; |
| 333 | get_midx_filename(&buf, midx->object_dir); |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 334 | /* ignore extra bitmap file; we can only handle one */ |
Taylor Blau | 60980ae | 2021-10-26 17:01:21 -0400 | [diff] [blame] | 335 | warning("ignoring extra bitmap file: %s", buf.buf); |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 336 | close(fd); |
Taylor Blau | 60980ae | 2021-10-26 17:01:21 -0400 | [diff] [blame] | 337 | strbuf_release(&buf); |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 338 | return -1; |
| 339 | } |
| 340 | |
| 341 | bitmap_git->midx = midx; |
| 342 | bitmap_git->map_size = xsize_t(st.st_size); |
| 343 | bitmap_git->map_pos = 0; |
| 344 | bitmap_git->map = xmmap(NULL, bitmap_git->map_size, PROT_READ, |
| 345 | MAP_PRIVATE, fd, 0); |
| 346 | close(fd); |
| 347 | |
| 348 | if (load_bitmap_header(bitmap_git) < 0) |
| 349 | goto cleanup; |
| 350 | |
| 351 | if (!hasheq(get_midx_checksum(bitmap_git->midx), bitmap_git->checksum)) |
| 352 | goto cleanup; |
| 353 | |
| 354 | if (load_midx_revindex(bitmap_git->midx) < 0) { |
| 355 | warning(_("multi-pack bitmap is missing required reverse index")); |
| 356 | goto cleanup; |
| 357 | } |
Taylor Blau | 44f9fd6 | 2022-05-24 14:54:22 -0400 | [diff] [blame] | 358 | |
| 359 | for (i = 0; i < bitmap_git->midx->num_packs; i++) { |
| 360 | if (prepare_midx_pack(the_repository, bitmap_git->midx, i)) |
| 361 | die(_("could not open pack %s"), |
| 362 | bitmap_git->midx->pack_names[i]); |
| 363 | } |
| 364 | |
| 365 | preferred = bitmap_git->midx->packs[midx_preferred_pack(bitmap_git)]; |
| 366 | if (!is_pack_valid(preferred)) { |
| 367 | warning(_("preferred pack (%s) is invalid"), |
| 368 | preferred->pack_name); |
| 369 | goto cleanup; |
| 370 | } |
| 371 | |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 372 | return 0; |
| 373 | |
| 374 | cleanup: |
| 375 | munmap(bitmap_git->map, bitmap_git->map_size); |
| 376 | bitmap_git->map_size = 0; |
Taylor Blau | f8b60cf | 2022-01-25 17:41:20 -0500 | [diff] [blame] | 377 | bitmap_git->map_pos = 0; |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 378 | bitmap_git->map = NULL; |
Taylor Blau | f8b60cf | 2022-01-25 17:41:20 -0500 | [diff] [blame] | 379 | bitmap_git->midx = NULL; |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 380 | return -1; |
| 381 | } |
| 382 | |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 383 | static int open_pack_bitmap_1(struct bitmap_index *bitmap_git, struct packed_git *packfile) |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 384 | { |
| 385 | int fd; |
| 386 | struct stat st; |
| 387 | char *idx_name; |
| 388 | |
| 389 | if (open_pack_index(packfile)) |
| 390 | return -1; |
| 391 | |
| 392 | idx_name = pack_bitmap_filename(packfile); |
Lars Schneider | a5436b5 | 2016-10-24 20:02:59 +0200 | [diff] [blame] | 393 | fd = git_open(idx_name); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 394 | free(idx_name); |
| 395 | |
| 396 | if (fd < 0) |
| 397 | return -1; |
| 398 | |
| 399 | if (fstat(fd, &st)) { |
| 400 | close(fd); |
| 401 | return -1; |
| 402 | } |
| 403 | |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 404 | if (bitmap_git->pack || bitmap_git->midx) { |
| 405 | /* ignore extra bitmap file; we can only handle one */ |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 406 | warning("ignoring extra bitmap file: %s", packfile->pack_name); |
| 407 | close(fd); |
| 408 | return -1; |
| 409 | } |
| 410 | |
Jeff King | dc1daac | 2021-07-23 05:29:34 -0400 | [diff] [blame] | 411 | if (!is_pack_valid(packfile)) { |
| 412 | close(fd); |
| 413 | return -1; |
| 414 | } |
| 415 | |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 416 | bitmap_git->pack = packfile; |
| 417 | bitmap_git->map_size = xsize_t(st.st_size); |
| 418 | bitmap_git->map = xmmap(NULL, bitmap_git->map_size, PROT_READ, MAP_PRIVATE, fd, 0); |
| 419 | bitmap_git->map_pos = 0; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 420 | close(fd); |
| 421 | |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 422 | if (load_bitmap_header(bitmap_git) < 0) { |
| 423 | munmap(bitmap_git->map, bitmap_git->map_size); |
| 424 | bitmap_git->map = NULL; |
| 425 | bitmap_git->map_size = 0; |
Taylor Blau | f8b60cf | 2022-01-25 17:41:20 -0500 | [diff] [blame] | 426 | bitmap_git->map_pos = 0; |
| 427 | bitmap_git->pack = NULL; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 428 | return -1; |
| 429 | } |
| 430 | |
| 431 | return 0; |
| 432 | } |
| 433 | |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 434 | static int load_reverse_index(struct bitmap_index *bitmap_git) |
| 435 | { |
| 436 | if (bitmap_is_midx(bitmap_git)) { |
| 437 | uint32_t i; |
| 438 | int ret; |
| 439 | |
| 440 | /* |
| 441 | * The multi-pack-index's .rev file is already loaded via |
| 442 | * open_pack_bitmap_1(). |
| 443 | * |
| 444 | * But we still need to open the individual pack .rev files, |
| 445 | * since we will need to make use of them in pack-objects. |
| 446 | */ |
| 447 | for (i = 0; i < bitmap_git->midx->num_packs; i++) { |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 448 | ret = load_pack_revindex(bitmap_git->midx->packs[i]); |
| 449 | if (ret) |
| 450 | return ret; |
| 451 | } |
| 452 | return 0; |
| 453 | } |
| 454 | return load_pack_revindex(bitmap_git->pack); |
| 455 | } |
| 456 | |
| 457 | static int load_bitmap(struct bitmap_index *bitmap_git) |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 458 | { |
Jeff King | 199c86b | 2018-09-01 03:50:57 -0400 | [diff] [blame] | 459 | assert(bitmap_git->map); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 460 | |
brian m. carlson | 3c77144 | 2019-02-19 00:04:58 +0000 | [diff] [blame] | 461 | bitmap_git->bitmaps = kh_init_oid_map(); |
| 462 | bitmap_git->ext_index.positions = kh_init_oid_pos(); |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 463 | |
| 464 | if (load_reverse_index(bitmap_git)) |
Jeff King | 4828ce9 | 2019-04-05 14:04:24 -0400 | [diff] [blame] | 465 | goto failed; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 466 | |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 467 | if (!(bitmap_git->commits = read_bitmap_1(bitmap_git)) || |
| 468 | !(bitmap_git->trees = read_bitmap_1(bitmap_git)) || |
| 469 | !(bitmap_git->blobs = read_bitmap_1(bitmap_git)) || |
| 470 | !(bitmap_git->tags = read_bitmap_1(bitmap_git))) |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 471 | goto failed; |
| 472 | |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 473 | if (load_bitmap_entries_v1(bitmap_git) < 0) |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 474 | goto failed; |
| 475 | |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 476 | return 0; |
| 477 | |
| 478 | failed: |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 479 | munmap(bitmap_git->map, bitmap_git->map_size); |
| 480 | bitmap_git->map = NULL; |
| 481 | bitmap_git->map_size = 0; |
Jeff King | bb514de | 2019-12-18 12:25:45 +0100 | [diff] [blame] | 482 | |
| 483 | kh_destroy_oid_map(bitmap_git->bitmaps); |
| 484 | bitmap_git->bitmaps = NULL; |
| 485 | |
| 486 | kh_destroy_oid_pos(bitmap_git->ext_index.positions); |
| 487 | bitmap_git->ext_index.positions = NULL; |
| 488 | |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 489 | return -1; |
| 490 | } |
| 491 | |
Nguyễn Thái Ngọc Duy | 7c14112 | 2018-11-10 06:49:08 +0100 | [diff] [blame] | 492 | static int open_pack_bitmap(struct repository *r, |
| 493 | struct bitmap_index *bitmap_git) |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 494 | { |
| 495 | struct packed_git *p; |
| 496 | int ret = -1; |
| 497 | |
Jeff King | 199c86b | 2018-09-01 03:50:57 -0400 | [diff] [blame] | 498 | assert(!bitmap_git->map); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 499 | |
Nguyễn Thái Ngọc Duy | 7c14112 | 2018-11-10 06:49:08 +0100 | [diff] [blame] | 500 | for (p = get_all_packs(r); p; p = p->next) { |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 501 | if (open_pack_bitmap_1(bitmap_git, p) == 0) |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 502 | ret = 0; |
| 503 | } |
| 504 | |
| 505 | return ret; |
| 506 | } |
| 507 | |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 508 | static int open_midx_bitmap(struct repository *r, |
| 509 | struct bitmap_index *bitmap_git) |
| 510 | { |
| 511 | struct multi_pack_index *midx; |
| 512 | |
| 513 | assert(!bitmap_git->map); |
| 514 | |
| 515 | for (midx = get_multi_pack_index(r); midx; midx = midx->next) { |
| 516 | if (!open_midx_bitmap_1(bitmap_git, midx)) |
| 517 | return 0; |
| 518 | } |
| 519 | return -1; |
| 520 | } |
| 521 | |
| 522 | static int open_bitmap(struct repository *r, |
| 523 | struct bitmap_index *bitmap_git) |
| 524 | { |
| 525 | assert(!bitmap_git->map); |
| 526 | |
| 527 | if (!open_midx_bitmap(r, bitmap_git)) |
| 528 | return 0; |
| 529 | return open_pack_bitmap(r, bitmap_git); |
| 530 | } |
| 531 | |
Nguyễn Thái Ngọc Duy | 7c14112 | 2018-11-10 06:49:08 +0100 | [diff] [blame] | 532 | struct bitmap_index *prepare_bitmap_git(struct repository *r) |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 533 | { |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 534 | struct bitmap_index *bitmap_git = xcalloc(1, sizeof(*bitmap_git)); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 535 | |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 536 | if (!open_bitmap(r, bitmap_git) && !load_bitmap(bitmap_git)) |
| 537 | return bitmap_git; |
| 538 | |
| 539 | free_bitmap_index(bitmap_git); |
| 540 | return NULL; |
| 541 | } |
| 542 | |
Jeff King | bfbb60d | 2021-09-09 15:56:58 -0400 | [diff] [blame] | 543 | struct bitmap_index *prepare_midx_bitmap_git(struct multi_pack_index *midx) |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 544 | { |
| 545 | struct bitmap_index *bitmap_git = xcalloc(1, sizeof(*bitmap_git)); |
| 546 | |
| 547 | if (!open_midx_bitmap_1(bitmap_git, midx) && !load_bitmap(bitmap_git)) |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 548 | return bitmap_git; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 549 | |
Jonathan Tan | f3c23db | 2018-06-07 12:04:14 -0700 | [diff] [blame] | 550 | free_bitmap_index(bitmap_git); |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 551 | return NULL; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 552 | } |
| 553 | |
| 554 | struct include_data { |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 555 | struct bitmap_index *bitmap_git; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 556 | struct bitmap *base; |
| 557 | struct bitmap *seen; |
| 558 | }; |
| 559 | |
Taylor Blau | 98c31f3 | 2020-12-08 17:05:09 -0500 | [diff] [blame] | 560 | struct ewah_bitmap *bitmap_for_commit(struct bitmap_index *bitmap_git, |
| 561 | struct commit *commit) |
| 562 | { |
| 563 | khiter_t hash_pos = kh_get_oid_map(bitmap_git->bitmaps, |
| 564 | commit->object.oid); |
| 565 | if (hash_pos >= kh_end(bitmap_git->bitmaps)) |
| 566 | return NULL; |
| 567 | return lookup_stored_bitmap(kh_value(bitmap_git->bitmaps, hash_pos)); |
| 568 | } |
| 569 | |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 570 | static inline int bitmap_position_extended(struct bitmap_index *bitmap_git, |
brian m. carlson | 3c77144 | 2019-02-19 00:04:58 +0000 | [diff] [blame] | 571 | const struct object_id *oid) |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 572 | { |
Jeff King | 4ed43d1 | 2019-06-20 03:41:25 -0400 | [diff] [blame] | 573 | kh_oid_pos_t *positions = bitmap_git->ext_index.positions; |
brian m. carlson | 3c77144 | 2019-02-19 00:04:58 +0000 | [diff] [blame] | 574 | khiter_t pos = kh_get_oid_pos(positions, *oid); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 575 | |
| 576 | if (pos < kh_end(positions)) { |
| 577 | int bitmap_pos = kh_value(positions, pos); |
Taylor Blau | ed18462 | 2021-08-31 16:52:12 -0400 | [diff] [blame] | 578 | return bitmap_pos + bitmap_num_objects(bitmap_git); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 579 | } |
| 580 | |
| 581 | return -1; |
| 582 | } |
| 583 | |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 584 | static inline int bitmap_position_packfile(struct bitmap_index *bitmap_git, |
brian m. carlson | 3c77144 | 2019-02-19 00:04:58 +0000 | [diff] [blame] | 585 | const struct object_id *oid) |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 586 | { |
Taylor Blau | 5766508 | 2021-01-13 17:23:52 -0500 | [diff] [blame] | 587 | uint32_t pos; |
brian m. carlson | 3c77144 | 2019-02-19 00:04:58 +0000 | [diff] [blame] | 588 | off_t offset = find_pack_entry_one(oid->hash, bitmap_git->pack); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 589 | if (!offset) |
| 590 | return -1; |
| 591 | |
Taylor Blau | 5766508 | 2021-01-13 17:23:52 -0500 | [diff] [blame] | 592 | if (offset_to_pack_pos(bitmap_git->pack, offset, &pos) < 0) |
| 593 | return -1; |
| 594 | return pos; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 595 | } |
| 596 | |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 597 | static int bitmap_position_midx(struct bitmap_index *bitmap_git, |
| 598 | const struct object_id *oid) |
| 599 | { |
| 600 | uint32_t want, got; |
| 601 | if (!bsearch_midx(oid, bitmap_git->midx, &want)) |
| 602 | return -1; |
| 603 | |
| 604 | if (midx_to_pack_pos(bitmap_git->midx, want, &got) < 0) |
| 605 | return -1; |
| 606 | return got; |
| 607 | } |
| 608 | |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 609 | static int bitmap_position(struct bitmap_index *bitmap_git, |
brian m. carlson | 3c77144 | 2019-02-19 00:04:58 +0000 | [diff] [blame] | 610 | const struct object_id *oid) |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 611 | { |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 612 | int pos; |
| 613 | if (bitmap_is_midx(bitmap_git)) |
| 614 | pos = bitmap_position_midx(bitmap_git, oid); |
| 615 | else |
| 616 | pos = bitmap_position_packfile(bitmap_git, oid); |
brian m. carlson | 3c77144 | 2019-02-19 00:04:58 +0000 | [diff] [blame] | 617 | return (pos >= 0) ? pos : bitmap_position_extended(bitmap_git, oid); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 618 | } |
| 619 | |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 620 | static int ext_index_add_object(struct bitmap_index *bitmap_git, |
| 621 | struct object *object, const char *name) |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 622 | { |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 623 | struct eindex *eindex = &bitmap_git->ext_index; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 624 | |
| 625 | khiter_t hash_pos; |
| 626 | int hash_ret; |
| 627 | int bitmap_pos; |
| 628 | |
brian m. carlson | 3c77144 | 2019-02-19 00:04:58 +0000 | [diff] [blame] | 629 | hash_pos = kh_put_oid_pos(eindex->positions, object->oid, &hash_ret); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 630 | if (hash_ret > 0) { |
| 631 | if (eindex->count >= eindex->alloc) { |
| 632 | eindex->alloc = (eindex->alloc + 16) * 3 / 2; |
René Scharfe | 2756ca4 | 2014-09-16 20:56:57 +0200 | [diff] [blame] | 633 | REALLOC_ARRAY(eindex->objects, eindex->alloc); |
| 634 | REALLOC_ARRAY(eindex->hashes, eindex->alloc); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 635 | } |
| 636 | |
| 637 | bitmap_pos = eindex->count; |
| 638 | eindex->objects[eindex->count] = object; |
| 639 | eindex->hashes[eindex->count] = pack_name_hash(name); |
| 640 | kh_value(eindex->positions, hash_pos) = bitmap_pos; |
| 641 | eindex->count++; |
| 642 | } else { |
| 643 | bitmap_pos = kh_value(eindex->positions, hash_pos); |
| 644 | } |
| 645 | |
Taylor Blau | ed18462 | 2021-08-31 16:52:12 -0400 | [diff] [blame] | 646 | return bitmap_pos + bitmap_num_objects(bitmap_git); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 647 | } |
| 648 | |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 649 | struct bitmap_show_data { |
| 650 | struct bitmap_index *bitmap_git; |
| 651 | struct bitmap *base; |
| 652 | }; |
| 653 | |
| 654 | static void show_object(struct object *object, const char *name, void *data_) |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 655 | { |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 656 | struct bitmap_show_data *data = data_; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 657 | int bitmap_pos; |
| 658 | |
brian m. carlson | 3c77144 | 2019-02-19 00:04:58 +0000 | [diff] [blame] | 659 | bitmap_pos = bitmap_position(data->bitmap_git, &object->oid); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 660 | |
Jeff King | de1e67d | 2016-02-11 17:28:36 -0500 | [diff] [blame] | 661 | if (bitmap_pos < 0) |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 662 | bitmap_pos = ext_index_add_object(data->bitmap_git, object, |
| 663 | name); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 664 | |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 665 | bitmap_set(data->base, bitmap_pos); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 666 | } |
| 667 | |
| 668 | static void show_commit(struct commit *commit, void *data) |
| 669 | { |
| 670 | } |
| 671 | |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 672 | static int add_to_include_set(struct bitmap_index *bitmap_git, |
| 673 | struct include_data *data, |
Taylor Blau | 98c31f3 | 2020-12-08 17:05:09 -0500 | [diff] [blame] | 674 | struct commit *commit, |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 675 | int bitmap_pos) |
| 676 | { |
Taylor Blau | 98c31f3 | 2020-12-08 17:05:09 -0500 | [diff] [blame] | 677 | struct ewah_bitmap *partial; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 678 | |
| 679 | if (data->seen && bitmap_get(data->seen, bitmap_pos)) |
| 680 | return 0; |
| 681 | |
| 682 | if (bitmap_get(data->base, bitmap_pos)) |
| 683 | return 0; |
| 684 | |
Taylor Blau | 98c31f3 | 2020-12-08 17:05:09 -0500 | [diff] [blame] | 685 | partial = bitmap_for_commit(bitmap_git, commit); |
| 686 | if (partial) { |
| 687 | bitmap_or_ewah(data->base, partial); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 688 | return 0; |
| 689 | } |
| 690 | |
| 691 | bitmap_set(data->base, bitmap_pos); |
| 692 | return 1; |
| 693 | } |
| 694 | |
| 695 | static int should_include(struct commit *commit, void *_data) |
| 696 | { |
| 697 | struct include_data *data = _data; |
| 698 | int bitmap_pos; |
| 699 | |
brian m. carlson | 3c77144 | 2019-02-19 00:04:58 +0000 | [diff] [blame] | 700 | bitmap_pos = bitmap_position(data->bitmap_git, &commit->object.oid); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 701 | if (bitmap_pos < 0) |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 702 | bitmap_pos = ext_index_add_object(data->bitmap_git, |
| 703 | (struct object *)commit, |
| 704 | NULL); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 705 | |
Taylor Blau | 98c31f3 | 2020-12-08 17:05:09 -0500 | [diff] [blame] | 706 | if (!add_to_include_set(data->bitmap_git, data, commit, bitmap_pos)) { |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 707 | struct commit_list *parent = commit->parents; |
| 708 | |
| 709 | while (parent) { |
| 710 | parent->item->object.flags |= SEEN; |
| 711 | parent = parent->next; |
| 712 | } |
| 713 | |
| 714 | return 0; |
| 715 | } |
| 716 | |
| 717 | return 1; |
| 718 | } |
| 719 | |
Jeff King | aa9ad6f | 2021-06-14 08:05:44 -0400 | [diff] [blame] | 720 | static int should_include_obj(struct object *obj, void *_data) |
| 721 | { |
| 722 | struct include_data *data = _data; |
| 723 | int bitmap_pos; |
| 724 | |
| 725 | bitmap_pos = bitmap_position(data->bitmap_git, &obj->oid); |
| 726 | if (bitmap_pos < 0) |
| 727 | return 1; |
| 728 | if ((data->seen && bitmap_get(data->seen, bitmap_pos)) || |
| 729 | bitmap_get(data->base, bitmap_pos)) { |
| 730 | obj->flags |= SEEN; |
| 731 | return 0; |
| 732 | } |
| 733 | return 1; |
| 734 | } |
| 735 | |
Taylor Blau | 8357805 | 2020-12-08 17:05:14 -0500 | [diff] [blame] | 736 | static int add_commit_to_bitmap(struct bitmap_index *bitmap_git, |
| 737 | struct bitmap **base, |
| 738 | struct commit *commit) |
| 739 | { |
| 740 | struct ewah_bitmap *or_with = bitmap_for_commit(bitmap_git, commit); |
| 741 | |
| 742 | if (!or_with) |
| 743 | return 0; |
| 744 | |
Junio C Hamano | afe8a90 | 2022-05-02 09:50:37 -0700 | [diff] [blame] | 745 | if (!*base) |
Taylor Blau | 8357805 | 2020-12-08 17:05:14 -0500 | [diff] [blame] | 746 | *base = ewah_to_bitmap(or_with); |
| 747 | else |
| 748 | bitmap_or_ewah(*base, or_with); |
| 749 | |
| 750 | return 1; |
| 751 | } |
| 752 | |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 753 | static struct bitmap *find_objects(struct bitmap_index *bitmap_git, |
| 754 | struct rev_info *revs, |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 755 | struct object_list *roots, |
Derrick Stolee | 09d4a79 | 2022-03-09 16:01:35 +0000 | [diff] [blame] | 756 | struct bitmap *seen) |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 757 | { |
| 758 | struct bitmap *base = NULL; |
| 759 | int needs_walk = 0; |
| 760 | |
| 761 | struct object_list *not_mapped = NULL; |
| 762 | |
| 763 | /* |
| 764 | * Go through all the roots for the walk. The ones that have bitmaps |
| 765 | * on the bitmap index will be `or`ed together to form an initial |
| 766 | * global reachability analysis. |
| 767 | * |
| 768 | * The ones without bitmaps in the index will be stored in the |
| 769 | * `not_mapped_list` for further processing. |
| 770 | */ |
| 771 | while (roots) { |
| 772 | struct object *object = roots->item; |
| 773 | roots = roots->next; |
| 774 | |
Taylor Blau | 8357805 | 2020-12-08 17:05:14 -0500 | [diff] [blame] | 775 | if (object->type == OBJ_COMMIT && |
| 776 | add_commit_to_bitmap(bitmap_git, &base, (struct commit *)object)) { |
| 777 | object->flags |= SEEN; |
| 778 | continue; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 779 | } |
| 780 | |
| 781 | object_list_insert(object, ¬_mapped); |
| 782 | } |
| 783 | |
| 784 | /* |
| 785 | * Best case scenario: We found bitmaps for all the roots, |
| 786 | * so the resulting `or` bitmap has the full reachability analysis |
| 787 | */ |
Junio C Hamano | afe8a90 | 2022-05-02 09:50:37 -0700 | [diff] [blame] | 788 | if (!not_mapped) |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 789 | return base; |
| 790 | |
| 791 | roots = not_mapped; |
| 792 | |
| 793 | /* |
| 794 | * Let's iterate through all the roots that don't have bitmaps to |
| 795 | * check if we can determine them to be reachable from the existing |
| 796 | * global bitmap. |
| 797 | * |
| 798 | * If we cannot find them in the existing global bitmap, we'll need |
| 799 | * to push them to an actual walk and run it until we can confirm |
| 800 | * they are reachable |
| 801 | */ |
| 802 | while (roots) { |
| 803 | struct object *object = roots->item; |
| 804 | int pos; |
| 805 | |
| 806 | roots = roots->next; |
brian m. carlson | 3c77144 | 2019-02-19 00:04:58 +0000 | [diff] [blame] | 807 | pos = bitmap_position(bitmap_git, &object->oid); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 808 | |
| 809 | if (pos < 0 || base == NULL || !bitmap_get(base, pos)) { |
| 810 | object->flags &= ~UNINTERESTING; |
| 811 | add_pending_object(revs, object, ""); |
| 812 | needs_walk = 1; |
| 813 | } else { |
| 814 | object->flags |= SEEN; |
| 815 | } |
| 816 | } |
| 817 | |
| 818 | if (needs_walk) { |
| 819 | struct include_data incdata; |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 820 | struct bitmap_show_data show_data; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 821 | |
Junio C Hamano | afe8a90 | 2022-05-02 09:50:37 -0700 | [diff] [blame] | 822 | if (!base) |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 823 | base = bitmap_new(); |
| 824 | |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 825 | incdata.bitmap_git = bitmap_git; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 826 | incdata.base = base; |
| 827 | incdata.seen = seen; |
| 828 | |
| 829 | revs->include_check = should_include; |
Jeff King | aa9ad6f | 2021-06-14 08:05:44 -0400 | [diff] [blame] | 830 | revs->include_check_obj = should_include_obj; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 831 | revs->include_check_data = &incdata; |
| 832 | |
| 833 | if (prepare_revision_walk(revs)) |
| 834 | die("revision walk setup failed"); |
| 835 | |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 836 | show_data.bitmap_git = bitmap_git; |
| 837 | show_data.base = base; |
| 838 | |
Derrick Stolee | 3e0370a | 2022-03-09 16:01:36 +0000 | [diff] [blame] | 839 | traverse_commit_list(revs, |
| 840 | show_commit, show_object, |
| 841 | &show_data); |
Jeff King | 1e951c6 | 2021-04-28 11:42:30 -0400 | [diff] [blame] | 842 | |
| 843 | revs->include_check = NULL; |
Jeff King | aa9ad6f | 2021-06-14 08:05:44 -0400 | [diff] [blame] | 844 | revs->include_check_obj = NULL; |
Jeff King | 1e951c6 | 2021-04-28 11:42:30 -0400 | [diff] [blame] | 845 | revs->include_check_data = NULL; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 846 | } |
| 847 | |
| 848 | return base; |
| 849 | } |
| 850 | |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 851 | static void show_extended_objects(struct bitmap_index *bitmap_git, |
Jeff King | 4eb707e | 2020-02-14 13:22:27 -0500 | [diff] [blame] | 852 | struct rev_info *revs, |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 853 | show_reachable_fn show_reach) |
| 854 | { |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 855 | struct bitmap *objects = bitmap_git->result; |
| 856 | struct eindex *eindex = &bitmap_git->ext_index; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 857 | uint32_t i; |
| 858 | |
| 859 | for (i = 0; i < eindex->count; ++i) { |
| 860 | struct object *obj; |
| 861 | |
Taylor Blau | ed18462 | 2021-08-31 16:52:12 -0400 | [diff] [blame] | 862 | if (!bitmap_get(objects, bitmap_num_objects(bitmap_git) + i)) |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 863 | continue; |
| 864 | |
| 865 | obj = eindex->objects[i]; |
Jeff King | 4eb707e | 2020-02-14 13:22:27 -0500 | [diff] [blame] | 866 | if ((obj->type == OBJ_BLOB && !revs->blob_objects) || |
| 867 | (obj->type == OBJ_TREE && !revs->tree_objects) || |
| 868 | (obj->type == OBJ_TAG && !revs->tag_objects)) |
| 869 | continue; |
| 870 | |
brian m. carlson | 2066496 | 2017-10-15 22:07:00 +0000 | [diff] [blame] | 871 | show_reach(&obj->oid, obj->type, 0, eindex->hashes[i], NULL, 0); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 872 | } |
| 873 | } |
| 874 | |
Jeff King | 551cf8b | 2020-02-12 21:16:15 -0500 | [diff] [blame] | 875 | static void init_type_iterator(struct ewah_iterator *it, |
| 876 | struct bitmap_index *bitmap_git, |
| 877 | enum object_type type) |
| 878 | { |
| 879 | switch (type) { |
| 880 | case OBJ_COMMIT: |
| 881 | ewah_iterator_init(it, bitmap_git->commits); |
| 882 | break; |
| 883 | |
| 884 | case OBJ_TREE: |
| 885 | ewah_iterator_init(it, bitmap_git->trees); |
| 886 | break; |
| 887 | |
| 888 | case OBJ_BLOB: |
| 889 | ewah_iterator_init(it, bitmap_git->blobs); |
| 890 | break; |
| 891 | |
| 892 | case OBJ_TAG: |
| 893 | ewah_iterator_init(it, bitmap_git->tags); |
| 894 | break; |
| 895 | |
| 896 | default: |
| 897 | BUG("object type %d not stored by bitmap type index", type); |
| 898 | break; |
| 899 | } |
| 900 | } |
| 901 | |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 902 | static void show_objects_for_type( |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 903 | struct bitmap_index *bitmap_git, |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 904 | enum object_type object_type, |
| 905 | show_reachable_fn show_reach) |
| 906 | { |
Jeff King | d2ea031 | 2019-12-18 12:25:47 +0100 | [diff] [blame] | 907 | size_t i = 0; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 908 | uint32_t offset; |
| 909 | |
| 910 | struct ewah_iterator it; |
| 911 | eword_t filter; |
| 912 | |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 913 | struct bitmap *objects = bitmap_git->result; |
| 914 | |
Jeff King | 551cf8b | 2020-02-12 21:16:15 -0500 | [diff] [blame] | 915 | init_type_iterator(&it, bitmap_git, object_type); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 916 | |
Jeff King | d2ea031 | 2019-12-18 12:25:47 +0100 | [diff] [blame] | 917 | for (i = 0; i < objects->word_alloc && |
| 918 | ewah_iterator_next(&filter, &it); i++) { |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 919 | eword_t word = objects->words[i] & filter; |
Jeff King | d2ea031 | 2019-12-18 12:25:47 +0100 | [diff] [blame] | 920 | size_t pos = (i * BITS_IN_EWORD); |
| 921 | |
| 922 | if (!word) |
| 923 | continue; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 924 | |
Jeff King | 34b935c | 2015-06-03 02:39:37 -0400 | [diff] [blame] | 925 | for (offset = 0; offset < BITS_IN_EWORD; ++offset) { |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 926 | struct packed_git *pack; |
brian m. carlson | 2066496 | 2017-10-15 22:07:00 +0000 | [diff] [blame] | 927 | struct object_id oid; |
Taylor Blau | cf98f2e | 2021-01-13 17:23:56 -0500 | [diff] [blame] | 928 | uint32_t hash = 0, index_pos; |
| 929 | off_t ofs; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 930 | |
| 931 | if ((word >> offset) == 0) |
| 932 | break; |
| 933 | |
| 934 | offset += ewah_bit_ctz64(word >> offset); |
| 935 | |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 936 | if (bitmap_is_midx(bitmap_git)) { |
| 937 | struct multi_pack_index *m = bitmap_git->midx; |
| 938 | uint32_t pack_id; |
| 939 | |
| 940 | index_pos = pack_pos_to_midx(m, pos + offset); |
| 941 | ofs = nth_midxed_offset(m, index_pos); |
| 942 | nth_midxed_object_oid(&oid, m, index_pos); |
| 943 | |
| 944 | pack_id = nth_midxed_pack_int_id(m, index_pos); |
| 945 | pack = bitmap_git->midx->packs[pack_id]; |
| 946 | } else { |
| 947 | index_pos = pack_pos_to_index(bitmap_git->pack, pos + offset); |
| 948 | ofs = pack_pos_to_offset(bitmap_git->pack, pos + offset); |
| 949 | nth_bitmap_object_oid(bitmap_git, &oid, index_pos); |
| 950 | |
| 951 | pack = bitmap_git->pack; |
| 952 | } |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 953 | |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 954 | if (bitmap_git->hashes) |
Taylor Blau | cf98f2e | 2021-01-13 17:23:56 -0500 | [diff] [blame] | 955 | hash = get_be32(bitmap_git->hashes + index_pos); |
Vicent Marti | ae4f07f | 2013-12-21 09:00:45 -0500 | [diff] [blame] | 956 | |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 957 | show_reach(&oid, object_type, 0, hash, pack, ofs); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 958 | } |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 959 | } |
| 960 | } |
| 961 | |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 962 | static int in_bitmapped_pack(struct bitmap_index *bitmap_git, |
| 963 | struct object_list *roots) |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 964 | { |
| 965 | while (roots) { |
| 966 | struct object *object = roots->item; |
| 967 | roots = roots->next; |
| 968 | |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 969 | if (bitmap_is_midx(bitmap_git)) { |
| 970 | if (bsearch_midx(&object->oid, bitmap_git->midx, NULL)) |
| 971 | return 1; |
| 972 | } else { |
| 973 | if (find_pack_entry_one(object->oid.hash, bitmap_git->pack) > 0) |
| 974 | return 1; |
| 975 | } |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 976 | } |
| 977 | |
| 978 | return 0; |
| 979 | } |
| 980 | |
Taylor Blau | 856e12c | 2020-05-04 17:12:31 -0600 | [diff] [blame] | 981 | static struct bitmap *find_tip_objects(struct bitmap_index *bitmap_git, |
| 982 | struct object_list *tip_objects, |
| 983 | enum object_type type) |
Jeff King | 4f3bd56 | 2020-02-14 13:22:36 -0500 | [diff] [blame] | 984 | { |
| 985 | struct bitmap *result = bitmap_new(); |
| 986 | struct object_list *p; |
| 987 | |
| 988 | for (p = tip_objects; p; p = p->next) { |
| 989 | int pos; |
| 990 | |
Taylor Blau | 856e12c | 2020-05-04 17:12:31 -0600 | [diff] [blame] | 991 | if (p->item->type != type) |
Jeff King | 4f3bd56 | 2020-02-14 13:22:36 -0500 | [diff] [blame] | 992 | continue; |
| 993 | |
| 994 | pos = bitmap_position(bitmap_git, &p->item->oid); |
| 995 | if (pos < 0) |
| 996 | continue; |
| 997 | |
| 998 | bitmap_set(result, pos); |
| 999 | } |
| 1000 | |
| 1001 | return result; |
| 1002 | } |
| 1003 | |
Taylor Blau | 856e12c | 2020-05-04 17:12:31 -0600 | [diff] [blame] | 1004 | static void filter_bitmap_exclude_type(struct bitmap_index *bitmap_git, |
| 1005 | struct object_list *tip_objects, |
| 1006 | struct bitmap *to_filter, |
| 1007 | enum object_type type) |
Jeff King | 4f3bd56 | 2020-02-14 13:22:36 -0500 | [diff] [blame] | 1008 | { |
| 1009 | struct eindex *eindex = &bitmap_git->ext_index; |
| 1010 | struct bitmap *tips; |
| 1011 | struct ewah_iterator it; |
| 1012 | eword_t mask; |
| 1013 | uint32_t i; |
| 1014 | |
| 1015 | /* |
| 1016 | * The non-bitmap version of this filter never removes |
Taylor Blau | 856e12c | 2020-05-04 17:12:31 -0600 | [diff] [blame] | 1017 | * objects which the other side specifically asked for, |
Jeff King | 4f3bd56 | 2020-02-14 13:22:36 -0500 | [diff] [blame] | 1018 | * so we must match that behavior. |
| 1019 | */ |
Taylor Blau | 856e12c | 2020-05-04 17:12:31 -0600 | [diff] [blame] | 1020 | tips = find_tip_objects(bitmap_git, tip_objects, type); |
Jeff King | 4f3bd56 | 2020-02-14 13:22:36 -0500 | [diff] [blame] | 1021 | |
| 1022 | /* |
Taylor Blau | ddcb189 | 2021-07-20 16:16:22 -0400 | [diff] [blame] | 1023 | * We can use the type-level bitmap for 'type' to work in whole |
| 1024 | * words for the objects that are actually in the bitmapped |
| 1025 | * packfile. |
Jeff King | 4f3bd56 | 2020-02-14 13:22:36 -0500 | [diff] [blame] | 1026 | */ |
Taylor Blau | 856e12c | 2020-05-04 17:12:31 -0600 | [diff] [blame] | 1027 | for (i = 0, init_type_iterator(&it, bitmap_git, type); |
Jeff King | 4f3bd56 | 2020-02-14 13:22:36 -0500 | [diff] [blame] | 1028 | i < to_filter->word_alloc && ewah_iterator_next(&mask, &it); |
| 1029 | i++) { |
| 1030 | if (i < tips->word_alloc) |
| 1031 | mask &= ~tips->words[i]; |
| 1032 | to_filter->words[i] &= ~mask; |
| 1033 | } |
| 1034 | |
| 1035 | /* |
Taylor Blau | ddcb189 | 2021-07-20 16:16:22 -0400 | [diff] [blame] | 1036 | * Clear any objects that weren't in the packfile (and so would |
| 1037 | * not have been caught by the loop above. We'll have to check |
| 1038 | * them individually. |
Jeff King | 4f3bd56 | 2020-02-14 13:22:36 -0500 | [diff] [blame] | 1039 | */ |
| 1040 | for (i = 0; i < eindex->count; i++) { |
Taylor Blau | ed18462 | 2021-08-31 16:52:12 -0400 | [diff] [blame] | 1041 | uint32_t pos = i + bitmap_num_objects(bitmap_git); |
Taylor Blau | 856e12c | 2020-05-04 17:12:31 -0600 | [diff] [blame] | 1042 | if (eindex->objects[i]->type == type && |
Jeff King | 4f3bd56 | 2020-02-14 13:22:36 -0500 | [diff] [blame] | 1043 | bitmap_get(to_filter, pos) && |
| 1044 | !bitmap_get(tips, pos)) |
| 1045 | bitmap_unset(to_filter, pos); |
| 1046 | } |
| 1047 | |
| 1048 | bitmap_free(tips); |
| 1049 | } |
| 1050 | |
Taylor Blau | 856e12c | 2020-05-04 17:12:31 -0600 | [diff] [blame] | 1051 | static void filter_bitmap_blob_none(struct bitmap_index *bitmap_git, |
| 1052 | struct object_list *tip_objects, |
| 1053 | struct bitmap *to_filter) |
| 1054 | { |
| 1055 | filter_bitmap_exclude_type(bitmap_git, tip_objects, to_filter, |
| 1056 | OBJ_BLOB); |
| 1057 | } |
| 1058 | |
Jeff King | 84243da | 2020-02-14 13:22:39 -0500 | [diff] [blame] | 1059 | static unsigned long get_size_by_pos(struct bitmap_index *bitmap_git, |
| 1060 | uint32_t pos) |
| 1061 | { |
Jeff King | 84243da | 2020-02-14 13:22:39 -0500 | [diff] [blame] | 1062 | unsigned long size; |
| 1063 | struct object_info oi = OBJECT_INFO_INIT; |
| 1064 | |
| 1065 | oi.sizep = &size; |
| 1066 | |
Taylor Blau | ed18462 | 2021-08-31 16:52:12 -0400 | [diff] [blame] | 1067 | if (pos < bitmap_num_objects(bitmap_git)) { |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 1068 | struct packed_git *pack; |
| 1069 | off_t ofs; |
| 1070 | |
| 1071 | if (bitmap_is_midx(bitmap_git)) { |
| 1072 | uint32_t midx_pos = pack_pos_to_midx(bitmap_git->midx, pos); |
| 1073 | uint32_t pack_id = nth_midxed_pack_int_id(bitmap_git->midx, midx_pos); |
| 1074 | |
| 1075 | pack = bitmap_git->midx->packs[pack_id]; |
| 1076 | ofs = nth_midxed_offset(bitmap_git->midx, midx_pos); |
| 1077 | } else { |
| 1078 | pack = bitmap_git->pack; |
| 1079 | ofs = pack_pos_to_offset(pack, pos); |
| 1080 | } |
| 1081 | |
Taylor Blau | a78a903 | 2021-01-13 17:24:00 -0500 | [diff] [blame] | 1082 | if (packed_object_info(the_repository, pack, ofs, &oi) < 0) { |
Jeff King | 84243da | 2020-02-14 13:22:39 -0500 | [diff] [blame] | 1083 | struct object_id oid; |
Taylor Blau | 6b4277e | 2021-08-31 16:52:14 -0400 | [diff] [blame] | 1084 | nth_bitmap_object_oid(bitmap_git, &oid, |
| 1085 | pack_pos_to_index(pack, pos)); |
Jeff King | 84243da | 2020-02-14 13:22:39 -0500 | [diff] [blame] | 1086 | die(_("unable to get size of %s"), oid_to_hex(&oid)); |
| 1087 | } |
| 1088 | } else { |
| 1089 | struct eindex *eindex = &bitmap_git->ext_index; |
Taylor Blau | ed18462 | 2021-08-31 16:52:12 -0400 | [diff] [blame] | 1090 | struct object *obj = eindex->objects[pos - bitmap_num_objects(bitmap_git)]; |
Jeff King | 84243da | 2020-02-14 13:22:39 -0500 | [diff] [blame] | 1091 | if (oid_object_info_extended(the_repository, &obj->oid, &oi, 0) < 0) |
| 1092 | die(_("unable to get size of %s"), oid_to_hex(&obj->oid)); |
| 1093 | } |
| 1094 | |
| 1095 | return size; |
| 1096 | } |
| 1097 | |
| 1098 | static void filter_bitmap_blob_limit(struct bitmap_index *bitmap_git, |
| 1099 | struct object_list *tip_objects, |
| 1100 | struct bitmap *to_filter, |
| 1101 | unsigned long limit) |
| 1102 | { |
| 1103 | struct eindex *eindex = &bitmap_git->ext_index; |
| 1104 | struct bitmap *tips; |
| 1105 | struct ewah_iterator it; |
| 1106 | eword_t mask; |
| 1107 | uint32_t i; |
| 1108 | |
Taylor Blau | 856e12c | 2020-05-04 17:12:31 -0600 | [diff] [blame] | 1109 | tips = find_tip_objects(bitmap_git, tip_objects, OBJ_BLOB); |
Jeff King | 84243da | 2020-02-14 13:22:39 -0500 | [diff] [blame] | 1110 | |
| 1111 | for (i = 0, init_type_iterator(&it, bitmap_git, OBJ_BLOB); |
| 1112 | i < to_filter->word_alloc && ewah_iterator_next(&mask, &it); |
| 1113 | i++) { |
| 1114 | eword_t word = to_filter->words[i] & mask; |
| 1115 | unsigned offset; |
| 1116 | |
| 1117 | for (offset = 0; offset < BITS_IN_EWORD; offset++) { |
| 1118 | uint32_t pos; |
| 1119 | |
| 1120 | if ((word >> offset) == 0) |
| 1121 | break; |
| 1122 | offset += ewah_bit_ctz64(word >> offset); |
| 1123 | pos = i * BITS_IN_EWORD + offset; |
| 1124 | |
| 1125 | if (!bitmap_get(tips, pos) && |
| 1126 | get_size_by_pos(bitmap_git, pos) >= limit) |
| 1127 | bitmap_unset(to_filter, pos); |
| 1128 | } |
| 1129 | } |
| 1130 | |
| 1131 | for (i = 0; i < eindex->count; i++) { |
Taylor Blau | ed18462 | 2021-08-31 16:52:12 -0400 | [diff] [blame] | 1132 | uint32_t pos = i + bitmap_num_objects(bitmap_git); |
Jeff King | 84243da | 2020-02-14 13:22:39 -0500 | [diff] [blame] | 1133 | if (eindex->objects[i]->type == OBJ_BLOB && |
| 1134 | bitmap_get(to_filter, pos) && |
| 1135 | !bitmap_get(tips, pos) && |
| 1136 | get_size_by_pos(bitmap_git, pos) >= limit) |
| 1137 | bitmap_unset(to_filter, pos); |
| 1138 | } |
| 1139 | |
| 1140 | bitmap_free(tips); |
| 1141 | } |
| 1142 | |
Taylor Blau | b0a8d48 | 2020-05-04 17:12:35 -0600 | [diff] [blame] | 1143 | static void filter_bitmap_tree_depth(struct bitmap_index *bitmap_git, |
| 1144 | struct object_list *tip_objects, |
| 1145 | struct bitmap *to_filter, |
| 1146 | unsigned long limit) |
| 1147 | { |
| 1148 | if (limit) |
| 1149 | BUG("filter_bitmap_tree_depth given non-zero limit"); |
| 1150 | |
| 1151 | filter_bitmap_exclude_type(bitmap_git, tip_objects, to_filter, |
| 1152 | OBJ_TREE); |
| 1153 | filter_bitmap_exclude_type(bitmap_git, tip_objects, to_filter, |
| 1154 | OBJ_BLOB); |
| 1155 | } |
| 1156 | |
Patrick Steinhardt | 7ab6aaf | 2021-04-19 13:46:58 +0200 | [diff] [blame] | 1157 | static void filter_bitmap_object_type(struct bitmap_index *bitmap_git, |
| 1158 | struct object_list *tip_objects, |
| 1159 | struct bitmap *to_filter, |
| 1160 | enum object_type object_type) |
| 1161 | { |
| 1162 | if (object_type < OBJ_COMMIT || object_type > OBJ_TAG) |
| 1163 | BUG("filter_bitmap_object_type given invalid object"); |
| 1164 | |
| 1165 | if (object_type != OBJ_TAG) |
| 1166 | filter_bitmap_exclude_type(bitmap_git, tip_objects, to_filter, OBJ_TAG); |
| 1167 | if (object_type != OBJ_COMMIT) |
| 1168 | filter_bitmap_exclude_type(bitmap_git, tip_objects, to_filter, OBJ_COMMIT); |
| 1169 | if (object_type != OBJ_TREE) |
| 1170 | filter_bitmap_exclude_type(bitmap_git, tip_objects, to_filter, OBJ_TREE); |
| 1171 | if (object_type != OBJ_BLOB) |
| 1172 | filter_bitmap_exclude_type(bitmap_git, tip_objects, to_filter, OBJ_BLOB); |
| 1173 | } |
| 1174 | |
Jeff King | 6663ae0 | 2020-02-14 13:22:29 -0500 | [diff] [blame] | 1175 | static int filter_bitmap(struct bitmap_index *bitmap_git, |
| 1176 | struct object_list *tip_objects, |
| 1177 | struct bitmap *to_filter, |
| 1178 | struct list_objects_filter_options *filter) |
| 1179 | { |
| 1180 | if (!filter || filter->choice == LOFC_DISABLED) |
| 1181 | return 0; |
| 1182 | |
Jeff King | 4f3bd56 | 2020-02-14 13:22:36 -0500 | [diff] [blame] | 1183 | if (filter->choice == LOFC_BLOB_NONE) { |
| 1184 | if (bitmap_git) |
| 1185 | filter_bitmap_blob_none(bitmap_git, tip_objects, |
| 1186 | to_filter); |
| 1187 | return 0; |
| 1188 | } |
| 1189 | |
Jeff King | 84243da | 2020-02-14 13:22:39 -0500 | [diff] [blame] | 1190 | if (filter->choice == LOFC_BLOB_LIMIT) { |
| 1191 | if (bitmap_git) |
| 1192 | filter_bitmap_blob_limit(bitmap_git, tip_objects, |
| 1193 | to_filter, |
| 1194 | filter->blob_limit_value); |
| 1195 | return 0; |
| 1196 | } |
| 1197 | |
Taylor Blau | b0a8d48 | 2020-05-04 17:12:35 -0600 | [diff] [blame] | 1198 | if (filter->choice == LOFC_TREE_DEPTH && |
| 1199 | filter->tree_exclude_depth == 0) { |
| 1200 | if (bitmap_git) |
| 1201 | filter_bitmap_tree_depth(bitmap_git, tip_objects, |
| 1202 | to_filter, |
| 1203 | filter->tree_exclude_depth); |
| 1204 | return 0; |
| 1205 | } |
| 1206 | |
Patrick Steinhardt | 7ab6aaf | 2021-04-19 13:46:58 +0200 | [diff] [blame] | 1207 | if (filter->choice == LOFC_OBJECT_TYPE) { |
| 1208 | if (bitmap_git) |
| 1209 | filter_bitmap_object_type(bitmap_git, tip_objects, |
| 1210 | to_filter, |
| 1211 | filter->object_type); |
| 1212 | return 0; |
| 1213 | } |
| 1214 | |
Patrick Steinhardt | 169a15e | 2021-04-19 13:47:02 +0200 | [diff] [blame] | 1215 | if (filter->choice == LOFC_COMBINE) { |
| 1216 | int i; |
| 1217 | for (i = 0; i < filter->sub_nr; i++) { |
| 1218 | if (filter_bitmap(bitmap_git, tip_objects, to_filter, |
| 1219 | &filter->sub[i]) < 0) |
| 1220 | return -1; |
| 1221 | } |
| 1222 | return 0; |
| 1223 | } |
| 1224 | |
Jeff King | 6663ae0 | 2020-02-14 13:22:29 -0500 | [diff] [blame] | 1225 | /* filter choice not handled */ |
| 1226 | return -1; |
| 1227 | } |
| 1228 | |
| 1229 | static int can_filter_bitmap(struct list_objects_filter_options *filter) |
| 1230 | { |
| 1231 | return !filter_bitmap(NULL, NULL, NULL, filter); |
| 1232 | } |
| 1233 | |
| 1234 | struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs, |
Patrick Steinhardt | 9cf68b2 | 2021-04-19 13:47:06 +0200 | [diff] [blame] | 1235 | int filter_provided_objects) |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1236 | { |
| 1237 | unsigned int i; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1238 | |
| 1239 | struct object_list *wants = NULL; |
| 1240 | struct object_list *haves = NULL; |
| 1241 | |
| 1242 | struct bitmap *wants_bitmap = NULL; |
| 1243 | struct bitmap *haves_bitmap = NULL; |
| 1244 | |
Jeff King | d90fe06 | 2020-02-14 13:22:16 -0500 | [diff] [blame] | 1245 | struct bitmap_index *bitmap_git; |
| 1246 | |
| 1247 | /* |
| 1248 | * We can't do pathspec limiting with bitmaps, because we don't know |
| 1249 | * which commits are associated with which object changes (let alone |
| 1250 | * even which objects are associated with which paths). |
| 1251 | */ |
| 1252 | if (revs->prune) |
| 1253 | return NULL; |
| 1254 | |
Derrick Stolee | 09d4a79 | 2022-03-09 16:01:35 +0000 | [diff] [blame] | 1255 | if (!can_filter_bitmap(&revs->filter)) |
Jeff King | 6663ae0 | 2020-02-14 13:22:29 -0500 | [diff] [blame] | 1256 | return NULL; |
| 1257 | |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 1258 | /* try to open a bitmapped pack, but don't parse it yet |
| 1259 | * because we may not need to use it */ |
René Scharfe | ca56dad | 2021-03-13 17:17:22 +0100 | [diff] [blame] | 1260 | CALLOC_ARRAY(bitmap_git, 1); |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 1261 | if (open_bitmap(revs->repo, bitmap_git) < 0) |
Jonathan Tan | f3c23db | 2018-06-07 12:04:14 -0700 | [diff] [blame] | 1262 | goto cleanup; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1263 | |
Martin Ågren | 4d01a7f | 2017-09-23 01:34:54 +0200 | [diff] [blame] | 1264 | for (i = 0; i < revs->pending.nr; ++i) { |
| 1265 | struct object *object = revs->pending.objects[i].item; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1266 | |
| 1267 | if (object->type == OBJ_NONE) |
brian m. carlson | c251c83 | 2017-05-06 22:10:38 +0000 | [diff] [blame] | 1268 | parse_object_or_die(&object->oid, NULL); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1269 | |
| 1270 | while (object->type == OBJ_TAG) { |
| 1271 | struct tag *tag = (struct tag *) object; |
| 1272 | |
| 1273 | if (object->flags & UNINTERESTING) |
| 1274 | object_list_insert(object, &haves); |
| 1275 | else |
| 1276 | object_list_insert(object, &wants); |
| 1277 | |
René Scharfe | dad3f06 | 2019-09-05 21:55:55 +0200 | [diff] [blame] | 1278 | object = parse_object_or_die(get_tagged_oid(tag), NULL); |
Patrick Steinhardt | 540cdc1 | 2021-03-22 13:19:06 +0100 | [diff] [blame] | 1279 | object->flags |= (tag->object.flags & UNINTERESTING); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1280 | } |
| 1281 | |
| 1282 | if (object->flags & UNINTERESTING) |
| 1283 | object_list_insert(object, &haves); |
| 1284 | else |
| 1285 | object_list_insert(object, &wants); |
| 1286 | } |
| 1287 | |
| 1288 | /* |
| 1289 | * if we have a HAVES list, but none of those haves is contained |
| 1290 | * in the packfile that has a bitmap, we don't have anything to |
| 1291 | * optimize here |
| 1292 | */ |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 1293 | if (haves && !in_bitmapped_pack(bitmap_git, haves)) |
Jonathan Tan | f3c23db | 2018-06-07 12:04:14 -0700 | [diff] [blame] | 1294 | goto cleanup; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1295 | |
| 1296 | /* if we don't want anything, we're done here */ |
| 1297 | if (!wants) |
Jonathan Tan | f3c23db | 2018-06-07 12:04:14 -0700 | [diff] [blame] | 1298 | goto cleanup; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1299 | |
| 1300 | /* |
| 1301 | * now we're going to use bitmaps, so load the actual bitmap entries |
| 1302 | * from disk. this is the point of no return; after this the rev_list |
| 1303 | * becomes invalidated and we must perform the revwalk through bitmaps |
| 1304 | */ |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 1305 | if (load_bitmap(bitmap_git) < 0) |
Jonathan Tan | f3c23db | 2018-06-07 12:04:14 -0700 | [diff] [blame] | 1306 | goto cleanup; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1307 | |
Martin Ågren | 4d01a7f | 2017-09-23 01:34:54 +0200 | [diff] [blame] | 1308 | object_array_clear(&revs->pending); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1309 | |
| 1310 | if (haves) { |
Vicent Marti | 2db1a43 | 2014-03-28 06:00:43 -0400 | [diff] [blame] | 1311 | revs->ignore_missing_links = 1; |
Derrick Stolee | 09d4a79 | 2022-03-09 16:01:35 +0000 | [diff] [blame] | 1312 | haves_bitmap = find_objects(bitmap_git, revs, haves, NULL); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1313 | reset_revision_walk(); |
Vicent Marti | 2db1a43 | 2014-03-28 06:00:43 -0400 | [diff] [blame] | 1314 | revs->ignore_missing_links = 0; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1315 | |
Junio C Hamano | afe8a90 | 2022-05-02 09:50:37 -0700 | [diff] [blame] | 1316 | if (!haves_bitmap) |
Johannes Schindelin | 033abf9 | 2018-05-02 11:38:39 +0200 | [diff] [blame] | 1317 | BUG("failed to perform bitmap walk"); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1318 | } |
| 1319 | |
Derrick Stolee | 09d4a79 | 2022-03-09 16:01:35 +0000 | [diff] [blame] | 1320 | wants_bitmap = find_objects(bitmap_git, revs, wants, haves_bitmap); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1321 | |
| 1322 | if (!wants_bitmap) |
Johannes Schindelin | 033abf9 | 2018-05-02 11:38:39 +0200 | [diff] [blame] | 1323 | BUG("failed to perform bitmap walk"); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1324 | |
| 1325 | if (haves_bitmap) |
| 1326 | bitmap_and_not(wants_bitmap, haves_bitmap); |
| 1327 | |
Derrick Stolee | 09d4a79 | 2022-03-09 16:01:35 +0000 | [diff] [blame] | 1328 | filter_bitmap(bitmap_git, |
| 1329 | (revs->filter.choice && filter_provided_objects) ? NULL : wants, |
| 1330 | wants_bitmap, |
| 1331 | &revs->filter); |
Jeff King | 6663ae0 | 2020-02-14 13:22:29 -0500 | [diff] [blame] | 1332 | |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 1333 | bitmap_git->result = wants_bitmap; |
Jeff King | 30cdc33 | 2018-08-21 15:07:01 -0400 | [diff] [blame] | 1334 | bitmap_git->haves = haves_bitmap; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1335 | |
Jeff King | acac50d | 2020-02-12 21:16:33 -0500 | [diff] [blame] | 1336 | object_list_free(&wants); |
| 1337 | object_list_free(&haves); |
| 1338 | |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 1339 | return bitmap_git; |
Jonathan Tan | f3c23db | 2018-06-07 12:04:14 -0700 | [diff] [blame] | 1340 | |
| 1341 | cleanup: |
| 1342 | free_bitmap_index(bitmap_git); |
Jeff King | acac50d | 2020-02-12 21:16:33 -0500 | [diff] [blame] | 1343 | object_list_free(&wants); |
| 1344 | object_list_free(&haves); |
Jonathan Tan | f3c23db | 2018-06-07 12:04:14 -0700 | [diff] [blame] | 1345 | return NULL; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1346 | } |
| 1347 | |
Taylor Blau | a5f9f24 | 2021-08-31 16:52:19 -0400 | [diff] [blame] | 1348 | /* |
| 1349 | * -1 means "stop trying further objects"; 0 means we may or may not have |
| 1350 | * reused, but you can keep feeding bits. |
| 1351 | */ |
Jeff King | 73cd7d9 | 2021-09-09 15:57:21 -0400 | [diff] [blame] | 1352 | static int try_partial_reuse(struct packed_git *pack, |
Taylor Blau | a5f9f24 | 2021-08-31 16:52:19 -0400 | [diff] [blame] | 1353 | size_t pos, |
| 1354 | struct bitmap *reuse, |
| 1355 | struct pack_window **w_curs) |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1356 | { |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 1357 | off_t offset, delta_obj_offset; |
Jeff King | bb514de | 2019-12-18 12:25:45 +0100 | [diff] [blame] | 1358 | enum object_type type; |
| 1359 | unsigned long size; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1360 | |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 1361 | /* |
| 1362 | * try_partial_reuse() is called either on (a) objects in the |
| 1363 | * bitmapped pack (in the case of a single-pack bitmap) or (b) |
| 1364 | * objects in the preferred pack of a multi-pack bitmap. |
| 1365 | * Importantly, the latter can pretend as if only a single pack |
| 1366 | * exists because: |
| 1367 | * |
| 1368 | * - The first pack->num_objects bits of a MIDX bitmap are |
| 1369 | * reserved for the preferred pack, and |
| 1370 | * |
| 1371 | * - Ties due to duplicate objects are always resolved in |
| 1372 | * favor of the preferred pack. |
| 1373 | * |
| 1374 | * Therefore we do not need to ever ask the MIDX for its copy of |
| 1375 | * an object by OID, since it will always select it from the |
| 1376 | * preferred pack. Likewise, the selected copy of the base |
| 1377 | * object for any deltas will reside in the same pack. |
| 1378 | * |
| 1379 | * This means that we can reuse pos when looking up the bit in |
| 1380 | * the reuse bitmap, too, since bits corresponding to the |
| 1381 | * preferred pack precede all bits from other packs. |
| 1382 | */ |
Jeff King | bb514de | 2019-12-18 12:25:45 +0100 | [diff] [blame] | 1383 | |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 1384 | if (pos >= pack->num_objects) |
| 1385 | return -1; /* not actually in the pack or MIDX preferred pack */ |
| 1386 | |
| 1387 | offset = delta_obj_offset = pack_pos_to_offset(pack, pos); |
| 1388 | type = unpack_object_header(pack, w_curs, &offset, &size); |
Jeff King | bb514de | 2019-12-18 12:25:45 +0100 | [diff] [blame] | 1389 | if (type < 0) |
Taylor Blau | a5f9f24 | 2021-08-31 16:52:19 -0400 | [diff] [blame] | 1390 | return -1; /* broken packfile, punt */ |
Jeff King | bb514de | 2019-12-18 12:25:45 +0100 | [diff] [blame] | 1391 | |
| 1392 | if (type == OBJ_REF_DELTA || type == OBJ_OFS_DELTA) { |
| 1393 | off_t base_offset; |
Taylor Blau | 011f3fd | 2021-01-13 17:24:05 -0500 | [diff] [blame] | 1394 | uint32_t base_pos; |
Jeff King | bb514de | 2019-12-18 12:25:45 +0100 | [diff] [blame] | 1395 | |
| 1396 | /* |
| 1397 | * Find the position of the base object so we can look it up |
| 1398 | * in our bitmaps. If we can't come up with an offset, or if |
| 1399 | * that offset is not in the revidx, the pack is corrupt. |
| 1400 | * There's nothing we can do, so just punt on this object, |
| 1401 | * and the normal slow path will complain about it in |
| 1402 | * more detail. |
| 1403 | */ |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 1404 | base_offset = get_delta_base(pack, w_curs, &offset, type, |
| 1405 | delta_obj_offset); |
Jeff King | bb514de | 2019-12-18 12:25:45 +0100 | [diff] [blame] | 1406 | if (!base_offset) |
Taylor Blau | a5f9f24 | 2021-08-31 16:52:19 -0400 | [diff] [blame] | 1407 | return 0; |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 1408 | if (offset_to_pack_pos(pack, base_offset, &base_pos) < 0) |
Taylor Blau | a5f9f24 | 2021-08-31 16:52:19 -0400 | [diff] [blame] | 1409 | return 0; |
Jeff King | bb514de | 2019-12-18 12:25:45 +0100 | [diff] [blame] | 1410 | |
| 1411 | /* |
| 1412 | * We assume delta dependencies always point backwards. This |
| 1413 | * lets us do a single pass, and is basically always true |
| 1414 | * due to the way OFS_DELTAs work. You would not typically |
| 1415 | * find REF_DELTA in a bitmapped pack, since we only bitmap |
| 1416 | * packs we write fresh, and OFS_DELTA is the default). But |
| 1417 | * let's double check to make sure the pack wasn't written with |
| 1418 | * odd parameters. |
| 1419 | */ |
| 1420 | if (base_pos >= pos) |
Taylor Blau | a5f9f24 | 2021-08-31 16:52:19 -0400 | [diff] [blame] | 1421 | return 0; |
Jeff King | bb514de | 2019-12-18 12:25:45 +0100 | [diff] [blame] | 1422 | |
| 1423 | /* |
| 1424 | * And finally, if we're not sending the base as part of our |
| 1425 | * reuse chunk, then don't send this object either. The base |
| 1426 | * would come after us, along with other objects not |
| 1427 | * necessarily in the pack, which means we'd need to convert |
| 1428 | * to REF_DELTA on the fly. Better to just let the normal |
| 1429 | * object_entry code path handle it. |
| 1430 | */ |
| 1431 | if (!bitmap_get(reuse, base_pos)) |
Taylor Blau | a5f9f24 | 2021-08-31 16:52:19 -0400 | [diff] [blame] | 1432 | return 0; |
Jeff King | bb514de | 2019-12-18 12:25:45 +0100 | [diff] [blame] | 1433 | } |
| 1434 | |
| 1435 | /* |
| 1436 | * If we got here, then the object is OK to reuse. Mark it. |
| 1437 | */ |
| 1438 | bitmap_set(reuse, pos); |
Taylor Blau | a5f9f24 | 2021-08-31 16:52:19 -0400 | [diff] [blame] | 1439 | return 0; |
Jeff King | bb514de | 2019-12-18 12:25:45 +0100 | [diff] [blame] | 1440 | } |
| 1441 | |
Taylor Blau | 6d08b9d | 2021-09-28 21:55:20 -0400 | [diff] [blame] | 1442 | uint32_t midx_preferred_pack(struct bitmap_index *bitmap_git) |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 1443 | { |
| 1444 | struct multi_pack_index *m = bitmap_git->midx; |
| 1445 | if (!m) |
| 1446 | BUG("midx_preferred_pack: requires non-empty MIDX"); |
| 1447 | return nth_midxed_pack_int_id(m, pack_pos_to_midx(bitmap_git->midx, 0)); |
| 1448 | } |
| 1449 | |
Jeff King | bb514de | 2019-12-18 12:25:45 +0100 | [diff] [blame] | 1450 | int reuse_partial_packfile_from_bitmap(struct bitmap_index *bitmap_git, |
| 1451 | struct packed_git **packfile_out, |
| 1452 | uint32_t *entries, |
| 1453 | struct bitmap **reuse_out) |
| 1454 | { |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 1455 | struct packed_git *pack; |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 1456 | struct bitmap *result = bitmap_git->result; |
Jeff King | bb514de | 2019-12-18 12:25:45 +0100 | [diff] [blame] | 1457 | struct bitmap *reuse; |
| 1458 | struct pack_window *w_curs = NULL; |
| 1459 | size_t i = 0; |
| 1460 | uint32_t offset; |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 1461 | uint32_t objects_nr; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1462 | |
| 1463 | assert(result); |
| 1464 | |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 1465 | load_reverse_index(bitmap_git); |
| 1466 | |
| 1467 | if (bitmap_is_midx(bitmap_git)) |
| 1468 | pack = bitmap_git->midx->packs[midx_preferred_pack(bitmap_git)]; |
| 1469 | else |
| 1470 | pack = bitmap_git->pack; |
| 1471 | objects_nr = pack->num_objects; |
| 1472 | |
Jeff King | bb514de | 2019-12-18 12:25:45 +0100 | [diff] [blame] | 1473 | while (i < result->word_alloc && result->words[i] == (eword_t)~0) |
| 1474 | i++; |
| 1475 | |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 1476 | /* |
| 1477 | * Don't mark objects not in the packfile or preferred pack. This bitmap |
| 1478 | * marks objects eligible for reuse, but the pack-reuse code only |
| 1479 | * understands how to reuse a single pack. Since the preferred pack is |
| 1480 | * guaranteed to have all bases for its deltas (in a multi-pack bitmap), |
| 1481 | * we use it instead of another pack. In single-pack bitmaps, the choice |
| 1482 | * is made for us. |
| 1483 | */ |
Taylor Blau | ed18462 | 2021-08-31 16:52:12 -0400 | [diff] [blame] | 1484 | if (i > objects_nr / BITS_IN_EWORD) |
| 1485 | i = objects_nr / BITS_IN_EWORD; |
Jeff King | bb514de | 2019-12-18 12:25:45 +0100 | [diff] [blame] | 1486 | |
| 1487 | reuse = bitmap_word_alloc(i); |
| 1488 | memset(reuse->words, 0xFF, i * sizeof(eword_t)); |
| 1489 | |
| 1490 | for (; i < result->word_alloc; ++i) { |
| 1491 | eword_t word = result->words[i]; |
| 1492 | size_t pos = (i * BITS_IN_EWORD); |
| 1493 | |
| 1494 | for (offset = 0; offset < BITS_IN_EWORD; ++offset) { |
| 1495 | if ((word >> offset) == 0) |
| 1496 | break; |
| 1497 | |
| 1498 | offset += ewah_bit_ctz64(word >> offset); |
Jeff King | 73cd7d9 | 2021-09-09 15:57:21 -0400 | [diff] [blame] | 1499 | if (try_partial_reuse(pack, pos + offset, |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 1500 | reuse, &w_curs) < 0) { |
Taylor Blau | a5f9f24 | 2021-08-31 16:52:19 -0400 | [diff] [blame] | 1501 | /* |
| 1502 | * try_partial_reuse indicated we couldn't reuse |
| 1503 | * any bits, so there is no point in trying more |
| 1504 | * bits in the current word, or any other words |
| 1505 | * in result. |
| 1506 | * |
| 1507 | * Jump out of both loops to avoid future |
| 1508 | * unnecessary calls to try_partial_reuse. |
| 1509 | */ |
| 1510 | goto done; |
| 1511 | } |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1512 | } |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1513 | } |
| 1514 | |
Taylor Blau | a5f9f24 | 2021-08-31 16:52:19 -0400 | [diff] [blame] | 1515 | done: |
Jeff King | bb514de | 2019-12-18 12:25:45 +0100 | [diff] [blame] | 1516 | unuse_pack(&w_curs); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1517 | |
Jeff King | bb514de | 2019-12-18 12:25:45 +0100 | [diff] [blame] | 1518 | *entries = bitmap_popcount(reuse); |
| 1519 | if (!*entries) { |
| 1520 | bitmap_free(reuse); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1521 | return -1; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1522 | } |
| 1523 | |
Jeff King | bb514de | 2019-12-18 12:25:45 +0100 | [diff] [blame] | 1524 | /* |
| 1525 | * Drop any reused objects from the result, since they will not |
| 1526 | * need to be handled separately. |
| 1527 | */ |
| 1528 | bitmap_and_not(result, reuse); |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 1529 | *packfile_out = pack; |
Jeff King | bb514de | 2019-12-18 12:25:45 +0100 | [diff] [blame] | 1530 | *reuse_out = reuse; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1531 | return 0; |
| 1532 | } |
| 1533 | |
Jeff King | 40d18ff | 2019-12-18 12:25:39 +0100 | [diff] [blame] | 1534 | int bitmap_walk_contains(struct bitmap_index *bitmap_git, |
| 1535 | struct bitmap *bitmap, const struct object_id *oid) |
| 1536 | { |
| 1537 | int idx; |
| 1538 | |
| 1539 | if (!bitmap) |
| 1540 | return 0; |
| 1541 | |
| 1542 | idx = bitmap_position(bitmap_git, oid); |
| 1543 | return idx >= 0 && bitmap_get(bitmap, idx); |
| 1544 | } |
| 1545 | |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 1546 | void traverse_bitmap_commit_list(struct bitmap_index *bitmap_git, |
Jeff King | 4eb707e | 2020-02-14 13:22:27 -0500 | [diff] [blame] | 1547 | struct rev_info *revs, |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 1548 | show_reachable_fn show_reachable) |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1549 | { |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 1550 | assert(bitmap_git->result); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1551 | |
Jeff King | 551cf8b | 2020-02-12 21:16:15 -0500 | [diff] [blame] | 1552 | show_objects_for_type(bitmap_git, OBJ_COMMIT, show_reachable); |
Jeff King | 4eb707e | 2020-02-14 13:22:27 -0500 | [diff] [blame] | 1553 | if (revs->tree_objects) |
| 1554 | show_objects_for_type(bitmap_git, OBJ_TREE, show_reachable); |
| 1555 | if (revs->blob_objects) |
| 1556 | show_objects_for_type(bitmap_git, OBJ_BLOB, show_reachable); |
| 1557 | if (revs->tag_objects) |
| 1558 | show_objects_for_type(bitmap_git, OBJ_TAG, show_reachable); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1559 | |
Jeff King | 4eb707e | 2020-02-14 13:22:27 -0500 | [diff] [blame] | 1560 | show_extended_objects(bitmap_git, revs, show_reachable); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1561 | } |
| 1562 | |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 1563 | static uint32_t count_object_type(struct bitmap_index *bitmap_git, |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1564 | enum object_type type) |
| 1565 | { |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 1566 | struct bitmap *objects = bitmap_git->result; |
| 1567 | struct eindex *eindex = &bitmap_git->ext_index; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1568 | |
| 1569 | uint32_t i = 0, count = 0; |
| 1570 | struct ewah_iterator it; |
| 1571 | eword_t filter; |
| 1572 | |
Jeff King | 551cf8b | 2020-02-12 21:16:15 -0500 | [diff] [blame] | 1573 | init_type_iterator(&it, bitmap_git, type); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1574 | |
| 1575 | while (i < objects->word_alloc && ewah_iterator_next(&filter, &it)) { |
| 1576 | eword_t word = objects->words[i++] & filter; |
| 1577 | count += ewah_bit_popcount64(word); |
| 1578 | } |
| 1579 | |
| 1580 | for (i = 0; i < eindex->count; ++i) { |
| 1581 | if (eindex->objects[i]->type == type && |
Taylor Blau | ed18462 | 2021-08-31 16:52:12 -0400 | [diff] [blame] | 1582 | bitmap_get(objects, bitmap_num_objects(bitmap_git) + i)) |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1583 | count++; |
| 1584 | } |
| 1585 | |
| 1586 | return count; |
| 1587 | } |
| 1588 | |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 1589 | void count_bitmap_commit_list(struct bitmap_index *bitmap_git, |
| 1590 | uint32_t *commits, uint32_t *trees, |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1591 | uint32_t *blobs, uint32_t *tags) |
| 1592 | { |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 1593 | assert(bitmap_git->result); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1594 | |
| 1595 | if (commits) |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 1596 | *commits = count_object_type(bitmap_git, OBJ_COMMIT); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1597 | |
| 1598 | if (trees) |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 1599 | *trees = count_object_type(bitmap_git, OBJ_TREE); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1600 | |
| 1601 | if (blobs) |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 1602 | *blobs = count_object_type(bitmap_git, OBJ_BLOB); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1603 | |
| 1604 | if (tags) |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 1605 | *tags = count_object_type(bitmap_git, OBJ_TAG); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1606 | } |
| 1607 | |
| 1608 | struct bitmap_test_data { |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 1609 | struct bitmap_index *bitmap_git; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1610 | struct bitmap *base; |
Taylor Blau | fa95666 | 2021-08-24 12:15:51 -0400 | [diff] [blame] | 1611 | struct bitmap *commits; |
| 1612 | struct bitmap *trees; |
| 1613 | struct bitmap *blobs; |
| 1614 | struct bitmap *tags; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1615 | struct progress *prg; |
| 1616 | size_t seen; |
| 1617 | }; |
| 1618 | |
Taylor Blau | fa95666 | 2021-08-24 12:15:51 -0400 | [diff] [blame] | 1619 | static void test_bitmap_type(struct bitmap_test_data *tdata, |
| 1620 | struct object *obj, int pos) |
| 1621 | { |
| 1622 | enum object_type bitmap_type = OBJ_NONE; |
| 1623 | int bitmaps_nr = 0; |
| 1624 | |
| 1625 | if (bitmap_get(tdata->commits, pos)) { |
| 1626 | bitmap_type = OBJ_COMMIT; |
| 1627 | bitmaps_nr++; |
| 1628 | } |
| 1629 | if (bitmap_get(tdata->trees, pos)) { |
| 1630 | bitmap_type = OBJ_TREE; |
| 1631 | bitmaps_nr++; |
| 1632 | } |
| 1633 | if (bitmap_get(tdata->blobs, pos)) { |
| 1634 | bitmap_type = OBJ_BLOB; |
| 1635 | bitmaps_nr++; |
| 1636 | } |
| 1637 | if (bitmap_get(tdata->tags, pos)) { |
| 1638 | bitmap_type = OBJ_TAG; |
| 1639 | bitmaps_nr++; |
| 1640 | } |
| 1641 | |
| 1642 | if (bitmap_type == OBJ_NONE) |
| 1643 | die("object %s not found in type bitmaps", |
| 1644 | oid_to_hex(&obj->oid)); |
| 1645 | |
| 1646 | if (bitmaps_nr > 1) |
| 1647 | die("object %s does not have a unique type", |
| 1648 | oid_to_hex(&obj->oid)); |
| 1649 | |
| 1650 | if (bitmap_type != obj->type) |
| 1651 | die("object %s: real type %s, expected: %s", |
| 1652 | oid_to_hex(&obj->oid), |
| 1653 | type_name(obj->type), |
| 1654 | type_name(bitmap_type)); |
| 1655 | } |
| 1656 | |
Jeff King | de1e67d | 2016-02-11 17:28:36 -0500 | [diff] [blame] | 1657 | static void test_show_object(struct object *object, const char *name, |
| 1658 | void *data) |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1659 | { |
| 1660 | struct bitmap_test_data *tdata = data; |
| 1661 | int bitmap_pos; |
| 1662 | |
brian m. carlson | 3c77144 | 2019-02-19 00:04:58 +0000 | [diff] [blame] | 1663 | bitmap_pos = bitmap_position(tdata->bitmap_git, &object->oid); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1664 | if (bitmap_pos < 0) |
brian m. carlson | f2fd076 | 2015-11-10 02:22:28 +0000 | [diff] [blame] | 1665 | die("Object not in bitmap: %s\n", oid_to_hex(&object->oid)); |
Taylor Blau | fa95666 | 2021-08-24 12:15:51 -0400 | [diff] [blame] | 1666 | test_bitmap_type(tdata, object, bitmap_pos); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1667 | |
| 1668 | bitmap_set(tdata->base, bitmap_pos); |
| 1669 | display_progress(tdata->prg, ++tdata->seen); |
| 1670 | } |
| 1671 | |
| 1672 | static void test_show_commit(struct commit *commit, void *data) |
| 1673 | { |
| 1674 | struct bitmap_test_data *tdata = data; |
| 1675 | int bitmap_pos; |
| 1676 | |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 1677 | bitmap_pos = bitmap_position(tdata->bitmap_git, |
brian m. carlson | 3c77144 | 2019-02-19 00:04:58 +0000 | [diff] [blame] | 1678 | &commit->object.oid); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1679 | if (bitmap_pos < 0) |
brian m. carlson | f2fd076 | 2015-11-10 02:22:28 +0000 | [diff] [blame] | 1680 | die("Object not in bitmap: %s\n", oid_to_hex(&commit->object.oid)); |
Taylor Blau | fa95666 | 2021-08-24 12:15:51 -0400 | [diff] [blame] | 1681 | test_bitmap_type(tdata, &commit->object, bitmap_pos); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1682 | |
| 1683 | bitmap_set(tdata->base, bitmap_pos); |
| 1684 | display_progress(tdata->prg, ++tdata->seen); |
| 1685 | } |
| 1686 | |
| 1687 | void test_bitmap_walk(struct rev_info *revs) |
| 1688 | { |
| 1689 | struct object *root; |
| 1690 | struct bitmap *result = NULL; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1691 | size_t result_popcnt; |
| 1692 | struct bitmap_test_data tdata; |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 1693 | struct bitmap_index *bitmap_git; |
Taylor Blau | 98c31f3 | 2020-12-08 17:05:09 -0500 | [diff] [blame] | 1694 | struct ewah_bitmap *bm; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1695 | |
Nguyễn Thái Ngọc Duy | 7c14112 | 2018-11-10 06:49:08 +0100 | [diff] [blame] | 1696 | if (!(bitmap_git = prepare_bitmap_git(revs->repo))) |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1697 | die("failed to load bitmap indexes"); |
| 1698 | |
| 1699 | if (revs->pending.nr != 1) |
| 1700 | die("you must specify exactly one commit to test"); |
| 1701 | |
| 1702 | fprintf(stderr, "Bitmap v%d test (%d entries loaded)\n", |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 1703 | bitmap_git->version, bitmap_git->entry_count); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1704 | |
| 1705 | root = revs->pending.objects[0].item; |
Taylor Blau | 98c31f3 | 2020-12-08 17:05:09 -0500 | [diff] [blame] | 1706 | bm = bitmap_for_commit(bitmap_git, (struct commit *)root); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1707 | |
Taylor Blau | 98c31f3 | 2020-12-08 17:05:09 -0500 | [diff] [blame] | 1708 | if (bm) { |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1709 | fprintf(stderr, "Found bitmap for %s. %d bits / %08x checksum\n", |
brian m. carlson | f2fd076 | 2015-11-10 02:22:28 +0000 | [diff] [blame] | 1710 | oid_to_hex(&root->oid), (int)bm->bit_size, ewah_checksum(bm)); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1711 | |
| 1712 | result = ewah_to_bitmap(bm); |
| 1713 | } |
| 1714 | |
Junio C Hamano | afe8a90 | 2022-05-02 09:50:37 -0700 | [diff] [blame] | 1715 | if (!result) |
brian m. carlson | f2fd076 | 2015-11-10 02:22:28 +0000 | [diff] [blame] | 1716 | die("Commit %s doesn't have an indexed bitmap", oid_to_hex(&root->oid)); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1717 | |
| 1718 | revs->tag_objects = 1; |
| 1719 | revs->tree_objects = 1; |
| 1720 | revs->blob_objects = 1; |
| 1721 | |
| 1722 | result_popcnt = bitmap_popcount(result); |
| 1723 | |
| 1724 | if (prepare_revision_walk(revs)) |
| 1725 | die("revision walk setup failed"); |
| 1726 | |
Jonathan Tan | 3ae5fa0 | 2018-06-07 12:04:13 -0700 | [diff] [blame] | 1727 | tdata.bitmap_git = bitmap_git; |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1728 | tdata.base = bitmap_new(); |
Taylor Blau | fa95666 | 2021-08-24 12:15:51 -0400 | [diff] [blame] | 1729 | tdata.commits = ewah_to_bitmap(bitmap_git->commits); |
| 1730 | tdata.trees = ewah_to_bitmap(bitmap_git->trees); |
| 1731 | tdata.blobs = ewah_to_bitmap(bitmap_git->blobs); |
| 1732 | tdata.tags = ewah_to_bitmap(bitmap_git->tags); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1733 | tdata.prg = start_progress("Verifying bitmap entries", result_popcnt); |
| 1734 | tdata.seen = 0; |
| 1735 | |
| 1736 | traverse_commit_list(revs, &test_show_commit, &test_show_object, &tdata); |
| 1737 | |
| 1738 | stop_progress(&tdata.prg); |
| 1739 | |
| 1740 | if (bitmap_equals(result, tdata.base)) |
| 1741 | fprintf(stderr, "OK!\n"); |
| 1742 | else |
Jeff King | 2978b00 | 2020-12-08 17:03:33 -0500 | [diff] [blame] | 1743 | die("mismatch in bitmap results"); |
Stefan Beller | f86a374 | 2015-03-30 18:22:10 -0700 | [diff] [blame] | 1744 | |
Taylor Blau | 0228151 | 2021-10-26 17:01:23 -0400 | [diff] [blame] | 1745 | bitmap_free(result); |
| 1746 | bitmap_free(tdata.base); |
| 1747 | bitmap_free(tdata.commits); |
| 1748 | bitmap_free(tdata.trees); |
| 1749 | bitmap_free(tdata.blobs); |
| 1750 | bitmap_free(tdata.tags); |
Jonathan Tan | f3c23db | 2018-06-07 12:04:14 -0700 | [diff] [blame] | 1751 | free_bitmap_index(bitmap_git); |
Vicent Marti | fff4275 | 2013-12-21 09:00:01 -0500 | [diff] [blame] | 1752 | } |
Vicent Marti | 7cc8f97 | 2013-12-21 09:00:16 -0500 | [diff] [blame] | 1753 | |
Taylor Blau | dff5e49 | 2021-03-31 21:32:07 -0400 | [diff] [blame] | 1754 | int test_bitmap_commits(struct repository *r) |
| 1755 | { |
| 1756 | struct bitmap_index *bitmap_git = prepare_bitmap_git(r); |
| 1757 | struct object_id oid; |
| 1758 | MAYBE_UNUSED void *value; |
| 1759 | |
| 1760 | if (!bitmap_git) |
| 1761 | die("failed to load bitmap indexes"); |
| 1762 | |
| 1763 | kh_foreach(bitmap_git->bitmaps, oid, value, { |
| 1764 | printf("%s\n", oid_to_hex(&oid)); |
| 1765 | }); |
| 1766 | |
| 1767 | free_bitmap_index(bitmap_git); |
| 1768 | |
| 1769 | return 0; |
| 1770 | } |
| 1771 | |
Taylor Blau | a05f02b | 2021-09-14 18:06:02 -0400 | [diff] [blame] | 1772 | int test_bitmap_hashes(struct repository *r) |
| 1773 | { |
| 1774 | struct bitmap_index *bitmap_git = prepare_bitmap_git(r); |
| 1775 | struct object_id oid; |
| 1776 | uint32_t i, index_pos; |
| 1777 | |
Jeff King | 875da7f | 2021-11-05 05:01:31 -0400 | [diff] [blame] | 1778 | if (!bitmap_git || !bitmap_git->hashes) |
Taylor Blau | a05f02b | 2021-09-14 18:06:02 -0400 | [diff] [blame] | 1779 | goto cleanup; |
| 1780 | |
| 1781 | for (i = 0; i < bitmap_num_objects(bitmap_git); i++) { |
| 1782 | if (bitmap_is_midx(bitmap_git)) |
| 1783 | index_pos = pack_pos_to_midx(bitmap_git->midx, i); |
| 1784 | else |
| 1785 | index_pos = pack_pos_to_index(bitmap_git->pack, i); |
| 1786 | |
| 1787 | nth_bitmap_object_oid(bitmap_git, &oid, index_pos); |
| 1788 | |
| 1789 | printf("%s %"PRIu32"\n", |
| 1790 | oid_to_hex(&oid), get_be32(bitmap_git->hashes + index_pos)); |
| 1791 | } |
| 1792 | |
| 1793 | cleanup: |
| 1794 | free_bitmap_index(bitmap_git); |
| 1795 | |
| 1796 | return 0; |
| 1797 | } |
| 1798 | |
Jeff King | 449fa5e | 2020-12-08 17:04:34 -0500 | [diff] [blame] | 1799 | int rebuild_bitmap(const uint32_t *reposition, |
| 1800 | struct ewah_bitmap *source, |
| 1801 | struct bitmap *dest) |
Vicent Marti | 7cc8f97 | 2013-12-21 09:00:16 -0500 | [diff] [blame] | 1802 | { |
| 1803 | uint32_t pos = 0; |
| 1804 | struct ewah_iterator it; |
| 1805 | eword_t word; |
| 1806 | |
| 1807 | ewah_iterator_init(&it, source); |
| 1808 | |
| 1809 | while (ewah_iterator_next(&word, &it)) { |
| 1810 | uint32_t offset, bit_pos; |
| 1811 | |
Jeff King | 34b935c | 2015-06-03 02:39:37 -0400 | [diff] [blame] | 1812 | for (offset = 0; offset < BITS_IN_EWORD; ++offset) { |
Vicent Marti | 7cc8f97 | 2013-12-21 09:00:16 -0500 | [diff] [blame] | 1813 | if ((word >> offset) == 0) |
| 1814 | break; |
| 1815 | |
| 1816 | offset += ewah_bit_ctz64(word >> offset); |
| 1817 | |
| 1818 | bit_pos = reposition[pos + offset]; |
| 1819 | if (bit_pos > 0) |
| 1820 | bitmap_set(dest, bit_pos - 1); |
| 1821 | else /* can't reuse, we don't have the object */ |
| 1822 | return -1; |
| 1823 | } |
| 1824 | |
Jeff King | 34b935c | 2015-06-03 02:39:37 -0400 | [diff] [blame] | 1825 | pos += BITS_IN_EWORD; |
Vicent Marti | 7cc8f97 | 2013-12-21 09:00:16 -0500 | [diff] [blame] | 1826 | } |
| 1827 | return 0; |
| 1828 | } |
| 1829 | |
Jeff King | 449fa5e | 2020-12-08 17:04:34 -0500 | [diff] [blame] | 1830 | uint32_t *create_bitmap_mapping(struct bitmap_index *bitmap_git, |
| 1831 | struct packing_data *mapping) |
Vicent Marti | 7cc8f97 | 2013-12-21 09:00:16 -0500 | [diff] [blame] | 1832 | { |
| 1833 | uint32_t i, num_objects; |
| 1834 | uint32_t *reposition; |
Vicent Marti | 7cc8f97 | 2013-12-21 09:00:16 -0500 | [diff] [blame] | 1835 | |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 1836 | if (!bitmap_is_midx(bitmap_git)) |
| 1837 | load_reverse_index(bitmap_git); |
| 1838 | else if (load_midx_revindex(bitmap_git->midx) < 0) |
| 1839 | BUG("rebuild_existing_bitmaps: missing required rev-cache " |
| 1840 | "extension"); |
| 1841 | |
Taylor Blau | ed18462 | 2021-08-31 16:52:12 -0400 | [diff] [blame] | 1842 | num_objects = bitmap_num_objects(bitmap_git); |
René Scharfe | ca56dad | 2021-03-13 17:17:22 +0100 | [diff] [blame] | 1843 | CALLOC_ARRAY(reposition, num_objects); |
Vicent Marti | 7cc8f97 | 2013-12-21 09:00:16 -0500 | [diff] [blame] | 1844 | |
| 1845 | for (i = 0; i < num_objects; ++i) { |
Jeff King | 3df28ca | 2019-06-20 03:41:03 -0400 | [diff] [blame] | 1846 | struct object_id oid; |
Vicent Marti | 7cc8f97 | 2013-12-21 09:00:16 -0500 | [diff] [blame] | 1847 | struct object_entry *oe; |
Taylor Blau | 8de300e | 2021-09-14 18:06:04 -0400 | [diff] [blame] | 1848 | uint32_t index_pos; |
Vicent Marti | 7cc8f97 | 2013-12-21 09:00:16 -0500 | [diff] [blame] | 1849 | |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 1850 | if (bitmap_is_midx(bitmap_git)) |
Taylor Blau | 8de300e | 2021-09-14 18:06:04 -0400 | [diff] [blame] | 1851 | index_pos = pack_pos_to_midx(bitmap_git->midx, i); |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 1852 | else |
Taylor Blau | 8de300e | 2021-09-14 18:06:04 -0400 | [diff] [blame] | 1853 | index_pos = pack_pos_to_index(bitmap_git->pack, i); |
| 1854 | nth_bitmap_object_oid(bitmap_git, &oid, index_pos); |
Jeff King | 3a37876 | 2019-09-05 21:36:05 -0400 | [diff] [blame] | 1855 | oe = packlist_find(mapping, &oid); |
Vicent Marti | 7cc8f97 | 2013-12-21 09:00:16 -0500 | [diff] [blame] | 1856 | |
Taylor Blau | 8de300e | 2021-09-14 18:06:04 -0400 | [diff] [blame] | 1857 | if (oe) { |
Nguyễn Thái Ngọc Duy | 06af3bb | 2018-04-14 17:35:04 +0200 | [diff] [blame] | 1858 | reposition[i] = oe_in_pack_pos(mapping, oe) + 1; |
Taylor Blau | 8de300e | 2021-09-14 18:06:04 -0400 | [diff] [blame] | 1859 | if (bitmap_git->hashes && !oe->hash) |
| 1860 | oe->hash = get_be32(bitmap_git->hashes + index_pos); |
| 1861 | } |
Vicent Marti | 7cc8f97 | 2013-12-21 09:00:16 -0500 | [diff] [blame] | 1862 | } |
| 1863 | |
Jeff King | 449fa5e | 2020-12-08 17:04:34 -0500 | [diff] [blame] | 1864 | return reposition; |
Vicent Marti | 7cc8f97 | 2013-12-21 09:00:16 -0500 | [diff] [blame] | 1865 | } |
Jonathan Tan | f3c23db | 2018-06-07 12:04:14 -0700 | [diff] [blame] | 1866 | |
| 1867 | void free_bitmap_index(struct bitmap_index *b) |
| 1868 | { |
| 1869 | if (!b) |
| 1870 | return; |
| 1871 | |
| 1872 | if (b->map) |
| 1873 | munmap(b->map, b->map_size); |
| 1874 | ewah_pool_free(b->commits); |
| 1875 | ewah_pool_free(b->trees); |
| 1876 | ewah_pool_free(b->blobs); |
| 1877 | ewah_pool_free(b->tags); |
Taylor Blau | 655b856 | 2021-10-26 17:01:26 -0400 | [diff] [blame] | 1878 | if (b->bitmaps) { |
| 1879 | struct stored_bitmap *sb; |
| 1880 | kh_foreach_value(b->bitmaps, sb, { |
| 1881 | ewah_pool_free(sb->root); |
| 1882 | free(sb); |
| 1883 | }); |
| 1884 | } |
brian m. carlson | 3c77144 | 2019-02-19 00:04:58 +0000 | [diff] [blame] | 1885 | kh_destroy_oid_map(b->bitmaps); |
Jonathan Tan | f3c23db | 2018-06-07 12:04:14 -0700 | [diff] [blame] | 1886 | free(b->ext_index.objects); |
| 1887 | free(b->ext_index.hashes); |
Taylor Blau | 655b856 | 2021-10-26 17:01:26 -0400 | [diff] [blame] | 1888 | kh_destroy_oid_pos(b->ext_index.positions); |
Jonathan Tan | f3c23db | 2018-06-07 12:04:14 -0700 | [diff] [blame] | 1889 | bitmap_free(b->result); |
Jeff King | 30cdc33 | 2018-08-21 15:07:01 -0400 | [diff] [blame] | 1890 | bitmap_free(b->haves); |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 1891 | if (bitmap_is_midx(b)) { |
| 1892 | /* |
| 1893 | * Multi-pack bitmaps need to have resources associated with |
| 1894 | * their on-disk reverse indexes unmapped so that stale .rev and |
| 1895 | * .bitmap files can be removed. |
| 1896 | * |
| 1897 | * Unlike pack-based bitmaps, multi-pack bitmaps can be read and |
| 1898 | * written in the same 'git multi-pack-index write --bitmap' |
| 1899 | * process. Close resources so they can be removed safely on |
| 1900 | * platforms like Windows. |
| 1901 | */ |
| 1902 | close_midx_revindex(b->midx); |
| 1903 | } |
Jonathan Tan | f3c23db | 2018-06-07 12:04:14 -0700 | [diff] [blame] | 1904 | free(b); |
| 1905 | } |
Jeff King | 30cdc33 | 2018-08-21 15:07:01 -0400 | [diff] [blame] | 1906 | |
brian m. carlson | 3c77144 | 2019-02-19 00:04:58 +0000 | [diff] [blame] | 1907 | int bitmap_has_oid_in_uninteresting(struct bitmap_index *bitmap_git, |
| 1908 | const struct object_id *oid) |
Jeff King | 30cdc33 | 2018-08-21 15:07:01 -0400 | [diff] [blame] | 1909 | { |
Jeff King | 8ebf529 | 2019-12-18 12:25:41 +0100 | [diff] [blame] | 1910 | return bitmap_git && |
| 1911 | bitmap_walk_contains(bitmap_git, bitmap_git->haves, oid); |
Jeff King | 30cdc33 | 2018-08-21 15:07:01 -0400 | [diff] [blame] | 1912 | } |
Jeff King | 16950f8 | 2021-02-09 05:53:50 -0500 | [diff] [blame] | 1913 | |
| 1914 | static off_t get_disk_usage_for_type(struct bitmap_index *bitmap_git, |
| 1915 | enum object_type object_type) |
| 1916 | { |
| 1917 | struct bitmap *result = bitmap_git->result; |
Jeff King | 16950f8 | 2021-02-09 05:53:50 -0500 | [diff] [blame] | 1918 | off_t total = 0; |
| 1919 | struct ewah_iterator it; |
| 1920 | eword_t filter; |
| 1921 | size_t i; |
| 1922 | |
| 1923 | init_type_iterator(&it, bitmap_git, object_type); |
| 1924 | for (i = 0; i < result->word_alloc && |
| 1925 | ewah_iterator_next(&filter, &it); i++) { |
| 1926 | eword_t word = result->words[i] & filter; |
| 1927 | size_t base = (i * BITS_IN_EWORD); |
| 1928 | unsigned offset; |
| 1929 | |
| 1930 | if (!word) |
| 1931 | continue; |
| 1932 | |
| 1933 | for (offset = 0; offset < BITS_IN_EWORD; offset++) { |
Jeff King | 16950f8 | 2021-02-09 05:53:50 -0500 | [diff] [blame] | 1934 | if ((word >> offset) == 0) |
| 1935 | break; |
| 1936 | |
| 1937 | offset += ewah_bit_ctz64(word >> offset); |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 1938 | |
| 1939 | if (bitmap_is_midx(bitmap_git)) { |
| 1940 | uint32_t pack_pos; |
| 1941 | uint32_t midx_pos = pack_pos_to_midx(bitmap_git->midx, base + offset); |
| 1942 | off_t offset = nth_midxed_offset(bitmap_git->midx, midx_pos); |
| 1943 | |
| 1944 | uint32_t pack_id = nth_midxed_pack_int_id(bitmap_git->midx, midx_pos); |
| 1945 | struct packed_git *pack = bitmap_git->midx->packs[pack_id]; |
| 1946 | |
| 1947 | if (offset_to_pack_pos(pack, offset, &pack_pos) < 0) { |
| 1948 | struct object_id oid; |
| 1949 | nth_midxed_object_oid(&oid, bitmap_git->midx, midx_pos); |
| 1950 | |
| 1951 | die(_("could not find %s in pack %s at offset %"PRIuMAX), |
| 1952 | oid_to_hex(&oid), |
| 1953 | pack->pack_name, |
| 1954 | (uintmax_t)offset); |
| 1955 | } |
| 1956 | |
| 1957 | total += pack_pos_to_offset(pack, pack_pos + 1) - offset; |
| 1958 | } else { |
| 1959 | size_t pos = base + offset; |
| 1960 | total += pack_pos_to_offset(bitmap_git->pack, pos + 1) - |
| 1961 | pack_pos_to_offset(bitmap_git->pack, pos); |
| 1962 | } |
Jeff King | 16950f8 | 2021-02-09 05:53:50 -0500 | [diff] [blame] | 1963 | } |
| 1964 | } |
| 1965 | |
| 1966 | return total; |
| 1967 | } |
| 1968 | |
| 1969 | static off_t get_disk_usage_for_extended(struct bitmap_index *bitmap_git) |
| 1970 | { |
| 1971 | struct bitmap *result = bitmap_git->result; |
Jeff King | 16950f8 | 2021-02-09 05:53:50 -0500 | [diff] [blame] | 1972 | struct eindex *eindex = &bitmap_git->ext_index; |
| 1973 | off_t total = 0; |
| 1974 | struct object_info oi = OBJECT_INFO_INIT; |
| 1975 | off_t object_size; |
| 1976 | size_t i; |
| 1977 | |
| 1978 | oi.disk_sizep = &object_size; |
| 1979 | |
| 1980 | for (i = 0; i < eindex->count; i++) { |
| 1981 | struct object *obj = eindex->objects[i]; |
| 1982 | |
Taylor Blau | ed18462 | 2021-08-31 16:52:12 -0400 | [diff] [blame] | 1983 | if (!bitmap_get(result, bitmap_num_objects(bitmap_git) + i)) |
Jeff King | 16950f8 | 2021-02-09 05:53:50 -0500 | [diff] [blame] | 1984 | continue; |
| 1985 | |
| 1986 | if (oid_object_info_extended(the_repository, &obj->oid, &oi, 0) < 0) |
| 1987 | die(_("unable to get disk usage of %s"), |
| 1988 | oid_to_hex(&obj->oid)); |
| 1989 | |
| 1990 | total += object_size; |
| 1991 | } |
| 1992 | return total; |
| 1993 | } |
| 1994 | |
| 1995 | off_t get_disk_usage_from_bitmap(struct bitmap_index *bitmap_git, |
| 1996 | struct rev_info *revs) |
| 1997 | { |
| 1998 | off_t total = 0; |
| 1999 | |
| 2000 | total += get_disk_usage_for_type(bitmap_git, OBJ_COMMIT); |
| 2001 | if (revs->tree_objects) |
| 2002 | total += get_disk_usage_for_type(bitmap_git, OBJ_TREE); |
| 2003 | if (revs->blob_objects) |
| 2004 | total += get_disk_usage_for_type(bitmap_git, OBJ_BLOB); |
| 2005 | if (revs->tag_objects) |
| 2006 | total += get_disk_usage_for_type(bitmap_git, OBJ_TAG); |
| 2007 | |
| 2008 | total += get_disk_usage_for_extended(bitmap_git); |
| 2009 | |
| 2010 | return total; |
| 2011 | } |
Taylor Blau | 3f267a1 | 2021-03-31 21:32:14 -0400 | [diff] [blame] | 2012 | |
Taylor Blau | 0f533c7 | 2021-08-31 16:52:21 -0400 | [diff] [blame] | 2013 | int bitmap_is_midx(struct bitmap_index *bitmap_git) |
| 2014 | { |
| 2015 | return !!bitmap_git->midx; |
| 2016 | } |
| 2017 | |
Taylor Blau | 3f267a1 | 2021-03-31 21:32:14 -0400 | [diff] [blame] | 2018 | const struct string_list *bitmap_preferred_tips(struct repository *r) |
| 2019 | { |
| 2020 | return repo_config_get_value_multi(r, "pack.preferbitmaptips"); |
| 2021 | } |
Taylor Blau | 711260f | 2021-08-31 16:52:16 -0400 | [diff] [blame] | 2022 | |
| 2023 | int bitmap_is_preferred_refname(struct repository *r, const char *refname) |
| 2024 | { |
| 2025 | const struct string_list *preferred_tips = bitmap_preferred_tips(r); |
| 2026 | struct string_list_item *item; |
| 2027 | |
| 2028 | if (!preferred_tips) |
| 2029 | return 0; |
| 2030 | |
| 2031 | for_each_string_list_item(item, preferred_tips) { |
| 2032 | if (starts_with(refname, item->string)) |
| 2033 | return 1; |
| 2034 | } |
| 2035 | |
| 2036 | return 0; |
| 2037 | } |