From: Patrick Steinhardt <ps@pks.im>
To: git@vger.kernel.org
Subject: [PATCH 5/8] object-file: allow reading loose objects without reading their contents
Date: Wed, 19 May 2021 21:13:39 +0200 [thread overview]
Message-ID: <e26ff58e926dfc6aec15794a68981d6e455cb305.1621451532.git.ps@pks.im> (raw)
In-Reply-To: <cover.1621451532.git.ps@pks.im>
[-- Attachment #1: Type: text/plain, Size: 1391 bytes --]
We're about to add a new implementation of the connectivity check via
the object quarantine directory, which will directly iterate over any
loose object via their paths. For optimization purposes, we'll want to
skip over any loose blobs, but right now there's no easy way to read a
loose object without also slurping in all its contents.
Fix this shortcoming by modifying `read_loose_object()` such that it can
handle the case where no pointer for `contents` was passed in. If so,
then we'll simply skip reading the loose object.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
---
object-file.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/object-file.c b/object-file.c
index 884855b9df..ab695823fd 100644
--- a/object-file.c
+++ b/object-file.c
@@ -2552,7 +2552,8 @@ int read_loose_object(const char *path,
git_zstream stream;
char hdr[MAX_HEADER_LEN];
- *contents = NULL;
+ if (contents)
+ *contents = NULL;
map = map_loose_object_1(the_repository, path, NULL, &mapsize);
if (!map) {
@@ -2572,6 +2573,12 @@ int read_loose_object(const char *path,
goto out;
}
+ if (!contents) {
+ git_inflate_end(&stream);
+ ret = 0;
+ goto out;
+ }
+
if (*type == OBJ_BLOB && *size > big_file_threshold) {
if (check_stream_oid(&stream, hdr, *size, path, expected_oid) < 0)
goto out;
--
2.31.1
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2021-05-19 19:13 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-19 19:13 [PATCH 0/8] Speed up connectivity checks via quarantine dir Patrick Steinhardt
2021-05-19 19:13 ` [PATCH 1/8] perf: fix when running with TEST_OUTPUT_DIRECTORY Patrick Steinhardt
2021-05-20 2:03 ` Chris Torek
2021-05-19 19:13 ` [PATCH 2/8] p5400: add perf tests for git-receive-pack(1) Patrick Steinhardt
2021-05-20 2:09 ` Chris Torek
2021-05-20 17:04 ` Jeff King
2021-05-21 15:03 ` SZEDER Gábor
2021-05-19 19:13 ` [PATCH 3/8] tmp-objdir: expose function to retrieve path Patrick Steinhardt
2021-05-20 0:16 ` Elijah Newren
2021-05-19 19:13 ` [PATCH 4/8] packfile: have `for_each_file_in_pack_dir()` return error codes Patrick Steinhardt
2021-05-19 19:13 ` Patrick Steinhardt [this message]
2021-05-19 19:13 ` [PATCH 6/8] connected: implement connectivity check via temporary object dirs Patrick Steinhardt
2021-05-19 19:13 ` [PATCH 7/8] receive-pack: skip connectivity checks on delete-only commands Patrick Steinhardt
2021-05-21 18:53 ` Felipe Contreras
2021-05-27 14:38 ` Jeff King
2021-05-19 19:13 ` [PATCH 8/8] receive-pack: check connectivity via quarantined objects Patrick Steinhardt
2021-05-20 2:19 ` [PATCH 0/8] Speed up connectivity checks via quarantine dir Chris Torek
2021-05-20 16:50 ` Jeff King
2021-05-20 21:45 ` Junio C Hamano
2021-05-21 9:30 ` Jeff King
2021-05-21 9:42 ` Patrick Steinhardt
2021-05-21 11:20 ` Ævar Arnfjörð Bjarmason
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=e26ff58e926dfc6aec15794a68981d6e455cb305.1621451532.git.ps@pks.im \
--to=ps@pks.im \
--cc=git@vger.kernel.org \
/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).