git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 0/3] midx: use `--stdin-packs` to implement `repack`

From
Taylor Blau <me@ttaylorr.com>
Date
Sep 20, 2022, 20:40 UTC
Message-ID
<cover.1663706401.git.me@ttaylorr.com>
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: Taylor Blau
Message 1 of 10 in “midx: use `--stdin-packs` to implement `repack`”
  1. 0/3 midx: use `--stdin-packs` to implement `repack`Taylor Blau, Sep 20, 2022
  2. 1/3 midx.c: compute pack_info array outside of fill_included_packs_batch()Taylor Blau, Sep 20, 2022
  3. 2/3 midx.c: use `pack-objects --stdin-packs` when repackingTaylor Blau, Sep 20, 2022
  4. Derrick StoleeSep 23, 2022
  5. Taylor BlauSep 23, 2022
  6. Derrick StoleeSep 23, 2022
  7. 3/3 midx.c: unify `include_pack` array into `pack_info` structTaylor Blau, Sep 20, 2022
  8. Jeff KingSep 20, 2022
  9. Junio C HamanoSep 21, 2022
  10. Taylor BlauSep 23, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.