Hi,
this patch series refactors the object store subsystem to become more
self-contained by getting rid of `the_repository`. Instead of passing in
the repository explicitly, we start to pass in the object store itself,
which is in contrast to many other refactorings we did, but in line with
what we did for the ref store, as well.
This series also starts to properly scope functions to the carved out
object database subsystem, which requires a bit of shuffling. This
allows us to have a short-and-sweet `odb_` prefix for functions and
prepares us for a future with pluggable object backends.
The series is structured as follows:
- Patches 1 to 3 rename `struct object_store` and `struct
object_directory` as well as the code files.
- Patches 4 to 12 refactor "odb.c" to get rid of `the_repository`.
- Patches 13 to 17 adjust the name of remaining functions so that they
can be clearly attributed to the ODB. I'm happy to kick these
patches out of this series and resend them at a later point in case
they create too much turmoil.
This series is built on top of 6f84262c44a (The eleventh batch,
2025-05-05) with ps/object-store-cleanup at 8a9e27be821 (object-store:
drop `repo_has_object_file()`, 2025-04-29) merged into it. There are a
couple of trivial conflicts when merged with "seen", I have appended the
merge conflict resolution as a patch at the end of this mail.
Changes in v2:
- Fix for a copy-and-pasted commit message.
- Rename `struct odb_backend` to `struct odb_alternate`. I'm happy to
revert to the previous name if we ultimately think it's the better
suited one.
- A couple of fixes to move changes into the correct commit. `git
rebase -x 'meson compile -C build'` is now clean.
- I _didn't_ back out the rename to "odb.{c,h}". Junio has already
fixed the fallout, so it's probably more work for him to kick it out
again than to just leave it in.
- Link to v1: https://lore.kernel.org/r/20250506-pks-object-store-wo-the-repository-v1-0-c05b82e7b126@xxxxxx
Changes in v3:
- Polishing for some comments and commit messages.
- Link to v2: https://lore.kernel.org/r/20250509-pks-object-store-wo-the-repository-v2-0-103f59bf8e28@xxxxxx
Thanks!
Patrick
---
Patrick Steinhardt (17):
object-store: rename `raw_object_store` to `object_database`
object-store: rename `object_directory` to `odb_alternate`
object-store: rename files to "odb.{c,h}"
odb: introduce parent pointers
odb: get rid of `the_repository` in `find_odb()`
odb: get rid of `the_repository` in `assert_oid_type()`
odb: get rid of `the_repository` in `odb_mkstemp()`
odb: get rid of `the_repository` when handling alternates
odb: get rid of `the_repository` in `for_each()` functions
odb: get rid of `the_repository` when handling the primary alternate
odb: get rid of `the_repository` when handling submodule alternates
odb: trivial refactorings to get rid of `the_repository`
odb: rename `oid_object_info()`
odb: rename `repo_read_object_file()`
odb: rename `has_object()`
odb: rename `pretend_object_file()`
odb: rename `read_object_with_reference()`
Documentation/user-manual.adoc | 4 +-
Makefile | 2 +-
apply.c | 14 +-
archive-tar.c | 2 +-
archive-zip.c | 2 +-
archive.c | 6 +-
attr.c | 4 +-
bisect.c | 8 +-
blame.c | 22 +-
builtin/backfill.c | 6 +-
builtin/blame.c | 6 +-
builtin/cat-file.c | 62 +++--
builtin/checkout.c | 2 +-
builtin/clone.c | 14 +-
builtin/commit-graph.c | 20 +-
builtin/commit-tree.c | 4 +-
builtin/count-objects.c | 6 +-
builtin/describe.c | 5 +-
builtin/difftool.c | 4 +-
builtin/fast-export.c | 10 +-
builtin/fast-import.c | 49 ++--
builtin/fetch.c | 21 +-
builtin/fsck.c | 31 +--
builtin/gc.c | 16 +-
builtin/grep.c | 26 +-
builtin/hash-object.c | 2 +-
builtin/index-pack.c | 29 +--
builtin/log.c | 4 +-
builtin/ls-files.c | 4 +-
builtin/ls-tree.c | 6 +-
builtin/merge-file.c | 2 +-
builtin/merge-tree.c | 14 +-
builtin/mktag.c | 6 +-
builtin/mktree.c | 10 +-
builtin/multi-pack-index.c | 6 +-
builtin/notes.c | 8 +-
builtin/pack-objects.c | 70 +++---
builtin/pack-redundant.c | 2 +-
builtin/prune.c | 6 +-
builtin/receive-pack.c | 9 +-
builtin/remote.c | 6 +-
builtin/repack.c | 7 +-
builtin/replace.c | 12 +-
builtin/rev-list.c | 8 +-
builtin/show-ref.c | 6 +-
builtin/submodule--helper.c | 11 +-
builtin/tag.c | 10 +-
builtin/unpack-file.c | 4 +-
builtin/unpack-objects.c | 12 +-
bulk-checkin.c | 6 +-
bundle-uri.c | 5 +-
bundle.c | 6 +-
cache-tree.c | 17 +-
combine-diff.c | 4 +-
commit-graph.c | 106 ++++----
commit-graph.h | 20 +-
commit.c | 15 +-
config.c | 4 +-
connected.c | 2 +-
contrib/coccinelle/the_repository.cocci | 2 +-
diagnose.c | 12 +-
diff.c | 20 +-
dir.c | 2 +-
entry.c | 6 +-
fetch-pack.c | 17 +-
fmt-merge-msg.c | 6 +-
fsck.c | 4 +-
grep.c | 6 +-
http-backend.c | 2 +-
http-push.c | 20 +-
http-walker.c | 12 +-
http.c | 6 +-
list-objects-filter.c | 4 +-
list-objects.c | 6 +-
log-tree.c | 2 +-
loose.c | 46 ++--
mailmap.c | 4 +-
match-trees.c | 6 +-
merge-blobs.c | 10 +-
merge-ort.c | 8 +-
meson.build | 2 +-
midx-write.c | 2 +-
midx.c | 6 +-
notes-cache.c | 4 +-
notes-merge.c | 4 +-
notes.c | 19 +-
object-file.c | 94 ++++----
object-file.h | 12 +-
object-name.c | 24 +-
object.c | 8 +-
object-store.c => odb.c | 413 +++++++++++++++++---------------
object-store.h => odb.h | 272 +++++++++++++++------
oss-fuzz/fuzz-pack-idx.c | 2 +-
pack-bitmap-write.c | 9 +-
pack-bitmap.c | 10 +-
pack-check.c | 2 +-
pack-mtimes.c | 2 +-
pack-objects.h | 2 +-
pack-revindex.c | 2 +-
pack-write.c | 10 +-
packfile.c | 29 +--
packfile.h | 8 +-
path.c | 4 +-
promisor-remote.c | 6 +-
protocol-caps.c | 4 +-
reachable.c | 2 +-
read-cache.c | 14 +-
ref-filter.c | 6 +-
reflog.c | 8 +-
refs.c | 7 +-
remote.c | 9 +-
replace-object.c | 2 +-
replace-object.h | 2 +-
repository.c | 21 +-
repository.h | 4 +-
rerere.c | 7 +-
revision.c | 5 +-
send-pack.c | 4 +-
sequencer.c | 7 +-
server-info.c | 2 +-
shallow.c | 14 +-
streaming.c | 10 +-
submodule-config.c | 9 +-
submodule.c | 32 +--
submodule.h | 9 -
t/helper/test-find-pack.c | 2 +-
t/helper/test-pack-mtimes.c | 2 +-
t/helper/test-partial-clone.c | 4 +-
t/helper/test-read-graph.c | 8 +-
t/helper/test-read-midx.c | 2 +-
t/helper/test-ref-store.c | 4 +-
tag.c | 10 +-
tmp-objdir.c | 30 +--
tree-walk.c | 18 +-
tree.c | 6 +-
unpack-trees.c | 2 +-
upload-pack.c | 4 +-
walker.c | 6 +-
xdiff-interface.c | 4 +-
139 files changed, 1180 insertions(+), 1032 deletions(-)
Range-diff versus v2:
1: c113f51cc1a ! 1: 40051831e0e object-store: rename `raw_object_store` to `object_database`
@@ Commit message
This conversion can be done by simply passing in an explicit pointer to
a repository and then using its `->objects` pointer. But there is a
second effort underway, which is to make the object subsystem more
- selfcontained so that we can eventually have pluggale object backends.
+ selfcontained so that we can eventually have pluggable object backends.
As such, passing in a repository wouldn't make a ton of sense, and the
goal is to convert the object store interfaces such that we always pass
in a reference to the `raw_object_store` instead.
2: 05a6fb88bf3 ! 2: 39f178ace57 object-store: rename `object_directory` to `odb_alternate`
@@ Commit message
Let's preempt this by renaming the structure to `odb_alternate` now
already. This name is agnostic of how exactly objects are stored while
still specifically pinpointing that this is about an alternate object
- database. In the future, it allows us to easily introduce e.g. a
- `odb_files_alternate` and other specific implementations over time.
+ database. Furthermore, it is already used in Git to represent this
+ context -- the only stretch is that the primary object directory is now
+ the primary alternate.
+
+ In the future, this change allows us to easily introduce for example a
+ `odb_files_alternate` and other format-specific implementations.
Signed-off-by: Patrick Steinhardt <ps@xxxxxx>
@@ object-store.h: struct oidtree;
-struct object_directory {
- struct object_directory *next;
+/*
-+ * An alternate part of an object database that stores the actual objects.
++ * The alternate is the part of the object database that stores the actual
++ * objects. It thus encapsulates the logic to read and write the specific
++ * on-disk format. An object database can have multiple alternates, and
++ * exactly one primary alternate that is used when writing new objects.
+ */
+struct odb_alternate {
+ struct odb_alternate *next;
3: bcc552e554c = 3: 7d79268aa73 object-store: rename files to "odb.{c,h}"
4: 908e399cde6 = 4: 25777175ade odb: introduce parent pointers
5: 939961a4eb3 = 5: c8daaa9bd03 odb: get rid of `the_repository` in `find_odb()`
6: 74dc4d61e37 = 6: 23cf77f4e83 odb: get rid of `the_repository` in `assert_oid_type()`
7: 61f1302201f = 7: 58975fe2c7f odb: get rid of `the_repository` in `odb_mkstemp()`
8: 81926adbd98 ! 8: 27959349ffe odb: get rid of `the_repository` when handling alternates
@@ odb.h: struct oidtree;
+char *compute_alternate_path(const char *path, struct strbuf *err);
+
/*
- * An alternate part of an object database that stores the actual objects.
- */
+ * The alternate is the part of the object database that stores the actual
+ * objects. It thus encapsulates the logic to read and write the specific
@@ odb.h: struct odb_alternate {
char *path;
};
9: 60693ef4805 = 9: 3bb54296615 odb: get rid of `the_repository` in `for_each()` functions
10: 387e0311264 = 10: b39a3d934a5 odb: get rid of `the_repository` when handling the primary alternate
11: 64503d9eeb8 = 11: 489c6b4c33f odb: get rid of `the_repository` when handling submodule alternates
12: fd793aef552 = 12: a3068a0ad76 odb: trivial refactorings to get rid of `the_repository`
13: efcd16f5d14 = 13: eb614efd08b odb: rename `oid_object_info()`
14: 1f020271cc5 = 14: 6c7c24739d1 odb: rename `repo_read_object_file()`
15: 8a51662e84d = 15: 07c2b387ace odb: rename `has_object()`
16: 3bd6d7e2ae4 = 16: f1e8c7f10ab odb: rename `pretend_object_file()`
17: 7d63407a1b4 = 17: d612f806675 odb: rename `read_object_with_reference()`
---
base-commit: 046efb6f2b050efd580e1c1750b77328a1790c0e
change-id: 20250505-pks-object-store-wo-the-repository-9c6cbdf8d4b1
