From: Derrick Stolee <derrickstolee@github.com>
To: "Jeff King" <peff@peff.net>, 程洋 <chengyang@xiaomi.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>,
何浩 <hehao@xiaomi.com>, "Xin7 Ma 马鑫" <maxin7@xiaomi.com>,
石奉兵 <shifengbing@xiaomi.com>, 凡军辉 <fanjunhui@xiaomi.com>,
王汉基 <wanghanji@xiaomi.com>
Subject: Re: [PATCH 2/3] upload-pack: skip parse-object re-hashing of "want" objects
Date: Wed, 7 Sep 2022 10:45:39 -0400 [thread overview]
Message-ID: <3f901613-72c6-b644-079a-f74e3024a8fe@github.com> (raw)
In-Reply-To: <6018c526-4641-8374-8802-cfda5be330c3@github.com>
On 9/7/2022 10:36 AM, Derrick Stolee wrote:
> On 9/6/2022 7:05 PM, Jeff King wrote:
>> There is one thing to note, though: the
>> change in get_reference() affects not just pack-objects, but rev-list,
>> git-log, etc. We could use a flag to limit to index-pack here, but we
>> may already skip hash checks in this instance. For commits, we'd skip
>> anything we load via the commit-graph. And while before this commit we
>> would check a blob fed directly to rev-list on the command-line, we'd
>> skip checking that same blob if we found it by traversing a tree.
>
> It's worth also mentioning that since you isolated the change to
> get_reference(), it is only skipping the parse for the requested tips
> of the revision walk. As we follow commits and trees to other objects
> we do not use parse_object() but instead use the appropriate method
> (parse_commit(), parse_tree(), and do not even parse blobs).
After writing this, it was bothering me that 'rev-list --verify' should
be checking for corruption throughout the history, not just at the tips.
This is done via the condition in builtin/rev-list.c:finish_object():
static int finish_object(struct object *obj, const char *name, void *cb_data)
{
struct rev_list_info *info = cb_data;
if (oid_object_info_extended(the_repository, &obj->oid, NULL, 0) < 0) {
finish_object__ma(obj);
return 1;
}
if (info->revs->verify_objects && !obj->parsed && obj->type != OBJ_COMMIT)
parse_object(the_repository, &obj->oid);
return 0;
}
So this call is the one that is used most-often by the rev-list command,
but isn't necessary to update for the purpose of our desired speedup. This
is another place where we would want to use read_object_file(). (It may even
be the _only_ place, since finish_object() should be called even for the
tip objects.)
In case you think it is valuable to ensure we test both cases ("tip" and
"not tip") I modified your test to have a third commit and test two rev-list
calls:
# An actual bit corruption is more likely than swapped commits, but
# this provides an easy way to have commits which don't match their purported
# hashes, but which aren't so broken we can't read them at all.
test_expect_success 'rev-list --verify-objects notices swapped commits' '
git init swapped-commits &&
(
cd swapped-commits &&
test_commit one &&
test_commit two &&
test_commit three &&
one_oid=$(git rev-parse HEAD) &&
two_oid=$(git rev-parse HEAD^) &&
one=.git/objects/$(test_oid_to_path $one_oid) &&
two=.git/objects/$(test_oid_to_path $two_oid) &&
mv $one tmp &&
mv $two $one &&
mv tmp $two &&
test_must_fail git rev-list --verify-objects HEAD &&
test_must_fail git rev-list --verify-objects HEAD^
)
'
But this is likely overkill.
Thanks,
-Stolee
next prev parent reply other threads:[~2022-09-07 14:46 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-11 8:09 Partial-clone cause big performance impact on server 程洋
2022-08-11 17:22 ` Jonathan Tan
2022-08-13 7:55 ` 回复: [External Mail]Re: " 程洋
2022-08-13 11:41 ` 程洋
2022-08-15 5:16 ` ZheNing Hu
2022-08-15 13:15 ` 程洋
2022-08-12 12:21 ` Derrick Stolee
2022-08-14 6:48 ` Jeff King
2022-08-15 13:18 ` Derrick Stolee
2022-08-15 14:50 ` [External Mail]Re: " 程洋
2022-08-17 10:22 ` 程洋
2022-08-17 13:41 ` Derrick Stolee
2022-08-18 5:49 ` Jeff King
2022-09-01 6:53 ` 程洋
2022-09-01 16:19 ` Jeff King
2022-09-05 11:17 ` 程洋
2022-09-06 18:38 ` Jeff King
2022-09-06 22:58 ` [PATCH 0/3] speeding up on-demand fetch for blobs in partial clone Jeff King
2022-09-06 23:01 ` [PATCH 1/3] parse_object(): allow skipping hash check Jeff King
2022-09-07 14:15 ` Derrick Stolee
2022-09-07 20:44 ` Jeff King
2022-09-06 23:05 ` [PATCH 2/3] upload-pack: skip parse-object re-hashing of "want" objects Jeff King
2022-09-07 14:36 ` Derrick Stolee
2022-09-07 14:45 ` Derrick Stolee [this message]
2022-09-07 20:50 ` Jeff King
2022-09-07 19:26 ` Junio C Hamano
2022-09-07 20:36 ` Jeff King
2022-09-07 20:48 ` [BUG] t1800: Fails for error text comparison rsbecker
2022-09-07 21:55 ` Junio C Hamano
2022-09-07 22:23 ` rsbecker
2022-09-07 21:02 ` [PATCH 2/3] upload-pack: skip parse-object re-hashing of "want" objects Jeff King
2022-09-07 22:07 ` Junio C Hamano
2022-09-08 5:04 ` Jeff King
2022-09-08 16:41 ` Junio C Hamano
2022-09-06 23:06 ` [PATCH 3/3] parse_object(): check commit-graph when skip_hash set Jeff King
2022-09-07 14:46 ` Derrick Stolee
2022-09-07 19:31 ` Junio C Hamano
2022-09-08 10:39 ` [External Mail]Re: " 程洋
2022-09-08 18:42 ` Jeff King
2022-09-07 14:48 ` [PATCH 0/3] speeding up on-demand fetch for blobs in partial clone Derrick Stolee
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=3f901613-72c6-b644-079a-f74e3024a8fe@github.com \
--to=derrickstolee@github.com \
--cc=chengyang@xiaomi.com \
--cc=fanjunhui@xiaomi.com \
--cc=git@vger.kernel.org \
--cc=hehao@xiaomi.com \
--cc=maxin7@xiaomi.com \
--cc=peff@peff.net \
--cc=shifengbing@xiaomi.com \
--cc=wanghanji@xiaomi.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).