| Message ID | 43fd5e3597151a86254e18e08ffd8cadbcb6e4f0.1714422410.git.me@ttaylorr.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | pack-bitmap: pseudo-merge reachability bitmaps | expand |
On Mon, Apr 29, 2024 at 04:42:54PM -0400, Taylor Blau wrote: > Prepare to implement pseudo-merge bitmaps over the next several commits > by first describing the serialization format which will store the new > pseudo-merge bitmaps themselves. > > This format is implemented as an optional extension within the bitmap v1 > format, making it compatible with previous versions of Git, as well as > the original .bitmap implementation within JGit. > > The format (as well as a general description of pseudo-merge bitmaps, > and motivating use-case(s)) is described in detail in the patch contents > below, but the high-level description is as follows: > > - An array of pseudo-merge bitmaps, each containing a pair of EWAH > bitmaps: one describing the set of pseudo-merge "parents", and > another describing the set of object(s) reachable from those > parents. > > - A lookup table to determine which pseudo-merge(s) a given commit > appears in. An optional extended lookup table follows when there is > at least one commit which appears in multiple pseudo-merge groups. > > - Trailing metadata, including the number of pseudo-merge(s), number > of unique parents, the offset within the .bitmap file for the > pseudo-merge commit lookup table, and the size of the optional > extension itself. > > Signed-off-by: Taylor Blau <me@ttaylorr.com> > --- > Documentation/technical/bitmap-format.txt | 179 ++++++++++++++++++++++ > 1 file changed, 179 insertions(+) > > diff --git a/Documentation/technical/bitmap-format.txt b/Documentation/technical/bitmap-format.txt > index f5d200939b0..63a7177ac08 100644 > --- a/Documentation/technical/bitmap-format.txt > +++ b/Documentation/technical/bitmap-format.txt > @@ -255,3 +255,182 @@ triplet is - > xor_row (4 byte integer, network byte order): :: > The position of the triplet whose bitmap is used to compress > this one, or `0xffffffff` if no such bitmap exists. > + > +Pseudo-merge bitmaps > +-------------------- > + > +If the `BITMAP_OPT_PSEUDO_MERGES` flag is set, a variable number of > +bytes (preceding the name-hash cache, commit lookup table, and trailing > +checksum) of the `.bitmap` file is used to store pseudo-merge bitmaps. Here you say that the section is supposed to come before some other sections, whereas the first sentence in the "File format" section says that it is the last section in a bitmap file. > +A "pseudo-merge bitmap" is used to refer to a pair of bitmaps, as > +follows: > + > +Commit bitmap:: > + > + A bitmap whose set bits describe the set of commits included in the > + pseudo-merge's "merge" bitmap (as below). > + > +Merge bitmap:: > + > + A bitmap whose set bits describe the reachability closure over the set > + of commits in the pseudo-merge's "commits" bitmap (as above). An > + identical bitmap would be generated for an octopus merge with the same > + set of parents as described in the commits bitmap. > + > +Pseudo-merge bitmaps can accelerate bitmap traversals when all commits > +for a given pseudo-merge are listed on either side of the traversal, > +either directly (by explicitly asking for them as part of the `HAVES` > +or `WANTS`) or indirectly (by encountering them during a fill-in > +traversal). > + > +=== Use-cases I feel like starting with the problems that the whole feature is intended to solve would help the reading flow quite a bit. So I'd move this whole section up. > +For example, suppose there exists a pseudo-merge bitmap with a large > +number of commits, all of which are listed in the `WANTS` section of > +some bitmap traversal query. When pseudo-merge bitmaps are enabled, the > +bitmap machinery can quickly determine there is a pseudo-merge which > +satisfies some subset of the wanted objects on either side of the query. > +Then, we can inflate the EWAH-compressed bitmap, and `OR` it in to the > +resulting bitmap. By contrast, without pseudo-merge bitmaps, we would > +have to repeat the decompression and `OR`-ing step over a potentially > +large number of individual bitmaps, which can take proportionally more > +time. > + > +Another benefit of pseudo-merges arises when there is some combination > +of (a) a large number of references, with (b) poor bitmap coverage, and > +(c) deep, nested trees, making fill-in traversal relatively expensive. > +For example, suppose that there are a large enough number of tags where > +bitmapping each of the tags individually is infeasible. Without > +pseudo-merge bitmaps, computing the result of, say, `git rev-list > +--use-bitmap-index --count --objects --tags` would likely require a > +large amount of fill-in traversal. But when a large quantity of those > +tags are stored together in a pseudo-merge bitmap, the bitmap machinery > +can take advantage of the fact that we only care about the union of > +objects reachable from all of those tags, and answer the query much > +faster. I would start the explanation with a discussion of the problem before presenting the solution to those problems. In the current version it's the other way round, you present a solution to a problem that isn't yet explained It might also be helpful to discuss a bit who is supposed to create those pseudo-merge bitmaps. Does Git do so automatically for all tags? Does the admin have to configure this? If the latter, when do you want to create those and what strategies are there to create them? > +=== File format > + > +If enabled, pseudo-merge bitmaps are stored in an optional section at > +the end of a `.bitmap` file. The format is as follows: > + > +.... > ++-------------------------------------------+ > +| .bitmap File | > ++-------------------------------------------+ > +| | > +| Pseudo-merge bitmaps (Variable Length) | > +| +---------------------------+ | > +| | commits_bitmap (EWAH) | | > +| +---------------------------+ | > +| | merge_bitmap (EWAH) | | > +| +---------------------------+ | > +| | > ++-------------------------------------------+ > +| | > +| Lookup Table | > +| +------------+--------------+ | > +| | commit_pos | offset | | > +| +------------+--------------+ | > +| | 4 bytes | 8 bytes | | > +| +------------+--------------+ | It's a bit confusing that in the EWAH section above you have the type of the fields in the same line as the field itself, whereas here you have them formatted in a separate box. This makes the reader wonder at first whether this is two or four fields. How about the following instead: | Lookup Table | | +---------------------------+ | | | commit_pos (4 bytes) | | | +---------------------------+ | | | offset (8 bytes) | | | +---------------------------+ | The same comment applies to the other sections further down. > +| | > +| Offset Cases: | > +| ------------- | > +| | > +| 1. MSB Unset: single pseudo-merge bitmap | > +| + offset to pseudo-merge bitmap | > +| | > +| 2. MSB Set: multiple pseudo-merges | > +| + offset to extended lookup table | > +| | > ++-------------------------------------------+ > +| | > +| Extended Lookup Table (Optional) | > +| | > +| +----+----------+----------+----------+ | > +| | N | Offset 1 | .... | Offset N | | > +| +----+----------+----------+----------+ | > +| | | 8 bytes | .... | 8 bytes | | > +| +----+----------+----------+----------+ | > +| | > ++-------------------------------------------+ > +| | > +| Pseudo-merge Metadata | > +| +------------------+----------------+ | > +| | # pseudo-merges | # Commits | | > +| +------------------+----------------+ | > +| | 4 bytes | 4 bytes | | > +| +------------------+----------------+ | > +| | > +| +------------------+----------------+ | > +| | Lookup offset | Extension size | | > +| +------------------+----------------+ | > +| | 8 bytes | 8 bytes | | > +| +------------------+----------------+ | > +| | > ++-------------------------------------------+ > +.... > + > +* One or more pseudo-merge bitmaps, each containing: In case you have multiple pseudo-merge bitmaps, is the whole of the above repeated for each bitmap or is it just parts of it? > + ** `commits_bitmap`, an EWAH-compressed bitmap describing the set of > + commits included in the this psuedo-merge. > + > + ** `merge_bitmap`, an EWAH-compressed bitmap describing the union of > + the set of objects reachable from all commits listed in the > + `commits_bitmap`. > + > +* A lookup table, mapping pseudo-merged commits to the pseudo-merges > + they belong to. Entries appear in increasing order of each commit's > + bit position. Each entry is 12 bytes wide, and is comprised of the > + following: > + > + ** `commit_pos`, a 4-byte unsigned value (in network byte-order) > + containing the bit position for this commit. > + > + ** `offset`, an 8-byte unsigned value (also in network byte-order) > + containing either one of two possible offsets, depending on whether or > + not the most-significant bit is set. > + > + *** If unset (i.e. `offset & ((uint64_t)1<<63) == 0`), the offset > + (relative to the beginning of the `.bitmap` file) at which the > + pseudo-merge bitmap for this commit can be read. This indicates > + only a single pseudo-merge bitmap contains this commit. > + > + *** If set (i.e. `offset & ((uint64_t)1<<63) != 0`), the offset > + (again relative to the beginning of the `.bitmap` file) at which > + the extended offset table can be located describing the set of > + pseudo-merge bitmaps which contain this commit. This indicates > + that multiple pseudo-merge bitmaps contain this commit. > + > +* An (optional) extended lookup table (written if and only if there is > + at least one commit which appears in more than one pseudo-merge). > + There are as many entries as commits which appear in multiple > + pseudo-merges. Each entry contains the following: > + > + ** `N`, a 4-byte unsigned value equal to the number of pseudo-merges > + which contain a given commit. How exactly is the given commit identified? Or in other words, given an entry in the lookup table here, how do I figure out what commit it belongs to? > + ** An array of `N` 8-byte unsigned values, each of which is > + interpreted as an offset (relative to the beginning of the > + `.bitmap` file) at which a pseudo-merge bitmap for this commit can > + be read. These values occur in no particular order. > + > +* Positions for all pseudo-merges, each stored as an 8-byte unsigned > + value (in network byte-order) containing the offset (relative to the > + beginnign of the `.bitmap` file) of each consecutive pseudo-merge. s/beginnign/beginning Patrick
On Mon, May 06, 2024 at 01:52:44PM +0200, Patrick Steinhardt wrote: > > diff --git a/Documentation/technical/bitmap-format.txt b/Documentation/technical/bitmap-format.txt > > index f5d200939b0..63a7177ac08 100644 > > --- a/Documentation/technical/bitmap-format.txt > > +++ b/Documentation/technical/bitmap-format.txt > > @@ -255,3 +255,182 @@ triplet is - > > xor_row (4 byte integer, network byte order): :: > > The position of the triplet whose bitmap is used to compress > > this one, or `0xffffffff` if no such bitmap exists. > > + > > +Pseudo-merge bitmaps > > +-------------------- > > + > > +If the `BITMAP_OPT_PSEUDO_MERGES` flag is set, a variable number of > > +bytes (preceding the name-hash cache, commit lookup table, and trailing > > +checksum) of the `.bitmap` file is used to store pseudo-merge bitmaps. > > Here you say that the section is supposed to come before some other > sections, whereas the first sentence in the "File format" section says > that it is the last section in a bitmap file. This is a quirk of the on-disk .bitmap format. New sections are added before existing sections, so if you were reading the file from beginning to end, you'd see the pseudo-merges extension, then the lookup table, then the name-hash cache (assuming all were written). I think that describing them in the order they were introduced here makes more sense, leaving their layout within the .bitmap file as an implementation detail. If you feel strongly otherwise, let's clean it up outside of this series since this whole portion of the documentation would need to be reordered. > > +A "pseudo-merge bitmap" is used to refer to a pair of bitmaps, as > > +follows: > > + > > +Commit bitmap:: > > + > > + A bitmap whose set bits describe the set of commits included in the > > + pseudo-merge's "merge" bitmap (as below). > > + > > +Merge bitmap:: > > + > > + A bitmap whose set bits describe the reachability closure over the set > > + of commits in the pseudo-merge's "commits" bitmap (as above). An > > + identical bitmap would be generated for an octopus merge with the same > > + set of parents as described in the commits bitmap. > > + > > +Pseudo-merge bitmaps can accelerate bitmap traversals when all commits > > +for a given pseudo-merge are listed on either side of the traversal, > > +either directly (by explicitly asking for them as part of the `HAVES` > > +or `WANTS`) or indirectly (by encountering them during a fill-in > > +traversal). > > + > > +=== Use-cases > > I feel like starting with the problems that the whole feature is > intended to solve would help the reading flow quite a bit. So I'd move > this whole section up. I think we may want something in the middle, more like a "problem statement". I wrote up a section that aims to do that, and tries to both briefly describe the problem (first), as well as a small overview of what the solution is. Let me know what you think: --- 8< --- diff --git a/Documentation/technical/bitmap-format.txt b/Documentation/technical/bitmap-format.txt index 63a7177ac0..144f377e35 100644 --- a/Documentation/technical/bitmap-format.txt +++ b/Documentation/technical/bitmap-format.txt @@ -263,6 +263,26 @@ If the `BITMAP_OPT_PSEUDO_MERGES` flag is set, a variable number of bytes (preceding the name-hash cache, commit lookup table, and trailing checksum) of the `.bitmap` file is used to store pseudo-merge bitmaps. +=== Problem + +When a bitmap traversal is performed, the client may have to do some +amount of "fill-in" traversal to find the set of objects reachable from +references which do not have bitmap coverage within the repository. + +This fill-in traversal can be expensive, and can become a significant +bottleneck in repositories that have a large number of references with +poor bitmap coverage. Ideally every single reference would have +reachability bitmap coverage, but this is also not feasible as doing so +would reduce cache locality when reading the .bitmap file, and we would +also spend a significant amount of time XOR'ing individual bitmaps +together to generate a result. + +This section describes "pseudo-merge bitmaps", a new kind of +reachability bitmap that describes the set of objects reachable from a +group of references, rather than an individual reference. + +=== Overview + A "pseudo-merge bitmap" is used to refer to a pair of bitmaps, as follows: --- >8 --- > > +For example, suppose there exists a pseudo-merge bitmap with a large > > +number of commits, all of which are listed in the `WANTS` section of > > +some bitmap traversal query. When pseudo-merge bitmaps are enabled, the > > +bitmap machinery can quickly determine there is a pseudo-merge which > > +satisfies some subset of the wanted objects on either side of the query. > > +Then, we can inflate the EWAH-compressed bitmap, and `OR` it in to the > > +resulting bitmap. By contrast, without pseudo-merge bitmaps, we would > > +have to repeat the decompression and `OR`-ing step over a potentially > > +large number of individual bitmaps, which can take proportionally more > > +time. > > + > > +Another benefit of pseudo-merges arises when there is some combination > > +of (a) a large number of references, with (b) poor bitmap coverage, and > > +(c) deep, nested trees, making fill-in traversal relatively expensive. > > +For example, suppose that there are a large enough number of tags where > > +bitmapping each of the tags individually is infeasible. Without > > +pseudo-merge bitmaps, computing the result of, say, `git rev-list > > +--use-bitmap-index --count --objects --tags` would likely require a > > +large amount of fill-in traversal. But when a large quantity of those > > +tags are stored together in a pseudo-merge bitmap, the bitmap machinery > > +can take advantage of the fact that we only care about the union of > > +objects reachable from all of those tags, and answer the query much > > +faster. > > I would start the explanation with a discussion of the problem before > presenting the solution to those problems. In the current version it's > the other way round, you present a solution to a problem that isn't yet > explained > > It might also be helpful to discuss a bit who is supposed to create > those pseudo-merge bitmaps. Does Git do so automatically for all tags? > Does the admin have to configure this? If the latter, when do you want > to create those and what strategies are there to create them? The pseudo-merge bitmaps are created by Git itself, configured via the options described later on in this series. I'm happy to add a specific call-out, but I would rather do it elsewhere outside of Documentation/technical/bitmap-format.txt, which I think should be mostly focused on the on-disk format. > > +=== File format > > + > > +If enabled, pseudo-merge bitmaps are stored in an optional section at > > +the end of a `.bitmap` file. The format is as follows: > > + > > +.... > > ++-------------------------------------------+ > > +| .bitmap File | > > ++-------------------------------------------+ > > +| | > > +| Pseudo-merge bitmaps (Variable Length) | > > +| +---------------------------+ | > > +| | commits_bitmap (EWAH) | | > > +| +---------------------------+ | > > +| | merge_bitmap (EWAH) | | > > +| +---------------------------+ | > > +| | > > ++-------------------------------------------+ > > +| | > > +| Lookup Table | > > +| +------------+--------------+ | > > +| | commit_pos | offset | | > > +| +------------+--------------+ | > > +| | 4 bytes | 8 bytes | | > > +| +------------+--------------+ | > > It's a bit confusing that in the EWAH section above you have the type of > the fields in the same line as the field itself, whereas here you have > them formatted in a separate box. This makes the reader wonder at first > whether this is two or four fields. How about the following instead: > > | Lookup Table | > | +---------------------------+ | > | | commit_pos (4 bytes) | | > | +---------------------------+ | > | | offset (8 bytes) | | > | +---------------------------+ | > > The same comment applies to the other sections further down. Much preferable, thanks. I made the change to use the suggested format here and elsewhere in the document. > In case you have multiple pseudo-merge bitmaps, is the whole of the > above repeated for each bitmap or is it just parts of it? The "pseudo-merge bitmaps" section contains a variable number of pairs of EWAH bitmaps, one pair for each pseudo-merge bitmap. I think this is covered below where it says "one or more pseudo-merge bitmaps, each containing: [...]", but let me know if I should be more explicit. > > +* An (optional) extended lookup table (written if and only if there is > > + at least one commit which appears in more than one pseudo-merge). > > + There are as many entries as commits which appear in multiple > > + pseudo-merges. Each entry contains the following: > > + > > + ** `N`, a 4-byte unsigned value equal to the number of pseudo-merges > > + which contain a given commit. > > How exactly is the given commit identified? Or in other words, given an > entry in the lookup table here, how do I figure out what commit it > belongs to? They aren't identified within this section. The extended lookup table is indexed into via the lookup table with an offset that is stored in the `offset` field when the MSB is set. > > + ** An array of `N` 8-byte unsigned values, each of which is > > + interpreted as an offset (relative to the beginning of the > > + `.bitmap` file) at which a pseudo-merge bitmap for this commit can > > + be read. These values occur in no particular order. > > + > > +* Positions for all pseudo-merges, each stored as an 8-byte unsigned > > + value (in network byte-order) containing the offset (relative to the > > + beginnign of the `.bitmap` file) of each consecutive pseudo-merge. > > s/beginnign/beginning Great catch, thanks! Thanks, Taylor
On Mon, May 06, 2024 at 12:37:35PM -0400, Taylor Blau wrote: > On Mon, May 06, 2024 at 01:52:44PM +0200, Patrick Steinhardt wrote: > > > diff --git a/Documentation/technical/bitmap-format.txt b/Documentation/technical/bitmap-format.txt > > > index f5d200939b0..63a7177ac08 100644 > > > --- a/Documentation/technical/bitmap-format.txt > > > +++ b/Documentation/technical/bitmap-format.txt > > > @@ -255,3 +255,182 @@ triplet is - > > > xor_row (4 byte integer, network byte order): :: > > > The position of the triplet whose bitmap is used to compress > > > this one, or `0xffffffff` if no such bitmap exists. > > > + > > > +Pseudo-merge bitmaps > > > +-------------------- > > > + > > > +If the `BITMAP_OPT_PSEUDO_MERGES` flag is set, a variable number of > > > +bytes (preceding the name-hash cache, commit lookup table, and trailing > > > +checksum) of the `.bitmap` file is used to store pseudo-merge bitmaps. > > > > Here you say that the section is supposed to come before some other > > sections, whereas the first sentence in the "File format" section says > > that it is the last section in a bitmap file. > > This is a quirk of the on-disk .bitmap format. New sections are added > before existing sections, so if you were reading the file from beginning > to end, you'd see the pseudo-merges extension, then the lookup table, > then the name-hash cache (assuming all were written). > > I think that describing them in the order they were introduced here > makes more sense, leaving their layout within the .bitmap file as an > implementation detail. > > If you feel strongly otherwise, let's clean it up outside of this series > since this whole portion of the documentation would need to be > reordered. I don't, thanks for the explanation. [snip] > +=== Overview > + > A "pseudo-merge bitmap" is used to refer to a pair of bitmaps, as > follows: > --- >8 --- > > > > +For example, suppose there exists a pseudo-merge bitmap with a large > > > +number of commits, all of which are listed in the `WANTS` section of > > > +some bitmap traversal query. When pseudo-merge bitmaps are enabled, the > > > +bitmap machinery can quickly determine there is a pseudo-merge which > > > +satisfies some subset of the wanted objects on either side of the query. > > > +Then, we can inflate the EWAH-compressed bitmap, and `OR` it in to the > > > +resulting bitmap. By contrast, without pseudo-merge bitmaps, we would > > > +have to repeat the decompression and `OR`-ing step over a potentially > > > +large number of individual bitmaps, which can take proportionally more > > > +time. > > > + > > > +Another benefit of pseudo-merges arises when there is some combination > > > +of (a) a large number of references, with (b) poor bitmap coverage, and > > > +(c) deep, nested trees, making fill-in traversal relatively expensive. > > > +For example, suppose that there are a large enough number of tags where > > > +bitmapping each of the tags individually is infeasible. Without > > > +pseudo-merge bitmaps, computing the result of, say, `git rev-list > > > +--use-bitmap-index --count --objects --tags` would likely require a > > > +large amount of fill-in traversal. But when a large quantity of those > > > +tags are stored together in a pseudo-merge bitmap, the bitmap machinery > > > +can take advantage of the fact that we only care about the union of > > > +objects reachable from all of those tags, and answer the query much > > > +faster. > > > > I would start the explanation with a discussion of the problem before > > presenting the solution to those problems. In the current version it's > > the other way round, you present a solution to a problem that isn't yet > > explained > > > > It might also be helpful to discuss a bit who is supposed to create > > those pseudo-merge bitmaps. Does Git do so automatically for all tags? > > Does the admin have to configure this? If the latter, when do you want > > to create those and what strategies are there to create them? > > The pseudo-merge bitmaps are created by Git itself, configured via the > options described later on in this series. I'm happy to add a specific > call-out, but I would rather do it elsewhere outside of > Documentation/technical/bitmap-format.txt, which I think should be > mostly focused on the on-disk format. I think what throws me off here is that you already go into the non-technical somewhat by explaining their usecases. This causes us to end up halfwhere between "We motivate the changes" and "We document the technical parts, only". [snip] > > In case you have multiple pseudo-merge bitmaps, is the whole of the > > above repeated for each bitmap or is it just parts of it? > > The "pseudo-merge bitmaps" section contains a variable number of pairs > of EWAH bitmaps, one pair for each pseudo-merge bitmap. I think this is > covered below where it says "one or more pseudo-merge bitmaps, each > containing: [...]", but let me know if I should be more explicit. > > > > +* An (optional) extended lookup table (written if and only if there is > > > + at least one commit which appears in more than one pseudo-merge). > > > + There are as many entries as commits which appear in multiple > > > + pseudo-merges. Each entry contains the following: > > > + > > > + ** `N`, a 4-byte unsigned value equal to the number of pseudo-merges > > > + which contain a given commit. > > > > How exactly is the given commit identified? Or in other words, given an > > entry in the lookup table here, how do I figure out what commit it > > belongs to? > > They aren't identified within this section. The extended lookup table is > indexed into via the lookup table with an offset that is stored in the > `offset` field when the MSB is set. Okay. Would this explanation be a good addition to the document? Patrick
On Fri, May 10, 2024 at 01:46:59PM +0200, Patrick Steinhardt wrote: > > > > +* An (optional) extended lookup table (written if and only if there is > > > > + at least one commit which appears in more than one pseudo-merge). > > > > + There are as many entries as commits which appear in multiple > > > > + pseudo-merges. Each entry contains the following: > > > > + > > > > + ** `N`, a 4-byte unsigned value equal to the number of pseudo-merges > > > > + which contain a given commit. > > > > > > How exactly is the given commit identified? Or in other words, given an > > > entry in the lookup table here, how do I figure out what commit it > > > belongs to? > > > > They aren't identified within this section. The extended lookup table is > > indexed into via the lookup table with an offset that is stored in the > > `offset` field when the MSB is set. > > Okay. Would this explanation be a good addition to the document? I think we already have this written down in the section above. See in the previous bullet point the section reading "containing either one of two possible offsets, deepening on whether or not the most-significant bit is set: [...]" Does that work? Thanks, Taylor
On Mon, May 13, 2024 at 03:47:01PM -0400, Taylor Blau wrote: > On Fri, May 10, 2024 at 01:46:59PM +0200, Patrick Steinhardt wrote: > > > > > +* An (optional) extended lookup table (written if and only if there is > > > > > + at least one commit which appears in more than one pseudo-merge). > > > > > + There are as many entries as commits which appear in multiple > > > > > + pseudo-merges. Each entry contains the following: > > > > > + > > > > > + ** `N`, a 4-byte unsigned value equal to the number of pseudo-merges > > > > > + which contain a given commit. > > > > > > > > How exactly is the given commit identified? Or in other words, given an > > > > entry in the lookup table here, how do I figure out what commit it > > > > belongs to? > > > > > > They aren't identified within this section. The extended lookup table is > > > indexed into via the lookup table with an offset that is stored in the > > > `offset` field when the MSB is set. > > > > Okay. Would this explanation be a good addition to the document? > > I think we already have this written down in the section above. See in > the previous bullet point the section reading "containing either one of > two possible offsets, deepening on whether or not the most-significant > bit is set: [...]" > > Does that work? One could have a back-reference to that section here. But I don't mind it too much overall. Thanks! Patrick
diff --git a/Documentation/technical/bitmap-format.txt b/Documentation/technical/bitmap-format.txt index f5d200939b0..63a7177ac08 100644 --- a/Documentation/technical/bitmap-format.txt +++ b/Documentation/technical/bitmap-format.txt @@ -255,3 +255,182 @@ triplet is - xor_row (4 byte integer, network byte order): :: The position of the triplet whose bitmap is used to compress this one, or `0xffffffff` if no such bitmap exists. + +Pseudo-merge bitmaps +-------------------- + +If the `BITMAP_OPT_PSEUDO_MERGES` flag is set, a variable number of +bytes (preceding the name-hash cache, commit lookup table, and trailing +checksum) of the `.bitmap` file is used to store pseudo-merge bitmaps. + +A "pseudo-merge bitmap" is used to refer to a pair of bitmaps, as +follows: + +Commit bitmap:: + + A bitmap whose set bits describe the set of commits included in the + pseudo-merge's "merge" bitmap (as below). + +Merge bitmap:: + + A bitmap whose set bits describe the reachability closure over the set + of commits in the pseudo-merge's "commits" bitmap (as above). An + identical bitmap would be generated for an octopus merge with the same + set of parents as described in the commits bitmap. + +Pseudo-merge bitmaps can accelerate bitmap traversals when all commits +for a given pseudo-merge are listed on either side of the traversal, +either directly (by explicitly asking for them as part of the `HAVES` +or `WANTS`) or indirectly (by encountering them during a fill-in +traversal). + +=== Use-cases + +For example, suppose there exists a pseudo-merge bitmap with a large +number of commits, all of which are listed in the `WANTS` section of +some bitmap traversal query. When pseudo-merge bitmaps are enabled, the +bitmap machinery can quickly determine there is a pseudo-merge which +satisfies some subset of the wanted objects on either side of the query. +Then, we can inflate the EWAH-compressed bitmap, and `OR` it in to the +resulting bitmap. By contrast, without pseudo-merge bitmaps, we would +have to repeat the decompression and `OR`-ing step over a potentially +large number of individual bitmaps, which can take proportionally more +time. + +Another benefit of pseudo-merges arises when there is some combination +of (a) a large number of references, with (b) poor bitmap coverage, and +(c) deep, nested trees, making fill-in traversal relatively expensive. +For example, suppose that there are a large enough number of tags where +bitmapping each of the tags individually is infeasible. Without +pseudo-merge bitmaps, computing the result of, say, `git rev-list +--use-bitmap-index --count --objects --tags` would likely require a +large amount of fill-in traversal. But when a large quantity of those +tags are stored together in a pseudo-merge bitmap, the bitmap machinery +can take advantage of the fact that we only care about the union of +objects reachable from all of those tags, and answer the query much +faster. + +=== File format + +If enabled, pseudo-merge bitmaps are stored in an optional section at +the end of a `.bitmap` file. The format is as follows: + +.... ++-------------------------------------------+ +| .bitmap File | ++-------------------------------------------+ +| | +| Pseudo-merge bitmaps (Variable Length) | +| +---------------------------+ | +| | commits_bitmap (EWAH) | | +| +---------------------------+ | +| | merge_bitmap (EWAH) | | +| +---------------------------+ | +| | ++-------------------------------------------+ +| | +| Lookup Table | +| +------------+--------------+ | +| | commit_pos | offset | | +| +------------+--------------+ | +| | 4 bytes | 8 bytes | | +| +------------+--------------+ | +| | +| Offset Cases: | +| ------------- | +| | +| 1. MSB Unset: single pseudo-merge bitmap | +| + offset to pseudo-merge bitmap | +| | +| 2. MSB Set: multiple pseudo-merges | +| + offset to extended lookup table | +| | ++-------------------------------------------+ +| | +| Extended Lookup Table (Optional) | +| | +| +----+----------+----------+----------+ | +| | N | Offset 1 | .... | Offset N | | +| +----+----------+----------+----------+ | +| | | 8 bytes | .... | 8 bytes | | +| +----+----------+----------+----------+ | +| | ++-------------------------------------------+ +| | +| Pseudo-merge Metadata | +| +------------------+----------------+ | +| | # pseudo-merges | # Commits | | +| +------------------+----------------+ | +| | 4 bytes | 4 bytes | | +| +------------------+----------------+ | +| | +| +------------------+----------------+ | +| | Lookup offset | Extension size | | +| +------------------+----------------+ | +| | 8 bytes | 8 bytes | | +| +------------------+----------------+ | +| | ++-------------------------------------------+ +.... + +* One or more pseudo-merge bitmaps, each containing: + + ** `commits_bitmap`, an EWAH-compressed bitmap describing the set of + commits included in the this psuedo-merge. + + ** `merge_bitmap`, an EWAH-compressed bitmap describing the union of + the set of objects reachable from all commits listed in the + `commits_bitmap`. + +* A lookup table, mapping pseudo-merged commits to the pseudo-merges + they belong to. Entries appear in increasing order of each commit's + bit position. Each entry is 12 bytes wide, and is comprised of the + following: + + ** `commit_pos`, a 4-byte unsigned value (in network byte-order) + containing the bit position for this commit. + + ** `offset`, an 8-byte unsigned value (also in network byte-order) + containing either one of two possible offsets, depending on whether or + not the most-significant bit is set. + + *** If unset (i.e. `offset & ((uint64_t)1<<63) == 0`), the offset + (relative to the beginning of the `.bitmap` file) at which the + pseudo-merge bitmap for this commit can be read. This indicates + only a single pseudo-merge bitmap contains this commit. + + *** If set (i.e. `offset & ((uint64_t)1<<63) != 0`), the offset + (again relative to the beginning of the `.bitmap` file) at which + the extended offset table can be located describing the set of + pseudo-merge bitmaps which contain this commit. This indicates + that multiple pseudo-merge bitmaps contain this commit. + +* An (optional) extended lookup table (written if and only if there is + at least one commit which appears in more than one pseudo-merge). + There are as many entries as commits which appear in multiple + pseudo-merges. Each entry contains the following: + + ** `N`, a 4-byte unsigned value equal to the number of pseudo-merges + which contain a given commit. + + ** An array of `N` 8-byte unsigned values, each of which is + interpreted as an offset (relative to the beginning of the + `.bitmap` file) at which a pseudo-merge bitmap for this commit can + be read. These values occur in no particular order. + +* Positions for all pseudo-merges, each stored as an 8-byte unsigned + value (in network byte-order) containing the offset (relative to the + beginnign of the `.bitmap` file) of each consecutive pseudo-merge. + +* A 4-byte unsigned value (in network byte-order) equal to the number of + pseudo-merges. + +* A 4-byte unsigned value (in network byte-order) equal to the number of + unique commits which appear in any pseudo-merge. + +* An 8-byte unsigned value (in network byte-order) equal to the number + of bytes between the start of the pseudo-merge section and the + beginning of the lookup table. + +* An 8-byte unsigned value (in network byte-order) equal to the number + of bytes in the pseudo-merge section (including this field).
Prepare to implement pseudo-merge bitmaps over the next several commits by first describing the serialization format which will store the new pseudo-merge bitmaps themselves. This format is implemented as an optional extension within the bitmap v1 format, making it compatible with previous versions of Git, as well as the original .bitmap implementation within JGit. The format (as well as a general description of pseudo-merge bitmaps, and motivating use-case(s)) is described in detail in the patch contents below, but the high-level description is as follows: - An array of pseudo-merge bitmaps, each containing a pair of EWAH bitmaps: one describing the set of pseudo-merge "parents", and another describing the set of object(s) reachable from those parents. - A lookup table to determine which pseudo-merge(s) a given commit appears in. An optional extended lookup table follows when there is at least one commit which appears in multiple pseudo-merge groups. - Trailing metadata, including the number of pseudo-merge(s), number of unique parents, the offset within the .bitmap file for the pseudo-merge commit lookup table, and the size of the optional extension itself. Signed-off-by: Taylor Blau <me@ttaylorr.com> --- Documentation/technical/bitmap-format.txt | 179 ++++++++++++++++++++++ 1 file changed, 179 insertions(+)