Re: [RFC PATCH 1/3] merge-ort.c: finalize ODB transactions after each step

From: Elijah Newren <newren@gmail.com>
Date: Nov 11, 2023, 03:45 UTC
Message-ID: <CABPp-BGzWciTAyyFyBwfjti+EPoNB=KdO3bUcS-=FOgT-X_NiQ@mail.gmail.com>
In-Reply-To: <c615a61d32644b64ef8f47feb47ec909286c56b3.1699381371.git.me@ttaylorr.com>

On Tue, Nov 7, 2023 at 10:22 AM Taylor Blau <me@ttaylorr.com> wrote:

Show 15 quoted lines

>
> In a previous commit, the ORT merge backend learned how to use the
> bulk-checkin mechanism to emit a single pack containing any new objects
> created during the merge. This functionality was implemented by setting
> up a new ODB transaction, and finalizing it at the end of the merge via
> `process_entries()`.
>
> In a future commit, we will extend this functionality to the new `git
> replay` command, which needs to see objects from previous steps in order
> to replay each commit.
>
> As a step towards implementing this, teach the ORT backend to flush the
> ODB transaction at the end of each step in `process_entries()`, and then
> finalize the result with `end_odb_transaction()` when calling
> `merge_finalize()`.

process_entries() contains a for loop inside it, so "end of each step in `process_entries()`" sounds like you are flushing after entry, i.e. several times per commit being replayed.

Perhaps "at the end of `process_entries()` (thus creating one pack per commit)" ?

(Of course, the fact that we need this change earlier, in the other series, kinda makes this point moot. Just thought I'd mention it anyway in case it comes back up in your restructuring.)