From: Junio C Hamano <gitster@pobox•com>
To: Jeff King <peff@peff•net>
Cc: "Kirill Smelkov" <kirr@nexedi•com>,
"Vicent Marti" <tanoku@gmail•com>,
"Jérome Perrin" <jerome@nexedi•com>,
"Isabelle Vallet" <isabelle.vallet@nexedi•com>,
"Kazuhiko Shiozaki" <kazuhiko@nexedi•com>,
"Julien Muchembled" <jm@nexedi•com>,
git@vger•kernel.org
Subject: Re: [PATCH 1/2] pack-objects: Teach --use-bitmap-index codepath to respect --local, --honor-pack-keep and --incremental
Date: Mon, 08 Aug 2016 09:08:51 -0700 [thread overview]
Message-ID: <xmqqk2frgs4s.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20160808135020.yggthtfekdiwq3lz@sigill.intra.peff.net> (Jeff King's message of "Mon, 8 Aug 2016 09:50:20 -0400")
Jeff King <peff@peff•net> writes:
> On Mon, Aug 08, 2016 at 03:37:35PM +0300, Kirill Smelkov wrote:
> ...
> static int want_object_in_pack(...)
> {
> ...
> if (!exclude && local && has_loose_object_nonlocal(sha1))
> return 0;
>
> if (*found_pack) {
> int ret = want_found_object(exclude, *found_pack);
> if (ret != -1)
> return ret;
> }
>
> for (p = packed_git; p; p = p->next) {
> off_t offset;
>
> if (p == *found_pack)
> offset = *found_offset;
> else
> offset = find_pack_entry(sha1, p);
> if (offset) {
> ... fill in *found_pack ...
> int ret = want_found_object(exclude, p);
> if (ret != -1)
> return ret;
> }
> }
> return 1;
> }
>
> That's a little more verbose, but IMHO the flow is a lot easier to
> follow (especially as the later re-rolls of that series actually muck
> with the loop order more, but with this approach there's no conflict).
I agree; Kirill's version was so confusing that I couldn't see what
it was trying to do with "pack1_seen" flag that is reset every time
loop repeats (at least, before got my coffee ;-). A helper function
like the above makes the logic a lot easier to grasp.
>> static int add_object_entry(const unsigned char *sha1, enum object_type type,
>> const char *name, int exclude)
>> {
>> - struct packed_git *found_pack;
>> - off_t found_offset;
>> + struct packed_git *found_pack = NULL;
>> + off_t found_offset = 0;
>> uint32_t index_pos;
>>
>> if (have_duplicate_entry(sha1, exclude, &index_pos))
>> @@ -1073,6 +1088,9 @@ static int add_object_entry_from_bitmap(const unsigned char *sha1,
>> if (have_duplicate_entry(sha1, 0, &index_pos))
>> return 0;
>>
>> + if (!want_object_in_pack(sha1, 0, &pack, &offset))
>> + return 0;
>> +
>
> This part looks correct and easy to understand.
Yes.
next prev parent reply other threads:[~2016-08-08 16:08 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-07 19:09 [PATCH] pack-objects: Use reachability bitmap index when generating non-stdout pack too Kirill Smelkov
2016-07-07 20:52 ` Jeff King
2016-07-08 10:38 ` Kirill Smelkov
2016-07-12 19:08 ` Kirill Smelkov
2016-07-13 8:30 ` Jeff King
2016-07-13 8:26 ` Jeff King
2016-07-13 10:52 ` Kirill Smelkov
2016-07-17 17:06 ` Kirill Smelkov
2016-07-19 11:29 ` Jeff King
2016-07-19 12:14 ` Kirill Smelkov
2016-07-25 18:40 ` Jeff King
2016-07-25 18:53 ` Jeff King
2016-07-27 20:15 ` Kirill Smelkov
2016-07-27 20:40 ` Junio C Hamano
2016-07-28 20:22 ` Kirill Smelkov
2016-07-28 21:18 ` Junio C Hamano
2016-07-29 7:40 ` Kirill Smelkov
2016-07-29 7:46 ` [PATCH 1/2] pack-objects: Teach --use-bitmap-index codepath to respect --local, --honor-pack-keep and --incremental Kirill Smelkov
2016-08-01 18:17 ` Junio C Hamano
2016-08-08 12:37 ` Kirill Smelkov
2016-08-08 13:50 ` Jeff King
2016-08-08 13:51 ` Jeff King
2016-08-08 16:08 ` Junio C Hamano [this message]
2016-08-08 19:06 ` Junio C Hamano
2016-08-08 19:09 ` Jeff King
2016-08-08 16:11 ` Junio C Hamano
2016-08-08 18:19 ` Kirill Smelkov
2016-08-08 18:57 ` [PATCH v3] " Kirill Smelkov
2016-08-08 19:26 ` [PATCH 1/2] " Junio C Hamano
2016-08-09 11:21 ` Kirill Smelkov
2016-08-09 11:25 ` [PATCH 1/2 v4] pack-objects: respect --local/--honor-pack-keep/--incremental when bitmap is in use Kirill Smelkov
2016-08-09 16:52 ` [PATCH 1/2] pack-objects: Teach --use-bitmap-index codepath to respect --local, --honor-pack-keep and --incremental Junio C Hamano
2016-08-09 19:29 ` Kirill Smelkov
2016-08-09 19:31 ` [PATCH 1/2 v5] pack-objects: respect --local/--honor-pack-keep/--incremental when bitmap is in use Kirill Smelkov
2016-08-18 17:52 ` Jeff King
2016-09-10 14:57 ` Kirill Smelkov
2016-09-10 15:01 ` [PATCH 1/2 v8] " Kirill Smelkov
2016-09-13 6:23 ` Junio C Hamano
2016-09-13 7:50 ` Kirill Smelkov
2016-09-10 15:05 ` [PATCH] t/perf/run: Don't forget to copy config.mak.autogen & friends to build area Kirill Smelkov
2016-09-12 19:12 ` Junio C Hamano
2016-09-12 19:17 ` Junio C Hamano
2016-09-12 23:10 ` Junio C Hamano
2016-09-13 6:58 ` Kirill Smelkov
2016-09-12 17:33 ` [PATCH 1/2 v5] pack-objects: respect --local/--honor-pack-keep/--incremental when bitmap is in use Junio C Hamano
2016-08-09 19:32 ` [PATCH 2/2 v7] pack-objects: use reachability bitmap index when generating non-stdout pack Kirill Smelkov
2016-08-18 18:06 ` Jeff King
2016-09-10 14:59 ` Kirill Smelkov
2016-09-10 15:01 ` [PATCH 2/2 v8] " Kirill Smelkov
2016-09-12 19:21 ` [PATCH 2/2 v7] " Junio C Hamano
2016-08-09 19:49 ` [PATCH 1/2] pack-objects: Teach --use-bitmap-index codepath to respect --local, --honor-pack-keep and --incremental Junio C Hamano
2016-07-29 7:47 ` [PATCH v4 2/2] pack-objects: Teach it to use reachability bitmap index when generating non-stdout pack too Kirill Smelkov
2016-08-08 13:56 ` Jeff King
2016-08-08 15:40 ` Kirill Smelkov
2016-08-08 18:08 ` Junio C Hamano
2016-08-08 18:13 ` Kirill Smelkov
2016-08-08 18:28 ` Junio C Hamano
2016-08-08 18:58 ` Kirill Smelkov
2016-08-08 18:55 ` [PATCH v5] pack-objects: teach " Kirill Smelkov
2016-08-08 20:53 ` Junio C Hamano
2016-08-09 11:21 ` Kirill Smelkov
2016-08-09 11:26 ` [PATCH 2/2 v6] pack-objects: use reachability bitmap index when generating non-stdout pack Kirill Smelkov
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=xmqqk2frgs4s.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=isabelle.vallet@nexedi$(echo .)com \
--cc=jerome@nexedi$(echo .)com \
--cc=jm@nexedi$(echo .)com \
--cc=kazuhiko@nexedi$(echo .)com \
--cc=kirr@nexedi$(echo .)com \
--cc=peff@peff$(echo .)net \
--cc=tanoku@gmail$(echo .)com \
/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