From: Taylor Blau <me@ttaylorr.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, derrickstolee@github.com, peff@peff.net
Subject: [PATCH v2 0/3] midx: use `--stdin-packs` to implement `repack`
Date: Tue, 20 Sep 2022 16:40:14 -0400 [thread overview]
Message-ID: <cover.1663706401.git.me@ttaylorr.com> (raw)
In-Reply-To: <YyokIf%2FSd7SYztKQ@nand.local>
Here's a few patches that replace the existing "feed each OID
one-by-one" approach to implement the `repack` sub-command of the
`multi-pack-index` builtin with one that uses `pack-objects`'s
`--stdin-packs` option.
There is an additional patch at the beginning of this series in order to
extract the mtime-sorted list of packs to rollup from their home in
`fill_included_packs_batch()`. There's also one more on the end to unify
the `include_pack` array into the `repack_info` struct(s) themselves.
The second patch is the substantive one. Thanks for all of the review so
far! :-)
Taylor Blau (3):
midx.c: compute pack_info array outside of fill_included_packs_batch()
midx.c: use `pack-objects --stdin-packs` when repacking
midx.c: unify `include_pack` array into `pack_info` struct
midx.c | 76 +++++++++++++++++++++++++++++-----------------------------
1 file changed, 38 insertions(+), 38 deletions(-)
Range-diff against v1:
-: ---------- > 1: a501776f6e midx.c: compute pack_info array outside of fill_included_packs_batch()
1: 7e987eb9d7 ! 2: 4218d9e08a midx.c: use `pack-objects --stdin-packs` when repacking
@@ midx.c: int midx_repack(struct repository *r, const char *object_dir, size_t bat
struct strbuf base_name = STRBUF_INIT;
+ struct strbuf scratch = STRBUF_INIT;
struct multi_pack_index *m = lookup_multi_pack_index(r, object_dir);
+ struct repack_info *pack_info = NULL;
- /*
@@ midx.c: int midx_repack(struct repository *r, const char *object_dir, size_t batch_size,
repo_config_get_bool(r, "repack.usedeltabaseoffset", &delta_base_offset);
repo_config_get_bool(r, "repack.usedeltaislands", &use_delta_islands);
@@ midx.c: int midx_repack(struct repository *r, const char *object_dir, size_t bat
- struct object_id oid;
- uint32_t pack_int_id = nth_midxed_pack_int_id(m, i);
+ for (i = 0; i < m->num_packs; i++) {
-+ strbuf_reset(&scratch);
++ struct repack_info *info = &pack_info[i];
- if (!include_pack[pack_int_id])
- continue;
-+ strbuf_addstr(&scratch, m->pack_names[i]);
-+ strbuf_strip_suffix(&scratch, ".idx");
-+ strbuf_addstr(&scratch, ".pack");
++ strbuf_reset(&scratch);
- nth_midxed_object_oid(&oid, m, i);
- fprintf(cmd_in, "%s\n", oid_to_hex(&oid));
-+ fprintf(cmd_in, "%s%s\n", include_pack[i] ? "" : "^", scratch.buf);
++ strbuf_addstr(&scratch, m->pack_names[info->pack_int_id]);
++ strbuf_strip_suffix(&scratch, ".idx");
++ strbuf_addstr(&scratch, ".pack");
++
++ fprintf(cmd_in, "%s%s\n", include_pack[info->pack_int_id] ? "" : "^", scratch.buf);
}
fclose(cmd_in);
+ strbuf_release(&scratch);
-: ---------- > 3: 81e9ccc323 midx.c: unify `include_pack` array into `pack_info` struct
--
2.37.0.1.g1379af2e9d
next parent reply other threads:[~2022-09-20 20:40 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <YyokIf%2FSd7SYztKQ@nand.local>
2022-09-20 20:40 ` Taylor Blau [this message]
2022-09-20 20:40 ` [PATCH v2 1/3] midx.c: compute pack_info array outside of fill_included_packs_batch() Taylor Blau
2022-09-20 20:40 ` [PATCH v2 2/3] midx.c: use `pack-objects --stdin-packs` when repacking Taylor Blau
2022-09-23 18:23 ` Derrick Stolee
2022-09-23 18:28 ` Taylor Blau
2022-09-23 19:05 ` Derrick Stolee
2022-09-20 20:40 ` [PATCH v2 3/3] midx.c: unify `include_pack` array into `pack_info` struct Taylor Blau
2022-09-20 21:54 ` [PATCH v2 0/3] midx: use `--stdin-packs` to implement `repack` Jeff King
2022-09-21 19:09 ` Junio C Hamano
2022-09-23 18:29 ` Taylor Blau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1663706401.git.me@ttaylorr.com \
--to=me@ttaylorr.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).