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

Re: [PATCH 5/5] odb/source: drop `local` flag

From
Patrick Steinhardt <ps@pks.im>
Date
Oct 14, 2026, 06:56 UTC
Message-ID
<as8njPHSZVabmb4Q@pks.im>
In-Reply-To
<as6palGWxRlky0bS@denethor>
On Tue, Oct 13, 2026 at 05:44:11PM -0500, Justin Tobler wrote:
Show 34 quoted lines
> On 26/10/13 09:36AM, Patrick Steinhardt wrote:
> > The `local` flag indicates whether a given `struct odb_source` is a
> > local source or not, where "local" is defined as being the object
> > directory that is directly attached to the current repository. But now
> > that alternates are handled in the "files" backend, this property is not
> > something that even makes sense anymore to have on the generic source.
> > 
> > In fact, we already have a partial replacement for this field in `struct
> > odb_files_dir`. The only other site that requires it is the packed
> > object database source, because it propagates the bit into the packfiles
> > it is opening.
> > 
> > Drop the flag from `struct odb_source` and instead move it into the
> > packed source.
> > 
> > Note that we stop considering the `local` bit when iterating through all
> > loose objects with the `ODB_FOR_EACH_OBJECT_LOCAL_ONLY` flag. This is
> > fine though, as we already handle the flag in the "files" backend
> > itself, where we skip over any object directory that is not marked as
> > local.
> 
> I do wish we could also drop ODB_FOR_EACH_OBJECT_LOCAL_ONLY. This flag
> also feels rather leaky to me. I guess though we still need a way to
> ignore objects from certain sources when iterating over all sources such
> as the inmemory source.
> 
> Overall, I happy to see the `local` field dropped from the generic ODB
> source structure, but IMO is does make each `for_each_object` callback
> handling of the ODB_FOR_EACH_OBJECT_LOCAL_ONLY flag a bit ambiguous and
> awkward.
> 
> Naive question: Do all odb_for_each_object() call sites that use the
> ODB_FOR_EACH_OBJECT_LOCAL_ONLY flag have "files" backend specific
> reasons to do so?

It does make it awkward, I agree. There's only two callers that use the flag right now:

  - git-pack-objects(1) with its "--local" flag. I consider this command
    to be too specific to the "files" backend anyway though, so arguably
    we could just let it handle this directly.
  - "reachable.c" via `add_unseen_recent_objects_to_traversal()`. This
    is invoke by git-prune(1) to mark reachable objects that are recent,
    and it's dubious that we only enumerate local objects here.

So we might be able to get rid of that flag altogether. But I'm inclined to go one step at a time and leave this for a future patch series.

Show 25 quoted lines
> > Signed-off-by: Patrick Steinhardt <ps@pks.im>
> > ---
> [snip]
> > diff --git a/odb/source-inmemory.c b/odb/source-inmemory.c
> > index 868e723c81..75cf29fa9d 100644
> > --- a/odb/source-inmemory.c
> > +++ b/odb/source-inmemory.c
> > @@ -161,8 +161,12 @@ static int odb_source_inmemory_for_each_object(struct odb_source *source,
> >  	};
> >  	struct object_id null_oid = { 0 };
> >  
> > -	if ((opts->flags & ODB_FOR_EACH_OBJECT_PROMISOR_ONLY) ||
> > -	    (opts->flags & ODB_FOR_EACH_OBJECT_LOCAL_ONLY && !source->local))
> > +	/*
> > +	 * In-memory objects are neither promisor objects nor do they live in
> > +	 * the local object directory, so there is nothing to iterate over.
> > +	 */
> > +	if (opts->flags & (ODB_FOR_EACH_OBJECT_PROMISOR_ONLY |
> > +			   ODB_FOR_EACH_OBJECT_LOCAL_ONLY))
> 
> So for the inmemory source, we don't want to iterate over the objects at
> all if we are only interested in "local" objects.
> 
> Naive question: Are there any scenarios where we even would iterate over
> an inmemory source and only be interested in "local" objects?
Not that I'd know of.
Patrick
Previous: Justin ToblerNext: Justin Tobler
Message 16 of 37 in “odb/files: cleanups and improvements for alternates”
  1. 0/5 odb/files: cleanups and improvements for alternatesPatrick Steinhardt, Oct 13, 2026
  2. 1/5 odb/source-files: fix performance when reading objects with alternatesPatrick Steinhardt, Oct 13, 2026
  3. Justin ToblerOct 13, 2026
  4. 2/5 odb/source-files: fix performance when streaming objects with alternatesPatrick Steinhardt, Oct 13, 2026
  5. Justin ToblerOct 13, 2026
  6. 3/5 odb/source-files: make the second read an implementation detailPatrick Steinhardt, Oct 13, 2026
  7. Justin ToblerOct 13, 2026
  8. Patrick SteinhardtOct 14, 2026
  9. Justin ToblerOct 14, 2026
  10. 4/5 odb: remove read loop for found objectsPatrick Steinhardt, Oct 13, 2026
  11. Justin ToblerOct 13, 2026
  12. Patrick SteinhardtOct 14, 2026
  13. Justin ToblerOct 14, 2026
  14. 5/5 odb/source: drop `local` flagPatrick Steinhardt, Oct 13, 2026
  15. Justin ToblerOct 13, 2026
  16. Patrick SteinhardtOct 14, 2026
  17. Justin ToblerOct 14, 2026
  18. Patrick SteinhardtOct 15, 2026
  19. 0/6 odb/files: cleanups and improvements for alternatesPatrick Steinhardt, Oct 14, 2026
  20. 1/6 odb/source-files: fix performance when reading objects with alternatesPatrick Steinhardt, Oct 14, 2026
  21. Johannes SchindelinOct 14, 2026
  22. Patrick SteinhardtOct 14, 2026
  23. 2/6 odb/source-files: fix performance when streaming objects with alternatesPatrick Steinhardt, Oct 14, 2026
  24. 3/6 odb/source-files: make the second read an implementation detailPatrick Steinhardt, Oct 14, 2026
  25. 4/6 odb: remove read loop for found objectsPatrick Steinhardt, Oct 14, 2026
  26. 5/6 odb: don't try re-fetching corrupt objectsPatrick Steinhardt, Oct 14, 2026
  27. Justin ToblerOct 14, 2026
  28. 6/6 odb/source: drop `local` flagPatrick Steinhardt, Oct 14, 2026
  29. 0/6 odb/files: cleanups and improvements for alternatesPatrick Steinhardt, Oct 15, 2026
  30. 1/6 odb/source-files: fix performance when reading objects with alternatesPatrick Steinhardt, Oct 15, 2026
  31. 2/6 odb/source-files: fix performance when streaming objects with alternatesPatrick Steinhardt, Oct 15, 2026
  32. 3/6 odb/source-files: make the second read an implementation detailPatrick Steinhardt, Oct 15, 2026
  33. 4/6 odb: remove read loop for found objectsPatrick Steinhardt, Oct 15, 2026
  34. 5/6 odb: don't try re-fetching corrupt objectsPatrick Steinhardt, Oct 15, 2026
  35. 6/6 odb/source: drop `local` flagPatrick Steinhardt, Oct 15, 2026
  36. Justin ToblerOct 15, 2026
  37. Junio C HamanoOct 16, 2026

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.