From: Jonathan Tan <jonathantanmy@google.com>
To: git@vger.kernel.org
Cc: Jonathan Tan <jonathantanmy@google.com>, peff@peff.net, avarab@gmail.com
Subject: [PATCH v4 0/4] Don't lazy-fetch commits when parsing them
Date: Fri, 9 Dec 2022 13:44:21 -0800 [thread overview]
Message-ID: <cover.1670622176.git.jonathantanmy@google.com> (raw)
In-Reply-To: <cover.1669839849.git.jonathantanmy@google.com>
Thanks everyone for your comments. Here's a reroll.
Jonathan Tan (4):
object-file: remove OBJECT_INFO_IGNORE_LOOSE
object-file: refactor map_loose_object_1()
object-file: emit corruption errors when detected
commit: don't lazy-fetch commits
commit.c | 15 ++++++-
object-file.c | 108 ++++++++++++++++++++++++-------------------------
object-store.h | 7 ++--
3 files changed, 69 insertions(+), 61 deletions(-)
Range-diff against v3:
1: be0b08cac2 = 1: be0b08cac2 object-file: remove OBJECT_INFO_IGNORE_LOOSE
2: 7419e4ac70 ! 2: 4b2fb68743 object-file: refactor map_loose_object_1()
@@ Commit message
2. Simultaneously gets a path and fd given an OID
3. Memory maps an fd
- Split this function up. Only one caller needs 1, so inline that. As for
- 2, a future patch will also need this functionality and, in addition,
- the calculated path, so extract this into a separate function with an
- out parameter for the path.
+ Keep 3 (renaming the function accordingly) and inline 1 and 2 into their
+ respective callers.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
@@ object-file.c: static int quick_has_loose(struct repository *r,
return map;
}
-+static void *map_loose_object_1(struct repository *r,
-+ const struct object_id *oid,
-+ unsigned long *size,
-+ const char **path)
-+{
+@@ object-file.c: void *map_loose_object(struct repository *r,
+ const struct object_id *oid,
+ unsigned long *size)
+ {
+- return map_loose_object_1(r, NULL, oid, size);
+ const char *p;
+ int fd = open_loose_object(r, oid, &p);
+
+ if (fd < 0)
+ return NULL;
-+ if (path)
-+ *path = p;
+ return map_fd(fd, p, size);
-+}
-+
- void *map_loose_object(struct repository *r,
- const struct object_id *oid,
- unsigned long *size)
- {
-- return map_loose_object_1(r, NULL, oid, size);
-+ return map_loose_object_1(r, oid, size, NULL);
}
enum unpack_loose_header_result unpack_loose_header(git_zstream *stream,
3: 7c9ed861e7 ! 3: 07d28db92c object-file: emit corruption errors when detected
@@ Commit message
which an indirect caller of do_oid_object_info_extended() will need
such functionality.
+ Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
## object-file.c ##
@@ object-file.c: static int loose_object_info(struct repository *r,
+ struct object_info *oi, int flags)
{
int status = 0;
++ int fd;
unsigned long mapsize;
-+ const char *path = NULL;
++ const char *path;
void *map;
git_zstream stream;
char hdr[MAX_HEADER_LEN];
+@@ object-file.c: static int loose_object_info(struct repository *r,
+ * object even exists.
+ */
+ if (!oi->typep && !oi->type_name && !oi->sizep && !oi->contentp) {
+- const char *path;
+ struct stat st;
+ if (!oi->disk_sizep && (flags & OBJECT_INFO_QUICK))
+ return quick_has_loose(r, oid) ? 0 : -1;
@@ object-file.c: static int loose_object_info(struct repository *r,
return 0;
}
- map = map_loose_object(r, oid, &mapsize);
-+ map = map_loose_object_1(r, oid, &mapsize, &path);
++ fd = open_loose_object(r, oid, &path);
++ if (fd < 0) {
++ if (errno != ENOENT)
++ error_errno(_("unable to open loose object %s"), path);
++ return -1;
++ }
++ map = map_fd(fd, path, &mapsize);
if (!map)
return -1;
@@ object-file.c: static void *read_object(struct repository *r,
oi.contentp = &content;
- if (oid_object_info_extended(r, oid, &oi, 0) < 0)
-+ if (oid_object_info_extended(r, oid, &oi,
-+ die_if_corrupt ? OBJECT_INFO_DIE_IF_CORRUPT : 0)
-+ < 0)
++ if (oid_object_info_extended(r, oid, &oi, die_if_corrupt
++ ? OBJECT_INFO_DIE_IF_CORRUPT : 0) < 0)
return NULL;
return content;
}
4: 5924a5120b = 4: 1a0cd5b244 commit: don't lazy-fetch commits
--
2.39.0.rc1.256.g54fd8350bd-goog
next prev parent reply other threads:[~2022-12-09 21:44 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 ` [PATCH v2 3/4] object-file: refactor replace object lookup Jonathan Tan
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 ` Jonathan Tan [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1670622176.git.jonathantanmy@google.com \
--to=jonathantanmy@google.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--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.
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 NNTP newsgroup(s).