From: Jonathan Tan <jonathantanmy@google.com>
To: git@vger.kernel.org
Cc: Jonathan Tan <jonathantanmy@google.com>,
carenas@gmail.com, chooglen@google.com, steadmon@google.com
Subject: [PATCH v4 0/7] No more adding submodule ODB as alternate
Date: Fri, 8 Oct 2021 14:08:13 -0700 [thread overview]
Message-ID: <cover.1633727270.git.jonathantanmy@google.com> (raw)
In-Reply-To: <cover.1632242495.git.jonathantanmy@google.com>
Thanks everyone for your reviews. Here's an updated patch set, including
Carlo's fixup squashed.
Jonathan Tan (7):
refs: plumb repo into ref stores
refs: teach arbitrary repo support to iterators
refs: peeling non-the_repository iterators is BUG
merge-{ort,recursive}: remove add_submodule_odb()
object-file: only register submodule ODB if needed
submodule: pass repo to check_has_commit()
submodule: trace adding submodule ODB as alternate
merge-ort.c | 18 +++--------
merge-recursive.c | 41 +++++++++++++-------------
object-file.c | 9 +++++-
refs.c | 32 +++++++++++++++-----
refs/files-backend.c | 16 ++++++----
refs/packed-backend.c | 13 ++++++--
refs/packed-backend.h | 4 ++-
refs/ref-cache.c | 10 +++++++
refs/ref-cache.h | 1 +
refs/refs-internal.h | 11 +++++--
strbuf.c | 12 ++++++--
strbuf.h | 6 ++--
submodule.c | 18 +++++++++--
t/README | 7 ++---
t/t5526-fetch-submodules.sh | 3 ++
t/t5531-deep-submodule-push.sh | 3 ++
t/t5545-push-options.sh | 3 ++
t/t5572-pull-submodule.sh | 3 ++
t/t6437-submodule-merge.sh | 3 ++
t/t7418-submodule-sparse-gitmodules.sh | 3 ++
20 files changed, 148 insertions(+), 68 deletions(-)
Range-diff against v3:
1: 878c4dd288 ! 1: f050191d4c refs: plumb repo into ref stores
@@ Commit message
arbitrary repositories to ref iterators, plumb a repository into all ref
stores. There are no changes to program logic.
- (The repository is plumbed into the ref stores instead of directly into
- the ref iterators themselves, so that existing code that operates on ref
- stores do not need to be modified to also handle repositories.)
-
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
@@ refs/packed-backend.c: static int release_snapshot(struct snapshot *snapshot)
## refs/packed-backend.h ##
+@@
+ #ifndef REFS_PACKED_BACKEND_H
+ #define REFS_PACKED_BACKEND_H
+
++struct repository;
+ struct ref_transaction;
+
+ /*
@@ refs/packed-backend.h: struct ref_transaction;
* even among packed refs.
*/
2: 7180f622b1 = 2: 6418256919 refs: teach arbitrary repo support to iterators
3: 1a2e2e3e08 = 3: d624c198d6 refs: peeling non-the_repository iterators is BUG
4: 89347503af = 4: f3df7a31cb merge-{ort,recursive}: remove add_submodule_odb()
5: 17d6c0a793 ! 5: 78473b0f89 object-file: only register submodule ODB if needed
@@ object-file.c: static int do_oid_object_info_extended(struct repository *r,
}
- if (register_all_submodule_odb_as_alternates())
++ /*
++ * If r is the_repository, this might be an attempt at
++ * accessing a submodule object as if it were in the_repository
++ * (having called add_submodule_odb() on that submodule's ODB).
++ * If any such ODBs exist, register them and try again.
++ */
+ if (r == the_repository &&
+ register_all_submodule_odb_as_alternates())
/* We added some alternates; retry */
6: 1eb2dda2dc = 6: f4241ea2e7 submodule: pass repo to check_has_commit()
7: 36e741dda8 ! 7: 8922bf48a2 submodule: trace adding submodule ODB as alternate
@@ submodule.c: int register_all_submodule_odb_as_alternates(void)
if (git_env_bool("GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB", 0))
BUG("register_all_submodule_odb_as_alternates() called");
}
+
+ ## t/README ##
+@@ t/README: GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=<boolean>, when true, makes
+ registering submodule ODBs as alternates a fatal action. Support for
+ this environment variable can be removed once the migration to
+ explicitly providing repositories when accessing submodule objects is
+-complete (in which case we might want to replace this with a trace2
+-call so that users can make it visible if accessing submodule objects
+-without an explicit repository still happens) or needs to be abandoned
+-for whatever reason (in which case the migrated codepaths still retain
+-their performance benefits).
++complete or needs to be abandoned for whatever reason (in which case the
++migrated codepaths still retain their performance benefits).
+
+ Naming Tests
+ ------------
--
2.33.0.882.g93a45727a2-goog
next prev parent reply other threads:[~2021-10-08 21:08 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-21 16:51 [PATCH 0/9] No more adding submodule ODB as alternate Jonathan Tan
2021-09-21 16:51 ` [PATCH 1/9] refs: make _advance() check struct repo, not flag Jonathan Tan
2021-09-23 1:00 ` Junio C Hamano
2021-09-24 17:56 ` Jonathan Tan
2021-09-24 19:55 ` Junio C Hamano
2021-09-24 18:13 ` Jeff King
2021-09-24 18:28 ` Jonathan Tan
2021-09-21 16:51 ` [PATCH 2/9] refs: add repo paramater to _iterator_peel() Jonathan Tan
2021-09-21 16:51 ` [PATCH 3/9] refs iterator: support non-the_repository advance Jonathan Tan
2021-09-21 16:51 ` [PATCH 4/9] refs: teach refs_for_each_ref() arbitrary repos Jonathan Tan
2021-09-21 16:51 ` [PATCH 5/9] merge-{ort,recursive}: remove add_submodule_odb() Jonathan Tan
2021-09-28 0:29 ` Elijah Newren
2021-09-21 16:51 ` [PATCH 6/9] object-file: only register submodule ODB if needed Jonathan Tan
2021-09-21 16:51 ` [PATCH 7/9] submodule: pass repo to check_has_commit() Jonathan Tan
2021-09-21 16:51 ` [PATCH 8/9] refs: change refs_for_each_ref_in() to take repo Jonathan Tan
2021-09-21 16:51 ` [PATCH 9/9] submodule: trace adding submodule ODB as alternate Jonathan Tan
2021-09-23 18:05 ` [PATCH 0/9] No more " Junio C Hamano
2021-09-28 20:10 ` [PATCH v2 " Jonathan Tan
2021-09-28 20:10 ` [PATCH v2 1/9] refs: plumb repo param in begin-iterator functions Jonathan Tan
2021-09-28 22:24 ` Junio C Hamano
2021-09-28 20:10 ` [PATCH v2 2/9] refs: teach arbitrary repo support to iterators Jonathan Tan
2021-09-28 22:35 ` Junio C Hamano
2021-09-29 17:04 ` Jonathan Tan
2021-09-28 20:10 ` [PATCH v2 3/9] refs: peeling non-the_repository iterators is BUG Jonathan Tan
2021-09-28 20:10 ` [PATCH v2 4/9] refs: teach refs_for_each_ref() arbitrary repos Jonathan Tan
2021-09-28 22:49 ` Junio C Hamano
2021-09-28 20:10 ` [PATCH v2 5/9] merge-{ort,recursive}: remove add_submodule_odb() Jonathan Tan
2021-09-28 20:10 ` [PATCH v2 6/9] object-file: only register submodule ODB if needed Jonathan Tan
2021-09-28 20:10 ` [PATCH v2 7/9] submodule: pass repo to check_has_commit() Jonathan Tan
2021-09-28 20:10 ` [PATCH v2 8/9] refs: change refs_for_each_ref_in() to take repo Jonathan Tan
2021-09-28 20:10 ` [PATCH v2 9/9] submodule: trace adding submodule ODB as alternate Jonathan Tan
2021-09-29 23:06 ` [PATCH v3 0/7] No more " Jonathan Tan
2021-09-29 23:06 ` [PATCH v3 1/7] refs: plumb repo into ref stores Jonathan Tan
2021-09-30 11:13 ` [PATCH] fixup! " Carlo Marcelo Arenas Belón
2021-10-06 17:42 ` Glen Choo
2021-10-08 20:05 ` Jonathan Tan
2021-10-08 20:07 ` Jonathan Tan
2021-10-07 18:33 ` [PATCH v3 1/7] " Josh Steadmon
2021-10-08 20:08 ` Jonathan Tan
2021-09-29 23:06 ` [PATCH v3 2/7] refs: teach arbitrary repo support to iterators Jonathan Tan
2021-10-07 19:31 ` Glen Choo
2021-10-08 20:12 ` Jonathan Tan
2021-09-29 23:06 ` [PATCH v3 3/7] refs: peeling non-the_repository iterators is BUG Jonathan Tan
2021-09-29 23:06 ` [PATCH v3 4/7] merge-{ort,recursive}: remove add_submodule_odb() Jonathan Tan
2021-10-07 18:34 ` Josh Steadmon
2021-10-08 20:19 ` Jonathan Tan
2021-09-29 23:06 ` [PATCH v3 5/7] object-file: only register submodule ODB if needed Jonathan Tan
2021-10-07 18:34 ` Josh Steadmon
2021-10-08 20:22 ` Jonathan Tan
2021-09-29 23:06 ` [PATCH v3 6/7] submodule: pass repo to check_has_commit() Jonathan Tan
2021-09-29 23:06 ` [PATCH v3 7/7] submodule: trace adding submodule ODB as alternate Jonathan Tan
2021-10-07 18:34 ` Josh Steadmon
2021-10-08 20:23 ` Jonathan Tan
2021-10-07 18:32 ` [PATCH v3 0/7] No more " Josh Steadmon
2021-10-08 21:08 ` Jonathan Tan [this message]
2021-10-08 21:08 ` [PATCH v4 1/7] refs: plumb repo into ref stores Jonathan Tan
2021-10-08 21:08 ` [PATCH v4 2/7] refs: teach arbitrary repo support to iterators Jonathan Tan
2021-10-08 21:08 ` [PATCH v4 3/7] refs: peeling non-the_repository iterators is BUG Jonathan Tan
2021-10-08 21:08 ` [PATCH v4 4/7] merge-{ort,recursive}: remove add_submodule_odb() Jonathan Tan
2021-10-08 21:08 ` [PATCH v4 5/7] object-file: only register submodule ODB if needed Jonathan Tan
2021-10-08 21:08 ` [PATCH v4 6/7] submodule: pass repo to check_has_commit() Jonathan Tan
2021-10-08 21:08 ` [PATCH v4 7/7] submodule: trace adding submodule ODB as alternate Jonathan Tan
2021-10-12 22:10 ` [PATCH v4 0/7] No more " Glen Choo
2021-10-12 22:40 ` Josh Steadmon
2021-10-12 22:49 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1633727270.git.jonathantanmy@google.com \
--to=jonathantanmy@google.com \
--cc=carenas@gmail.com \
--cc=chooglen@google.com \
--cc=git@vger.kernel.org \
--cc=steadmon@google.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).