From: Jeff King <peff@peff.net>
To: Elijah Newren <newren@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: en/remerge-diff [Was: Re: What's cooking in git.git (Sep 2021, #09; Thu, 30)]
Date: Fri, 1 Oct 2021 03:01:06 -0400 [thread overview]
Message-ID: <YVayMiOJPLFcTlY9@coredump.intra.peff.net> (raw)
In-Reply-To: <CABPp-BH2C5HFw_=NtK71oNGXkntzcJd2un0TgMb=UnJ5yJxAAA@mail.gmail.com>
On Thu, Sep 30, 2021 at 11:31:32PM -0700, Elijah Newren wrote:
> * Do something different with the tmp-objdir usage or use
> pretend_object_file(). I'm slightly worried the latter was only
> designed for a few files that all fit into memory, which may not be
> valid for this usecase.
Just to make sure I was being clear on this final point: the
pretend_object_file() interface _now_ is definitely not suitable for the
sizes you'd want. I think you'd need to:
- have it handle pointers to non-duplicated storage, instead of owning
all buffers (and then the remerge-diff code would do something
clever with mmaps and tempfiles).
- use something better than the linear cached_objects array for
storing the entries, so lookup doesn't suffer with many objects.
Perhaps an oidmap.
- teach it to remove objects. For your purposes, a complete clear
function would be sufficient.
-Peff
next prev parent reply other threads:[~2021-10-01 7:01 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-01 1:01 What's cooking in git.git (Sep 2021, #09; Thu, 30) Junio C Hamano
2021-10-01 6:20 ` en/removing-untracked-fixes [Was: Re: What's cooking in git.git (Sep 2021, #09; Thu, 30)] Elijah Newren
2021-10-01 8:51 ` Ævar Arnfjörð Bjarmason
2021-10-01 17:05 ` en/removing-untracked-fixes [ Junio C Hamano
2021-10-01 6:31 ` en/remerge-diff [Was: Re: What's cooking in git.git (Sep 2021, #09; Thu, 30)] Elijah Newren
2021-10-01 7:01 ` Jeff King [this message]
2021-10-01 12:05 ` What's cooking in git.git (Sep 2021, #09; Thu, 30) Ævar Arnfjörð Bjarmason
2021-10-01 12:08 ` ab/fsck-unexpected-type Ævar Arnfjörð Bjarmason
2021-10-01 14:32 ` ab/parse-options-cleanup Ævar Arnfjörð Bjarmason
2021-10-01 14:35 ` ab/sanitize-leak-ci & more leak fixes soon-or-not Ævar Arnfjörð Bjarmason
2021-10-01 14:48 ` ab/refs-errno-cleanup Ævar Arnfjörð Bjarmason
2021-10-01 14:56 ` What's cooking in git.git (Sep 2021, #09; Thu, 30) Jeff Hostetler
2021-10-01 15:01 ` ab/align-parse-options-help & ab/help-config-vars Ævar Arnfjörð Bjarmason
2021-10-01 15:05 ` ab/lib-subtest Ævar Arnfjörð Bjarmason
2021-10-01 15:07 ` ab/config-based-hooks-1 Ævar Arnfjörð Bjarmason
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YVayMiOJPLFcTlY9@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.