From: Jonathan Tan <jonathantanmy@google.com>
To: git@vger.kernel.org
Cc: Jonathan Tan <jonathantanmy@google.com>,
peff@peff.net, gitster@pobox.com
Subject: [PATCH v2 3/4] object-file: refactor replace object lookup
Date: Thu, 1 Dec 2022 11:27:32 -0800 [thread overview]
Message-ID: <28935ba1b0132fa4d1a9f93e1d65835a8da12455.1669922792.git.jonathantanmy@google.com> (raw)
In-Reply-To: <cover.1669922792.git.jonathantanmy@google.com>
Move the replace object lookup (specifically, the ability for the caller
to know the result of the lookup) from read_object_file_extended()
to one of the functions that it indirectly calls,
do_oid_object_info_extended(), because a subsequent patch will need that
ability from the latter.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
---
object-file.c | 28 +++++++++++++++++++++-------
object-store.h | 1 +
2 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/object-file.c b/object-file.c
index 36f81c7958..8adef99a7c 100644
--- a/object-file.c
+++ b/object-file.c
@@ -1546,6 +1546,11 @@ static int do_oid_object_info_extended(struct repository *r,
if (flags & OBJECT_INFO_LOOKUP_REPLACE)
real = lookup_replace_object(r, oid);
+ if (oi && oi->real_oidp) {
+ if (!(flags & OBJECT_INFO_LOOKUP_REPLACE))
+ BUG("specifying real_oidp does not make sense without OBJECT_INFO_LOOKUP_REPLACE");
+ *oi->real_oidp = real;
+ }
if (is_null_oid(real))
return -1;
@@ -1659,17 +1664,27 @@ int oid_object_info(struct repository *r,
return type;
}
+/*
+ * If real_oid is not NULL, check if oid has a replace object and store the
+ * object that we end up using there.
+ */
static void *read_object(struct repository *r,
const struct object_id *oid, enum object_type *type,
- unsigned long *size)
+ unsigned long *size, const struct object_id **real_oid)
{
struct object_info oi = OBJECT_INFO_INIT;
void *content;
+ unsigned int flags = 0;
oi.typep = type;
oi.sizep = size;
oi.contentp = &content;
- if (oid_object_info_extended(r, oid, &oi, 0) < 0)
+ if (real_oid) {
+ flags |= OBJECT_INFO_LOOKUP_REPLACE;
+ oi.real_oidp = real_oid;
+ }
+
+ if (oid_object_info_extended(r, oid, &oi, flags) < 0)
return NULL;
return content;
}
@@ -1705,14 +1720,13 @@ void *read_object_file_extended(struct repository *r,
int lookup_replace)
{
void *data;
- const struct object_id *repl = lookup_replace ?
- lookup_replace_object(r, oid) : oid;
+ const struct object_id *real_oid;
errno = 0;
- data = read_object(r, repl, type, size);
+ data = read_object(r, oid, type, size, &real_oid);
if (data)
return data;
- die_if_corrupt(r, oid, repl);
+ die_if_corrupt(r, oid, real_oid);
return NULL;
}
@@ -2283,7 +2297,7 @@ int force_object_loose(const struct object_id *oid, time_t mtime)
if (has_loose_object(oid))
return 0;
- buf = read_object(the_repository, oid, &type, &len);
+ buf = read_object(the_repository, oid, &type, &len, NULL);
if (!buf)
return error(_("cannot read object for %s"), oid_to_hex(oid));
hdrlen = format_object_header(hdr, sizeof(hdr), type, len);
diff --git a/object-store.h b/object-store.h
index 88c879c61e..9684562eb2 100644
--- a/object-store.h
+++ b/object-store.h
@@ -406,6 +406,7 @@ struct object_info {
struct object_id *delta_base_oid;
struct strbuf *type_name;
void **contentp;
+ const struct object_id **real_oidp;
/* Response */
enum {
--
2.39.0.rc0.267.gcb52ba06e7-goog
next prev parent reply other threads:[~2022-12-01 19:27 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-30 20:30 [PATCH 0/4] Don't lazy-fetch commits when parsing them Jonathan Tan
2022-11-30 20:30 ` [PATCH 1/4] object-file: reread object with exact same args Jonathan Tan
2022-11-30 20:30 ` [PATCH 2/4] object-file: refactor corrupt object diagnosis Jonathan Tan
2022-11-30 20:47 ` Jeff King
2022-11-30 23:42 ` Junio C Hamano
2022-12-01 19:06 ` Jonathan Tan
2022-11-30 20:30 ` [PATCH 3/4] object-file: refactor replace object lookup Jonathan Tan
2022-11-30 20:54 ` Jeff King
2022-11-30 20:30 ` [PATCH 4/4] commit: don't lazy-fetch commits Jonathan Tan
2022-11-30 21:04 ` Jeff King
2022-12-01 19:11 ` Jonathan Tan
2022-12-01 19:33 ` Jeff King
2022-11-30 23:56 ` Junio C Hamano
2022-11-30 21:06 ` [PATCH 0/4] Don't lazy-fetch commits when parsing them Jeff King
2022-12-01 19:27 ` [PATCH v2 " Jonathan Tan
2022-12-01 19:27 ` [PATCH v2 1/4] object-file: reread object with exact same args Jonathan Tan
2022-12-01 19:27 ` [PATCH v2 2/4] object-file: refactor corrupt object diagnosis Jonathan Tan
2022-12-01 19:27 ` Jonathan Tan [this message]
2022-12-01 19:27 ` [PATCH v2 4/4] commit: don't lazy-fetch commits Jonathan Tan
2022-12-01 19:54 ` [PATCH v2 0/4] Don't lazy-fetch commits when parsing them Jeff King
2022-12-01 21:26 ` Jonathan Tan
2022-12-02 0:23 ` Jeff King
2022-12-06 0:49 ` Jonathan Tan
2022-12-06 2:03 ` Jeff King
2022-12-01 23:09 ` Junio C Hamano
2022-12-07 0:40 ` [PATCH v2 0/3] " Jonathan Tan
2022-12-07 0:40 ` [PATCH v2 1/3] object-file: don't exit early if skipping loose Jonathan Tan
2022-12-07 1:12 ` Junio C Hamano
2022-12-07 6:14 ` Jeff King
2022-12-07 6:43 ` Junio C Hamano
2022-12-07 23:20 ` Jonathan Tan
2022-12-07 0:40 ` [PATCH v2 2/3] object-file: emit corruption errors when detected Jonathan Tan
2022-12-07 1:16 ` Junio C Hamano
2022-12-07 4:05 ` Ævar Arnfjörð Bjarmason
2022-12-07 7:07 ` Jeff King
2022-12-07 10:33 ` Ævar Arnfjörð Bjarmason
2022-12-07 23:26 ` Jonathan Tan
2022-12-07 23:50 ` Ævar Arnfjörð Bjarmason
2022-12-08 6:33 ` Jeff King
2022-12-07 6:42 ` Jeff King
2022-12-07 0:40 ` [PATCH v2 3/3] commit: don't lazy-fetch commits Jonathan Tan
2022-12-07 1:17 ` Junio C Hamano
2022-12-07 6:47 ` Jeff King
2022-12-08 20:57 ` [PATCH v3 0/4] Don't lazy-fetch commits when parsing them Jonathan Tan
2022-12-08 20:57 ` [PATCH v3 1/4] object-file: remove OBJECT_INFO_IGNORE_LOOSE Jonathan Tan
2022-12-08 20:57 ` [PATCH v3 2/4] object-file: refactor map_loose_object_1() Jonathan Tan
2022-12-09 2:00 ` Jeff King
2022-12-09 18:17 ` Jonathan Tan
2022-12-09 20:27 ` Jeff King
2022-12-09 20:27 ` Jeff King
2022-12-08 20:57 ` [PATCH v3 3/4] object-file: emit corruption errors when detected Jonathan Tan
2022-12-09 1:56 ` Jeff King
2022-12-09 18:26 ` Jonathan Tan
2022-12-09 14:19 ` Ævar Arnfjörð Bjarmason
2022-12-09 18:33 ` Jonathan Tan
2022-12-08 20:57 ` [PATCH v3 4/4] commit: don't lazy-fetch commits Jonathan Tan
2022-12-09 14:14 ` Ævar Arnfjörð Bjarmason
2022-12-09 21:44 ` [PATCH v4 0/4] Don't lazy-fetch commits when parsing them Jonathan Tan
2022-12-09 21:44 ` [PATCH v4 1/4] object-file: remove OBJECT_INFO_IGNORE_LOOSE Jonathan Tan
2022-12-09 21:44 ` [PATCH v4 2/4] object-file: refactor map_loose_object_1() Jonathan Tan
2022-12-09 21:44 ` [PATCH v4 3/4] object-file: emit corruption errors when detected Jonathan Tan
2022-12-10 0:16 ` Junio C Hamano
2022-12-12 20:38 ` Jonathan Tan
2022-12-12 20:49 ` Jeff King
2022-12-12 20:59 ` Jonathan Tan
2022-12-12 21:20 ` Jeff King
2022-12-12 21:29 ` Jonathan Tan
2022-12-12 22:17 ` Jeff King
2022-12-12 22:52 ` Jonathan Tan
2022-12-13 10:37 ` Jeff King
2022-12-09 21:44 ` [PATCH v4 4/4] commit: don't lazy-fetch commits Jonathan Tan
2022-12-12 22:48 ` [PATCH v5 0/4] Don't lazy-fetch commits when parsing them Jonathan Tan
2022-12-12 22:48 ` [PATCH v5 1/4] object-file: remove OBJECT_INFO_IGNORE_LOOSE Jonathan Tan
2022-12-12 22:48 ` [PATCH v5 2/4] object-file: refactor map_loose_object_1() Jonathan Tan
2022-12-12 22:48 ` [PATCH v5 3/4] object-file: emit corruption errors when detected Jonathan Tan
2022-12-13 1:51 ` Junio C Hamano
2022-12-13 10:38 ` Jeff King
2022-12-12 22:48 ` [PATCH v5 4/4] commit: don't lazy-fetch commits Jonathan Tan
2022-12-14 19:17 ` [PATCH v6 0/4] Don't lazy-fetch commits when parsing them Jonathan Tan
2022-12-14 19:17 ` [PATCH v6 1/4] object-file: remove OBJECT_INFO_IGNORE_LOOSE Jonathan Tan
2022-12-14 19:17 ` [PATCH v6 2/4] object-file: refactor map_loose_object_1() Jonathan Tan
2022-12-14 19:17 ` [PATCH v6 3/4] object-file: emit corruption errors when detected Jonathan Tan
2022-12-14 19:17 ` [PATCH v6 4/4] commit: don't lazy-fetch commits Jonathan Tan
2022-12-14 20:43 ` [PATCH v6 0/4] Don't lazy-fetch commits when parsing them Jeff King
2022-12-15 0:07 ` 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=28935ba1b0132fa4d1a9f93e1d65835a8da12455.1669922792.git.jonathantanmy@google.com \
--to=jonathantanmy@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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).