From: Jonathan Tan <jonathantanmy@google.com>
To: stolee@gmail.com
Cc: jonathantanmy@google.com, git@vger.kernel.org, peff@peff.net
Subject: Re: [PATCH] diff: restrict when prefetching occurs
Date: Tue, 31 Mar 2020 09:50:58 -0700 [thread overview]
Message-ID: <20200331165058.53637-1-jonathantanmy@google.com> (raw)
In-Reply-To: <b956528c-412b-2f38-bd90-1fa2ae4b8604@gmail.com>
> This conflicts with [3], so please keep that in mind.
>
> Maybe [3] should be adjusted to assume this patch, because that change
> is mostly about disabling the batch download when no renames are required.
> As Peff said [2] the full rename detection trigger is "overly broad".
>
> However, the changed-path Bloom filters are an excellent test for this
> patch, as computing them in a partial clone will trigger downloading all
> blobs without [3].
>
> [3] https://lore.kernel.org/git/55824cda89c1dca7756c8c2d831d6e115f4a9ddb.1585528298.git.gitgitgadget@gmail.com/T/#u
>
> > [1] https://lore.kernel.org/git/20200128213508.31661-1-jonathantanmy@google.com/
> > [2] https://lore.kernel.org/git/20200130055136.GA2184413@coredump.intra.peff.net/
Thanks for the pointer. Yes, I think that [3] should be adjusted to
assume this patch.
> > + for (i = 0; i < rename_dst_nr; i++) {
> > + if (rename_dst[i].pair)
> > + continue; /* already found exact match */
> > + add_if_missing(options->repo, &to_fetch, rename_dst[i].two);
>
> Could this be reversed instead to avoid the "continue"?
Hmm...I prefer the "return early" approach, but can change it if others
prefer to avoid the "continue" here.
> if (!rename_dst[i].pair)
> add_if_missing(options->repo, &to_fetch, rename_dst[i].two);
>
> > + }
> > + for (i = 0; i < rename_src_nr; i++)
> > + add_if_missing(options->repo, &to_fetch, rename_src[i].p->one);
>
> Does this not have the equivalent "rename_src[i].pair" logic for exact
> matches?
Thanks for the catch. There's no "pair" in rename_src[i], but the
equivalent is "if (skip_unmodified &&
diff_unmodified_pair(rename_src[i].p))", which you can see in the "for"
loop later in the function. I've added this.
> > + if (to_fetch.nr)
> > + promisor_remote_get_direct(options->repo,
> > + to_fetch.oid, to_fetch.nr);
>
> Perhaps promisor_remote_get_direct() could have the check for
> nr == 0 to exit early instead of putting that upon all the
> callers?
The 2nd param is a pointer to an array, and I think it would be strange
to pass a pointer to a 0-size region of memory anywhere, so I'll leave
it as it is.
> > +test_expect_success 'diff does not fetch anything if inexact rename detection is not needed' '
> > + test_when_finished "rm -rf server client trace" &&
> > +
> > + test_create_repo server &&
> > + echo a >server/a &&
> > + printf "b\nb\nb\nb\nb\n" >server/b &&
> > + git -C server add a b &&
> > + git -C server commit -m x &&
>
> > + rm server/b &&
> > + printf "b\nb\nb\nb\nb\n" >server/c &&
>
> Would "mv server/b server/c" make it more clear that
> this is an exact rename?
True. Will do.
Thanks for the review.
next prev parent reply other threads:[~2020-03-31 16:51 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-31 2:04 [PATCH] diff: restrict when prefetching occurs Jonathan Tan
2020-03-31 12:14 ` Derrick Stolee
2020-03-31 16:50 ` Jonathan Tan [this message]
2020-03-31 17:48 ` Derrick Stolee
2020-03-31 18:21 ` Junio C Hamano
2020-03-31 18:15 ` Junio C Hamano
2020-04-02 19:19 ` [PATCH v2 0/2] Restrict when prefetcing occurs Jonathan Tan
2020-04-02 19:19 ` [PATCH v2 1/2] promisor-remote: accept 0 as oid_nr in function Jonathan Tan
2020-04-02 19:46 ` Junio C Hamano
2020-04-02 23:01 ` Jonathan Tan
2020-04-02 19:19 ` [PATCH v2 2/2] diff: restrict when prefetching occurs Jonathan Tan
2020-04-02 20:08 ` Junio C Hamano
2020-04-02 23:09 ` Jonathan Tan
2020-04-02 23:25 ` Junio C Hamano
2020-04-02 23:54 ` Junio C Hamano
2020-04-03 21:35 ` Jonathan Tan
2020-04-03 22:12 ` Junio C Hamano
2020-04-02 20:28 ` [PATCH v2 0/2] Restrict when prefetcing occurs Junio C Hamano
2020-04-06 11:44 ` Derrick Stolee
2020-04-06 11:57 ` Garima Singh
2020-04-07 22:11 ` [PATCH v3 0/4] " Jonathan Tan
2020-04-07 22:11 ` [PATCH v3 1/4] promisor-remote: accept 0 as oid_nr in function Jonathan Tan
2020-04-07 22:11 ` [PATCH v3 2/4] diff: make diff_populate_filespec_options struct Jonathan Tan
2020-04-07 23:44 ` Junio C Hamano
2020-04-07 22:11 ` [PATCH v3 3/4] diff: refactor object read Jonathan Tan
2020-04-07 22:11 ` [PATCH v3 4/4] diff: restrict when prefetching occurs Jonathan Tan
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=20200331165058.53637-1-jonathantanmy@google.com \
--to=jonathantanmy@google.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=stolee@gmail.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).