| Message ID | f4f977c1c71ceed339361e8463bace9edc42ec45.1717023301.git.me@ttaylorr.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | midx-write: miscellaneous clean-ups for incremental MIDXs | expand |
On Wed, May 29, 2024 at 06:55:42PM -0400, Taylor Blau wrote: > Commit f894081deae (pack-revindex: read multi-pack reverse indexes, > 2021-03-30) introduced the `get_midx_rev_filename()` helper (later > modified by commit 60980aed786 (midx.c: write MIDX filenames to > strbuf, 2021-10-26)). > > This function returns the location of the classic ".rev" files we used > to write for MIDXs (prior to 95e8383bac1 (midx.c: make changing the > preferred pack safe, 2022-01-25)), which is always of the form: > > $GIT_DIR/objects/pack/multi-pack-index-$HASH.rev > > Replace this function with a generic helper that populates a strbuf with > the above form, replacing the ".rev" extension with a caller-provided > argument. Makes sense, as we have similar routines for packfiles. > +void get_midx_filename_ext(struct strbuf *out, const char *object_dir, > + const unsigned char *hash, const char *ext) > { > strbuf_addf(out, "%s/pack/multi-pack-index", object_dir); > -} > - > -void get_midx_rev_filename(struct strbuf *out, struct multi_pack_index *m) > -{ > - get_midx_filename(out, m->object_dir); > - strbuf_addf(out, "-%s.rev", hash_to_hex(get_midx_checksum(m))); > + if (ext) > + strbuf_addf(out, "-%s.%s", hash_to_hex(hash), ext); > } This bare "const unsigned char *hash" caught my eye, as we've mostly been removing them. But it was present in the original, too; it was just hidden in the return from get_midx_checksum(). And I'm not sure what the non-ugly version is. We implicitly use the_hash_algo for these kinds of trailer checksums, and calling them "struct object_id" is probably even more confusing. I guess they could be "struct csum_file_trailer" or something, but I'm not sure that would actually make anything more clear. Anyway, none of this is new in your patch and we can ignore it for now. -Peff
diff --git a/midx.c b/midx.c index 6f07de3688..bc4797196f 100644 --- a/midx.c +++ b/midx.c @@ -24,14 +24,16 @@ const unsigned char *get_midx_checksum(struct multi_pack_index *m) } void get_midx_filename(struct strbuf *out, const char *object_dir) +{ + get_midx_filename_ext(out, object_dir, NULL, NULL); +} + +void get_midx_filename_ext(struct strbuf *out, const char *object_dir, + const unsigned char *hash, const char *ext) { strbuf_addf(out, "%s/pack/multi-pack-index", object_dir); -} - -void get_midx_rev_filename(struct strbuf *out, struct multi_pack_index *m) -{ - get_midx_filename(out, m->object_dir); - strbuf_addf(out, "-%s.rev", hash_to_hex(get_midx_checksum(m))); + if (ext) + strbuf_addf(out, "-%s.%s", hash_to_hex(hash), ext); } static int midx_read_oid_fanout(const unsigned char *chunk_start, diff --git a/midx.h b/midx.h index dc477dff44..8554f2d616 100644 --- a/midx.h +++ b/midx.h @@ -74,9 +74,13 @@ struct multi_pack_index { #define MIDX_WRITE_BITMAP_HASH_CACHE (1 << 3) #define MIDX_WRITE_BITMAP_LOOKUP_TABLE (1 << 4) +#define MIDX_EXT_REV "rev" +#define MIDX_EXT_BITMAP "bitmap" + const unsigned char *get_midx_checksum(struct multi_pack_index *m); void get_midx_filename(struct strbuf *out, const char *object_dir); -void get_midx_rev_filename(struct strbuf *out, struct multi_pack_index *m); +void get_midx_filename_ext(struct strbuf *out, const char *object_dir, + const unsigned char *hash, const char *ext); struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local); int prepare_midx_pack(struct repository *r, struct multi_pack_index *m, uint32_t pack_int_id); diff --git a/pack-revindex.c b/pack-revindex.c index a7624d8be8..fc63aa76a2 100644 --- a/pack-revindex.c +++ b/pack-revindex.c @@ -381,7 +381,8 @@ int load_midx_revindex(struct multi_pack_index *m) trace2_data_string("load_midx_revindex", the_repository, "source", "rev"); - get_midx_rev_filename(&revindex_name, m); + get_midx_filename_ext(&revindex_name, m->object_dir, + get_midx_checksum(m), MIDX_EXT_REV); ret = load_revindex_from_disk(revindex_name.buf, m->num_objects,
Commit f894081deae (pack-revindex: read multi-pack reverse indexes, 2021-03-30) introduced the `get_midx_rev_filename()` helper (later modified by commit 60980aed786 (midx.c: write MIDX filenames to strbuf, 2021-10-26)). This function returns the location of the classic ".rev" files we used to write for MIDXs (prior to 95e8383bac1 (midx.c: make changing the preferred pack safe, 2022-01-25)), which is always of the form: $GIT_DIR/objects/pack/multi-pack-index-$HASH.rev Replace this function with a generic helper that populates a strbuf with the above form, replacing the ".rev" extension with a caller-provided argument. This will allow us to remove a similarly-defined function in the pack-bitmap code (used to determine the location of a MIDX .bitmap file) by reimplementing it in terms of `get_midx_filename_ext()`. Signed-off-by: Taylor Blau <me@ttaylorr.com> --- midx.c | 14 ++++++++------ midx.h | 6 +++++- pack-revindex.c | 3 ++- 3 files changed, 15 insertions(+), 8 deletions(-)