From: Patrick Steinhardt Date: Thu, 15 Oct 2026 05:27:54 GMT Subject: [PATCH v3 0/6] odb/files: cleanups and improvements for alternates Message-ID: <20261015-pks-odb-files-alternates-cleanups-v3-0-bfc62fd780eb@pks.im> In-Reply-To: <20261013-pks-odb-files-alternates-cleanups-v1-0-b7030ff2b26f@pks.im> Hi, this patch series contains a couple of follow-up cleanups and improvements that are now possible after having migrated alternates into the "files" backend. The series is built on top of 6de20f6092 (The 4th batch, 2026-10-06) with ps/odb-files-alternates at 0ba59c8453 (odb/source: drop `read_alternates` callback, 2026-10-08) merged into it. Changes in v2: - Add another refactoring on top to only fetch objects from a promisor remote in case they are missing. - Link to v1: https://patch.msgid.link/20261013-pks-odb-files-alternates-cleanups-v1-0-b7030ff2b26f@pks.im Changes in v3: - Add a regression test, supplied by Tyrie. - Link to v2: https://patch.msgid.link/20261014-pks-odb-files-alternates-cleanups-v2-0-fed9b2caa3be@pks.im Thanks! Patrick --- Patrick Steinhardt (6): odb/source-files: fix performance when reading objects with alternates odb/source-files: fix performance when streaming objects with alternates odb/source-files: make the second read an implementation detail odb: remove read loop for found objects odb: don't try re-fetching corrupt objects odb/source: drop `local` flag midx.c | 2 +- odb.c | 63 ++++++++++++++---------------------------------- odb.h | 12 --------- odb/source-files.c | 26 ++++++++++++++++---- odb/source-inmemory.c | 10 +++++--- odb/source-loose.c | 17 ++----------- odb/source-loose.h | 3 +-- odb/source-packed.c | 20 +++++---------- odb/source-packed.h | 7 ++++++ odb/source.c | 4 +-- odb/source.h | 20 +-------------- repack.c | 2 +- t/t5615-alternate-env.sh | 43 +++++++++++++++++++++++++++++++++ 13 files changed, 109 insertions(+), 120 deletions(-) Range-diff versus v2: 1: 3a7f78fc94 ! 1: dea38443a4 odb/source-files: fix performance when reading objects with alternates @@ Commit message [1]: Reported-by: Wolfgang Kritzinger + Helped-by: Tyrie Vella Signed-off-by: Patrick Steinhardt ## odb/source-files.c ## @@ odb/source-files.c: static enum odb_read_status odb_source_files_read_object_inf ret = odb_source_read_object_info(&dir->loose->base, oid, oi, flags, status == ODB_READ_NOT_FOUND ? errmsg : NULL); if (!ret) + + ## t/t5615-alternate-env.sh ## +@@ t/t5615-alternate-env.sh: test_expect_success !MINGW 'broken quoting falls back to interpreting raw' ' + EOF + ' + ++test_expect_success 'packs across sources are checked before loose objects' ' ++ # Regression test for a performance issue in which an object that ++ # resides in an alternate as a packed object caused a spurious loose ++ # object lookup (a filesystem stat) on the main object store before the ++ # alternate packfile was consulted. Reading such an object must resolve ++ # to the alternate packfile, never to a loose copy in the main store. ++ # ++ # Build an alternate whose object "B" is stored as a delta in a ++ # packfile. git deltifies successive versions of a tracked file, so the ++ # older, shorter blob "B" becomes a delta against the newer, longer ++ # blob "O". A loose object has no delta base, so %(deltabase) tells us ++ # which store answered the read: the alternate pack (O) or a loose copy ++ # (the zero oid). ++ git init alt-src && ++ test_seq 1 200 >alt-src/file && ++ git -C alt-src add file && ++ git -C alt-src commit -q -m base && ++ B=$(git -C alt-src rev-parse HEAD:file) && ++ git -C alt-src cat-file blob "$B" >b-content && ++ test_seq 1 210 >alt-src/file && ++ git -C alt-src add file && ++ git -C alt-src commit -q -m more && ++ O=$(git -C alt-src rev-parse HEAD:file) && ++ git -C alt-src repack -adf --window=10 --depth=50 && ++ ++ # Precondition: in the alternate, B is a delta based on O. ++ echo "$B" >in && ++ echo "$O" >expect && ++ git -C alt-src cat-file --batch-check="%(deltabase)" actual && ++ test_cmp expect actual && ++ ++ # Main repo: write B as a loose object, before any alternate is active. ++ git init main && ++ git -C main hash-object -w --stdin /dev/null && ++ test_path_is_file "main/.git/objects/$(test_oid_to_path "$B")" && ++ ++ # With the alternate active, B must resolve to the alternate packfile ++ # (deltabase O), not to the main store loose copy (deltabase zero oid). ++ GIT_ALTERNATE_OBJECT_DIRECTORIES="$PWD/alt-src/.git/objects" \ ++ git -C main cat-file --batch-check="%(deltabase)" actual && ++ test_cmp expect actual ++' ++ + test_done 2: 23d8dcfcdf = 2: 374cbda799 odb/source-files: fix performance when streaming objects with alternates 3: 406228ce0f = 3: 635d9ce86e odb/source-files: make the second read an implementation detail 4: c8f4c96b77 = 4: 832852bad5 odb: remove read loop for found objects 5: e4af3300af = 5: a0eebb1225 odb: don't try re-fetching corrupt objects 6: 7658903430 = 6: b4a76c5651 odb/source: drop `local` flag --- base-commit: ea99757de7d4ef6c7727431bfd7b6726614102e0 change-id: 20261006-pks-odb-files-alternates-cleanups-11f686cc4942