59f0d5073f
When a changed-path Bloom filter has either zero, or more than a certain number (commonly 512) of entries, the commit-graph machinery encodes it as "missing". More specifically, it sets the indices adjacent in the BIDX chunk as equal to each other to indicate a "length 0" filter; that is, that the filter occupies zero bytes on disk. This has heretofore been fine, since the commit-graph machinery has no need to care about these filters with too few or too many changed paths. Both cases act like no filter has been generated at all, and so there is no need to store them. In a subsequent commit, however, the commit-graph machinery will learn to only compute Bloom filters for some commits in the current commit-graph layer. This is a change from the current implementation which computes Bloom filters for all commits that are in the layer being written. Critically for this patch, only computing some of the Bloom filters means adding a third state for length 0 Bloom filters: zero entries, too many entries, or "hasn't been computed". It will be important for that future patch to distinguish between "not representable" (i.e., zero or too-many changed paths), and "hasn't been computed". In particular, we don't want to waste time recomputing filters that have already been computed. To that end, change how we store Bloom filters in the "computed but not representable" category: - Bloom filters with no entries are stored as a single byte with all bits low (i.e., all queries to that Bloom filter will return "definitely not") - Bloom filters with too many entries are stored as a single byte with all bits set high (i.e., all queries to that Bloom filter will return "maybe"). These rules are sufficient to not incur a behavior change by changing the on-disk representation of these two classes. Likewise, no specification changes are necessary for the commit-graph format, either: - Filters that were previously empty will be recomputed and stored according to the new rules, and - old clients reading filters generated by new clients will interpret the filters correctly and be none the wiser to how they were generated. Clients will invoke the Bloom machinery in more cases than before, but this can be addressed by returning a NULL filter when all bits are set high. This can be addressed in a future patch. Note that this does increase the size of on-disk commit-graphs, but far less than other proposals. In particular, this is generally more efficient than storing a bitmap for which commits haven't computed their Bloom filters. Storing a bitmap incurs a penalty of one bit per commit, whereas storing explicit filters as above incurs a penalty of one byte per too-large or empty commit. In practice, these boundary commits likely occupy a small proportion of the overall number of commits, and so the size penalty is likely smaller than storing a bitmap for all commits. See, for example, these relative proportions of such boundary commits (collected by SZEDER Gábor): | Percentage of | commit-graph | | | commits modifying | file size | | ├────────┬──────────────┼───────────────────┤ pct. | | 0 path | >= 512 paths | before | after | change | ┌────────────────┼────────┼──────────────┼─────────┼─────────┼───────────┤ | android-base | 13.20% | 0.13% | 37.468M | 37.534M | +0.1741 % | | cmssw | 0.15% | 0.23% | 17.118M | 17.119M | +0.0091 % | | cpython | 3.07% | 0.01% | 7.967M | 7.971M | +0.0423 % | | elasticsearch | 0.70% | 1.00% | 8.833M | 8.835M | +0.0128 % | | gcc | 0.00% | 0.08% | 16.073M | 16.074M | +0.0030 % | | gecko-dev | 0.14% | 0.64% | 59.868M | 59.874M | +0.0105 % | | git | 0.11% | 0.02% | 3.895M | 3.895M | +0.0020 % | | glibc | 0.02% | 0.10% | 3.555M | 3.555M | +0.0021 % | | go | 0.00% | 0.07% | 3.186M | 3.186M | +0.0018 % | | homebrew-cask | 0.40% | 0.02% | 7.035M | 7.035M | +0.0065 % | | homebrew-core | 0.01% | 0.01% | 11.611M | 11.611M | +0.0002 % | | jdk | 0.26% | 5.64% | 5.537M | 5.540M | +0.0590 % | | linux | 0.01% | 0.51% | 63.735M | 63.740M | +0.0073 % | | llvm-project | 0.12% | 0.03% | 25.515M | 25.516M | +0.0050 % | | rails | 0.10% | 0.10% | 6.252M | 6.252M | +0.0027 % | | rust | 0.07% | 0.17% | 9.364M | 9.364M | +0.0033 % | | tensorflow | 0.09% | 1.02% | 7.009M | 7.010M | +0.0158 % | | webkit | 0.05% | 0.31% | 17.405M | 17.406M | +0.0047 % | (where the above increase is determined by computing a non-split commit-graph before and after this patch). Given that these projects are all "large" by commit count, the storage cost by writing these filters explicitly is negligible. In the most extreme example, android-base (which has 494,848 commits at the time of writing) would have its commit-graph increase by a modest 68.4 KB. Finally, a test to exercise filters which contain too many changed path entries will be introduced in a subsequent patch. Suggested-by: SZEDER Gábor <szeder.dev@gmail.com> Suggested-by: Jakub Narębski <jnareb@gmail.com> Helped-by: Derrick Stolee <dstolee@microsoft.com> Helped-by: SZEDER Gábor <szeder.dev@gmail.com> Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
135 lines
5.9 KiB
Plaintext
135 lines
5.9 KiB
Plaintext
Git commit graph format
|
|
=======================
|
|
|
|
The Git commit graph stores a list of commit OIDs and some associated
|
|
metadata, including:
|
|
|
|
- The generation number of the commit. Commits with no parents have
|
|
generation number 1; commits with parents have generation number
|
|
one more than the maximum generation number of its parents. We
|
|
reserve zero as special, and can be used to mark a generation
|
|
number invalid or as "not computed".
|
|
|
|
- The root tree OID.
|
|
|
|
- The commit date.
|
|
|
|
- The parents of the commit, stored using positional references within
|
|
the graph file.
|
|
|
|
- The Bloom filter of the commit carrying the paths that were changed between
|
|
the commit and its first parent, if requested.
|
|
|
|
These positional references are stored as unsigned 32-bit integers
|
|
corresponding to the array position within the list of commit OIDs. Due
|
|
to some special constants we use to track parents, we can store at most
|
|
(1 << 30) + (1 << 29) + (1 << 28) - 1 (around 1.8 billion) commits.
|
|
|
|
== Commit graph files have the following format:
|
|
|
|
In order to allow extensions that add extra data to the graph, we organize
|
|
the body into "chunks" and provide a binary lookup table at the beginning
|
|
of the body. The header includes certain values, such as number of chunks
|
|
and hash type.
|
|
|
|
All multi-byte numbers are in network byte order.
|
|
|
|
HEADER:
|
|
|
|
4-byte signature:
|
|
The signature is: {'C', 'G', 'P', 'H'}
|
|
|
|
1-byte version number:
|
|
Currently, the only valid version is 1.
|
|
|
|
1-byte Hash Version (1 = SHA-1)
|
|
We infer the hash length (H) from this value.
|
|
|
|
1-byte number (C) of "chunks"
|
|
|
|
1-byte number (B) of base commit-graphs
|
|
We infer the length (H*B) of the Base Graphs chunk
|
|
from this value.
|
|
|
|
CHUNK LOOKUP:
|
|
|
|
(C + 1) * 12 bytes listing the table of contents for the chunks:
|
|
First 4 bytes describe the chunk id. Value 0 is a terminating label.
|
|
Other 8 bytes provide the byte-offset in current file for chunk to
|
|
start. (Chunks are ordered contiguously in the file, so you can infer
|
|
the length using the next chunk position if necessary.) Each chunk
|
|
ID appears at most once.
|
|
|
|
The remaining data in the body is described one chunk at a time, and
|
|
these chunks may be given in any order. Chunks are required unless
|
|
otherwise specified.
|
|
|
|
CHUNK DATA:
|
|
|
|
OID Fanout (ID: {'O', 'I', 'D', 'F'}) (256 * 4 bytes)
|
|
The ith entry, F[i], stores the number of OIDs with first
|
|
byte at most i. Thus F[255] stores the total
|
|
number of commits (N).
|
|
|
|
OID Lookup (ID: {'O', 'I', 'D', 'L'}) (N * H bytes)
|
|
The OIDs for all commits in the graph, sorted in ascending order.
|
|
|
|
Commit Data (ID: {'C', 'D', 'A', 'T' }) (N * (H + 16) bytes)
|
|
* The first H bytes are for the OID of the root tree.
|
|
* The next 8 bytes are for the positions of the first two parents
|
|
of the ith commit. Stores value 0x7000000 if no parent in that
|
|
position. If there are more than two parents, the second value
|
|
has its most-significant bit on and the other bits store an array
|
|
position into the Extra Edge List chunk.
|
|
* The next 8 bytes store the generation number of the commit and
|
|
the commit time in seconds since EPOCH. The generation number
|
|
uses the higher 30 bits of the first 4 bytes, while the commit
|
|
time uses the 32 bits of the second 4 bytes, along with the lowest
|
|
2 bits of the lowest byte, storing the 33rd and 34th bit of the
|
|
commit time.
|
|
|
|
Extra Edge List (ID: {'E', 'D', 'G', 'E'}) [Optional]
|
|
This list of 4-byte values store the second through nth parents for
|
|
all octopus merges. The second parent value in the commit data stores
|
|
an array position within this list along with the most-significant bit
|
|
on. Starting at that array position, iterate through this list of commit
|
|
positions for the parents until reaching a value with the most-significant
|
|
bit on. The other bits correspond to the position of the last parent.
|
|
|
|
Bloom Filter Index (ID: {'B', 'I', 'D', 'X'}) (N * 4 bytes) [Optional]
|
|
* The ith entry, BIDX[i], stores the number of bytes in all Bloom filters
|
|
from commit 0 to commit i (inclusive) in lexicographic order. The Bloom
|
|
filter for the i-th commit spans from BIDX[i-1] to BIDX[i] (plus header
|
|
length), where BIDX[-1] is 0.
|
|
* The BIDX chunk is ignored if the BDAT chunk is not present.
|
|
|
|
Bloom Filter Data (ID: {'B', 'D', 'A', 'T'}) [Optional]
|
|
* It starts with header consisting of three unsigned 32-bit integers:
|
|
- Version of the hash algorithm being used. We currently only support
|
|
value 1 which corresponds to the 32-bit version of the murmur3 hash
|
|
implemented exactly as described in
|
|
https://en.wikipedia.org/wiki/MurmurHash#Algorithm and the double
|
|
hashing technique using seed values 0x293ae76f and 0x7e646e2 as
|
|
described in https://doi.org/10.1007/978-3-540-30494-4_26 "Bloom Filters
|
|
in Probabilistic Verification"
|
|
- The number of times a path is hashed and hence the number of bit positions
|
|
that cumulatively determine whether a file is present in the commit.
|
|
- The minimum number of bits 'b' per entry in the Bloom filter. If the filter
|
|
contains 'n' entries, then the filter size is the minimum number of 64-bit
|
|
words that contain n*b bits.
|
|
* The rest of the chunk is the concatenation of all the computed Bloom
|
|
filters for the commits in lexicographic order.
|
|
* Note: Commits with no changes or more than 512 changes have Bloom filters
|
|
of length one, with either all bits set to zero or one respectively.
|
|
* The BDAT chunk is present if and only if BIDX is present.
|
|
|
|
Base Graphs List (ID: {'B', 'A', 'S', 'E'}) [Optional]
|
|
This list of H-byte hashes describe a set of B commit-graph files that
|
|
form a commit-graph chain. The graph position for the ith commit in this
|
|
file's OID Lookup chunk is equal to i plus the number of commits in all
|
|
base graphs. If B is non-zero, this chunk must exist.
|
|
|
|
TRAILER:
|
|
|
|
H-byte HASH-checksum of all of the above.
|