From: Junio C Hamano <gitster@pobox•com>
To: Patrick Steinhardt <ps@pks•im>
Cc: git@vger•kernel.org, Aaron Plattner <aplattner@nvidia•com>
Subject: Re: [PATCH 0/8] Improvements for reading object info
Date: Thu, 18 Dec 2025 17:09:21 +0900 [thread overview]
Message-ID: <xmqq8qf0xlce.fsf@gitster.g> (raw)
In-Reply-To: <20251218-b4-pks-odb-read-object-info-improvements-v1-0-81c8368492be@pks.im> (Patrick Steinhardt's message of "Thu, 18 Dec 2025 07:28:10 +0100")
Patrick Steinhardt <ps@pks•im> writes:
> This series has a conflict with ps/packfile-store-in-odb-source. I
> decided to not make this a dependency though because those two topics
> are independent from one another, and I expect that this series here
> will be merged down faster than the conflicting one. Furthermore, the
> conflict itself is quite minor:
>
> diff --cc packfile.c
> index 8daa5a5ee7,ce6716fbea..0000000000
> --- a/packfile.c
> +++ b/packfile.c
> @@@ -2157,10 -2132,11 +2151,10 @@@ int packfile_store_read_object_info(str
> struct object_info *oi,
> unsigned flags UNUSED)
> {
> - static struct object_info blank_oi = OBJECT_INFO_INIT;
> struct pack_entry e;
> - int rtype;
> + int ret;
>
> - if (!find_pack_entry(store->odb->repo, oid, &e))
> + if (!find_pack_entry(store, oid, &e))
> return 1;
>
> /*
> @@@ -2549,9 -2555,8 +2571,9 @@@ int packfile_store_read_object_stream(s
> oi.sizep = &size;
>
> if (packfile_store_read_object_info(store, oid, &oi, 0) ||
> - oi.u.packed.is_delta ||
> + oi.u.packed.type == PACKED_OBJECT_TYPE_REF_DELTA ||
> + oi.u.packed.type == PACKED_OBJECT_TYPE_OFS_DELTA ||
> - repo_settings_get_big_file_threshold(store->odb->repo) >= size)
> + repo_settings_get_big_file_threshold(store->source->odb->repo) >= size)
> return -1;
>
> in_pack_type = unpack_object_header(oi.u.packed.pack,
>
> I'd thus propose to merge this series via an evil merge, but if this
> proves to be burdensome I'm happy to defer it to a later point. Just let
> me know and I'll adapt accordingly, thanks!
Indeed the conflicts above are miniscule that it does not even need
any evil merge. The surviving lines are all from either ours or
theirs, that changes are close enough to be shown in --cc.
But let me first concentrate more on fixing performance regression
that already made down to 'master'. It is a shame that nobody
caught it while it was cooking in 'next'.
Thanks.
next prev parent reply other threads:[~2025-12-18 8:09 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-18 6:28 [PATCH 0/8] Improvements for reading object info Patrick Steinhardt
2025-12-18 6:28 ` [PATCH 1/8] object-file: always set OI_LOOSE when " Patrick Steinhardt
2025-12-18 6:28 ` [PATCH 2/8] packfile: always declare object info to be OI_PACKED Patrick Steinhardt
2025-12-18 7:23 ` Junio C Hamano
2025-12-18 9:10 ` Patrick Steinhardt
2025-12-18 6:28 ` [PATCH 3/8] packfile: extend `is_delta` field to allow for "unknown" state Patrick Steinhardt
2025-12-18 6:28 ` [PATCH 4/8] packfile: always populate pack-specific info when reading object info Patrick Steinhardt
2025-12-18 7:32 ` Junio C Hamano
2025-12-18 6:28 ` [PATCH 5/8] packfile: disentangle return value of `packed_object_info()` Patrick Steinhardt
2025-12-18 6:28 ` [PATCH 6/8] packfile: skip unpacking object header for disk size requests Patrick Steinhardt
2025-12-18 6:28 ` [PATCH 7/8] packfile: fix short-circuiting of empty requests Patrick Steinhardt
2025-12-18 6:28 ` [PATCH 8/8] packfile: drop repository parameter from `packed_object_info()` Patrick Steinhardt
2025-12-18 8:09 ` Junio C Hamano [this message]
2025-12-18 8:30 ` [PATCH 0/8] Improvements for reading object info Patrick Steinhardt
2025-12-18 10:54 ` [PATCH v2 0/7] " Patrick Steinhardt
2025-12-18 10:54 ` [PATCH v2 1/7] object-file: always set OI_LOOSE when " Patrick Steinhardt
2025-12-18 10:54 ` [PATCH v2 2/7] packfile: always declare object info to be OI_PACKED Patrick Steinhardt
2026-01-05 14:29 ` Toon Claes
2025-12-18 10:54 ` [PATCH v2 3/7] packfile: extend `is_delta` field to allow for "unknown" state Patrick Steinhardt
2026-01-05 15:35 ` Toon Claes
2026-01-06 6:34 ` Patrick Steinhardt
2025-12-18 10:54 ` [PATCH v2 4/7] packfile: always populate pack-specific info when reading object info Patrick Steinhardt
2025-12-30 17:03 ` Kristoffer Haugsbakk
2026-01-05 11:38 ` Patrick Steinhardt
2025-12-18 10:54 ` [PATCH v2 5/7] packfile: disentangle return value of `packed_object_info()` Patrick Steinhardt
2025-12-18 10:54 ` [PATCH v2 6/7] packfile: skip unpacking object header for disk size requests Patrick Steinhardt
2025-12-18 10:54 ` [PATCH v2 7/7] packfile: drop repository parameter from `packed_object_info()` Patrick Steinhardt
2026-01-06 6:54 ` [PATCH v3 0/7] Improvements for reading object info Patrick Steinhardt
2026-01-06 6:54 ` [PATCH v3 1/7] object-file: always set OI_LOOSE when " Patrick Steinhardt
2026-01-07 8:50 ` Karthik Nayak
2026-01-07 11:27 ` Patrick Steinhardt
2026-01-06 6:54 ` [PATCH v3 2/7] packfile: always declare object info to be OI_PACKED Patrick Steinhardt
2026-01-06 6:54 ` [PATCH v3 3/7] packfile: extend `is_delta` field to allow for "unknown" state Patrick Steinhardt
2026-01-07 10:12 ` Karthik Nayak
2026-01-06 6:55 ` [PATCH v3 4/7] packfile: always populate pack-specific info when reading object info Patrick Steinhardt
2026-01-06 6:55 ` [PATCH v3 5/7] packfile: disentangle return value of `packed_object_info()` Patrick Steinhardt
2026-01-06 6:55 ` [PATCH v3 6/7] packfile: skip unpacking object header for disk size requests Patrick Steinhardt
2026-01-06 6:55 ` [PATCH v3 7/7] packfile: drop repository parameter from `packed_object_info()` Patrick Steinhardt
2026-01-07 10:17 ` [PATCH v3 0/7] Improvements for reading object info Karthik Nayak
2026-01-07 13:07 ` [PATCH v4 " Patrick Steinhardt
2026-01-07 13:08 ` [PATCH v4 1/7] object-file: always set OI_LOOSE when " Patrick Steinhardt
2026-01-08 9:30 ` Karthik Nayak
2026-01-07 13:08 ` [PATCH v4 2/7] packfile: always declare object info to be OI_PACKED Patrick Steinhardt
2026-01-07 13:08 ` [PATCH v4 3/7] packfile: extend `is_delta` field to allow for "unknown" state Patrick Steinhardt
2026-01-07 13:08 ` [PATCH v4 4/7] packfile: always populate pack-specific info when reading object info Patrick Steinhardt
2026-01-07 13:08 ` [PATCH v4 5/7] packfile: disentangle return value of `packed_object_info()` Patrick Steinhardt
2026-01-07 13:08 ` [PATCH v4 6/7] packfile: skip unpacking object header for disk size requests Patrick Steinhardt
2026-01-07 13:08 ` [PATCH v4 7/7] packfile: drop repository parameter from `packed_object_info()` Patrick Steinhardt
2026-01-08 9:30 ` [PATCH v4 0/7] Improvements for reading object info Karthik Nayak
2026-01-12 9:00 ` [PATCH v5 " Patrick Steinhardt
2026-01-12 9:00 ` [PATCH v5 1/7] object-file: always set OI_LOOSE when " Patrick Steinhardt
2026-01-12 9:00 ` [PATCH v5 2/7] packfile: always declare object info to be OI_PACKED Patrick Steinhardt
2026-01-12 14:54 ` Junio C Hamano
2026-01-12 9:00 ` [PATCH v5 3/7] packfile: extend `is_delta` field to allow for "unknown" state Patrick Steinhardt
2026-01-12 9:00 ` [PATCH v5 4/7] packfile: always populate pack-specific info when reading object info Patrick Steinhardt
2026-01-12 9:00 ` [PATCH v5 5/7] packfile: disentangle return value of `packed_object_info()` Patrick Steinhardt
2026-01-12 9:00 ` [PATCH v5 6/7] packfile: skip unpacking object header for disk size requests Patrick Steinhardt
2026-01-12 9:00 ` [PATCH v5 7/7] packfile: drop repository parameter from `packed_object_info()` Patrick Steinhardt
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=xmqq8qf0xlce.fsf@gitster.g \
--to=gitster@pobox$(echo .)com \
--cc=aplattner@nvidia$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=ps@pks$(echo .)im \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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