Skip to content

index-pack: retain child bases in delta cache#2131

Open
arijit91 wants to merge 1 commit into
gitgitgadget:masterfrom
arijit91:index-pack-retain-child-base
Open

index-pack: retain child bases in delta cache#2131
arijit91 wants to merge 1 commit into
gitgitgadget:masterfrom
arijit91:index-pack-retain-child-base

Conversation

@arijit91
Copy link
Copy Markdown

@arijit91 arijit91 commented May 28, 2026

Speed up the local pack indexing phase of clone/fetch for large
delta-compressed packs by keeping reconstructed delta bases available for
reuse when they are queued for later delta resolution.

When index-pack reconstructs a child base and queues it for resolving
descendant deltas, it currently frees that data immediately. This can force
the same base to be reconstructed again. Instead, keep it in the existing
delta base cache and let the existing delta_base_cache_limit policy decide
whether to retain or evict it.

This does not add a new cache or increase the cache limit. The object data is
already accounted in base_cache_used, and prune_base_data() is already
called at this point.

Correctness:

  • t/t5302-pack-index.sh passed all 36 tests.

Benchmarks on a quiet Ubuntu 24.04 VM, 16 vCPU, 32 GiB RAM, local SSD:

pack baseline patched wall-time change RSS change
linux blobless 69.17s 57.98s 16.2% faster -0.0%
linux full 280.72s 236.32s 15.8% faster +1.9%

Five-repeat public-repo medians also improved: git.git 13.1%, libgit2
14.0%, redis 13.5%, cpython 4.8%.

Perf on the linux blobless pack showed the same direction under profiling:
76.64s baseline vs 61.09s patched, with similar RSS.

CC: Ævar Arnfjörð Bjarmason [email protected], Junio C Hamano [email protected], Derrick Stolee [email protected]

When resolving a delta whose result has children of its own,
index-pack adds the result to work_head, accounts its data in
base_cache_used, and calls prune_base_data(). It then immediately
frees that same data.

This bypasses the existing delta base cache policy and can force later
descendants to reconstruct the queued base again. Let the existing
delta_base_cache_limit pruning policy decide whether to keep or evict
the data instead.

Signed-off-by: Arijit Banerjee <[email protected]>
@gitgitgadget
Copy link
Copy Markdown

gitgitgadget Bot commented May 28, 2026

Welcome to GitGitGadget

Hi @arijit91, and welcome to GitGitGadget, the GitHub App to send patch series to the Git mailing list from GitHub Pull Requests.

Please make sure that either:

  • Your Pull Request has a good description, if it consists of multiple commits, as it will be used as cover letter.
  • Your Pull Request description is empty, if it consists of a single commit, as the commit message should be descriptive enough by itself.

You can CC potential reviewers by adding a footer to the PR description with the following syntax:

CC: Revi Ewer <[email protected]>, Ill Takalook <[email protected]>

NOTE: DO NOT copy/paste your CC list from a previous GGG PR's description,
because it will result in a malformed CC list on the mailing list. See
example.

Also, it is a good idea to review the commit messages one last time, as the Git project expects them in a quite specific form:

  • the lines should not exceed 76 columns,
  • the first line should be like a header and typically start with a prefix like "tests:" or "revisions:" to state which subsystem the change is about, and
  • the commit messages' body should be describing the "why?" of the change.
  • Finally, the commit messages should end in a Signed-off-by: line matching the commits' author.

It is in general a good idea to await the automated test ("Checks") in this Pull Request before contributing the patches, e.g. to avoid trivial issues such as unportable code.

Contributing the patches

Before you can contribute the patches, your GitHub username needs to be added to the list of permitted users. Any already-permitted user can do that, by adding a comment to your PR of the form /allow. A good way to find other contributors is to locate recent pull requests where someone has been /allowed:

Both the person who commented /allow and the PR author are able to /allow you.

An alternative is the channel #git-devel on the Libera Chat IRC network:

<newcontributor> I've just created my first PR, could someone please /allow me? https://github.com/gitgitgadget/git/pull/12345
<veteran> newcontributor: it is done
<newcontributor> thanks!

Once on the list of permitted usernames, you can contribute the patches to the Git mailing list by adding a PR comment /submit.

If you want to see what email(s) would be sent for a /submit request, add a PR comment /preview to have the email(s) sent to you. You must have a public GitHub email address for this. Note that any reviewers CC'd via the list in the PR description will not actually be sent emails.

After you submit, GitGitGadget will respond with another comment that contains the link to the cover letter mail in the Git mailing list archive. Please make sure to monitor the discussion in that thread and to address comments and suggestions (while the comments and suggestions will be mirrored into the PR by GitGitGadget, you will still want to reply via mail).

If you do not want to subscribe to the Git mailing list just to be able to respond to a mail, you can download the mbox from the Git mailing list archive (click the (raw) link), then import it into your mail program. If you use GMail, you can do this via:

curl -g --user "<EMailAddress>:<Password>" \
    --url "imaps://imap.gmail.com/INBOX" -T /path/to/raw.txt

To iterate on your change, i.e. send a revised patch or patch series, you will first want to (force-)push to the same branch. You probably also want to modify your Pull Request description (or title). It is a good idea to summarize the revision by adding something like this to the cover letter (read: by editing the first comment on the PR, i.e. the PR description):

Changes since v1:
- Fixed a typo in the commit message (found by ...)
- Added a code comment to ... as suggested by ...
...

To send a new iteration, just add another PR comment with the contents: /submit.

Need help?

New contributors who want advice are encouraged to join [email protected], where volunteers who regularly contribute to Git are willing to answer newbie questions, give advice, or otherwise provide mentoring to interested contributors. You must join in order to post or view messages, but anyone can join.

You may also be able to find help in real time in the developer IRC channel, #git-devel on Libera Chat. Remember that IRC does not support offline messaging, so if you send someone a private message and log out, they cannot respond to you. The scrollback of #git-devel is archived, though.

@arijit91
Copy link
Copy Markdown
Author

/submit

@gitgitgadget
Copy link
Copy Markdown

gitgitgadget Bot commented May 28, 2026

Error: User arijit91 is not yet permitted to use GitGitGadget

@dscho
Copy link
Copy Markdown
Member

dscho commented May 29, 2026

/allow

@gitgitgadget
Copy link
Copy Markdown

gitgitgadget Bot commented May 29, 2026

User arijit91 is now allowed to use GitGitGadget.

@arijit91
Copy link
Copy Markdown
Author

/submit

@gitgitgadget
Copy link
Copy Markdown

gitgitgadget Bot commented May 29, 2026

Submitted as [email protected]

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git/ pr-2131/arijit91/index-pack-retain-child-base-v1

To fetch this version to local tag pr-2131/arijit91/index-pack-retain-child-base-v1:

git fetch --no-tags https://github.com/gitgitgadget/git/ tag pr-2131/arijit91/index-pack-retain-child-base-v1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants