From: Josh Steadmon <steadmon@google.com>
To: Jonathan Tan <jonathantanmy@google.com>
Cc: git@vger.kernel.org, stolee@gmail.com, peff@peff.net
Subject: Re: [PATCH v2 3/7] index-pack: remove redundant parameter
Date: Thu, 27 Feb 2020 16:04:12 -0800 [thread overview]
Message-ID: <20200228000412.GC12115@google.com> (raw)
In-Reply-To: <f01f069a080d705ddb52e2353fa303b979a3cb78.1571343096.git.jonathantanmy@google.com>
On 2019.10.17 13:17, Jonathan Tan wrote:
> find_{ref,ofs}_delta_{,children} take an enum object_type parameter, but
> the object type is already present in the name of the function. Remove
> that parameter from these functions.
>
> Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
> ---
> builtin/index-pack.c | 26 ++++++++++++--------------
> 1 file changed, 12 insertions(+), 14 deletions(-)
>
> diff --git a/builtin/index-pack.c b/builtin/index-pack.c
> index df6b3b8cf6..296804230c 100644
> --- a/builtin/index-pack.c
> +++ b/builtin/index-pack.c
> @@ -614,7 +614,7 @@ static int compare_ofs_delta_bases(off_t offset1, off_t offset2,
> 0;
> }
>
> -static int find_ofs_delta(const off_t offset, enum object_type type)
> +static int find_ofs_delta(const off_t offset)
> {
> int first = 0, last = nr_ofs_deltas;
>
> @@ -624,7 +624,8 @@ static int find_ofs_delta(const off_t offset, enum object_type type)
> int cmp;
>
> cmp = compare_ofs_delta_bases(offset, delta->offset,
> - type, objects[delta->obj_no].type);
> + OBJ_OFS_DELTA,
> + objects[delta->obj_no].type);
> if (!cmp)
> return next;
> if (cmp < 0) {
It looks like compare_ofs_delta_bases() could be similarly cleaned up
here? This seems to be the only caller.
> @@ -668,7 +668,7 @@ static int compare_ref_delta_bases(const struct object_id *oid1,
> return oidcmp(oid1, oid2);
> }
>
> -static int find_ref_delta(const struct object_id *oid, enum object_type type)
> +static int find_ref_delta(const struct object_id *oid)
> {
> int first = 0, last = nr_ref_deltas;
>
> @@ -678,7 +678,8 @@ static int find_ref_delta(const struct object_id *oid, enum object_type type)
> int cmp;
>
> cmp = compare_ref_delta_bases(oid, &delta->oid,
> - type, objects[delta->obj_no].type);
> + OBJ_REF_DELTA,
> + objects[delta->obj_no].type);
> if (!cmp)
> return next;
> if (cmp < 0) {
And same with compare_ref_delta_bases here.
> @@ -691,10 +692,9 @@ static int find_ref_delta(const struct object_id *oid, enum object_type type)
> }
>
> static void find_ref_delta_children(const struct object_id *oid,
> - int *first_index, int *last_index,
> - enum object_type type)
> + int *first_index, int *last_index)
> {
> - int first = find_ref_delta(oid, type);
> + int first = find_ref_delta(oid);
> int last = first;
> int end = nr_ref_deltas - 1;
>
> @@ -982,12 +982,10 @@ static struct base_data *find_unresolved_deltas_1(struct base_data *base,
> {
> if (base->ref_last == -1 && base->ofs_last == -1) {
> find_ref_delta_children(&base->obj->idx.oid,
> - &base->ref_first, &base->ref_last,
> - OBJ_REF_DELTA);
> + &base->ref_first, &base->ref_last);
>
> find_ofs_delta_children(base->obj->idx.offset,
> - &base->ofs_first, &base->ofs_last,
> - OBJ_OFS_DELTA);
> + &base->ofs_first, &base->ofs_last);
>
> if (base->ref_last == -1 && base->ofs_last == -1) {
> free(base->data);
> --
> 2.23.0.866.gb869b98d4c-goog
>
next prev parent reply other threads:[~2020-02-28 0:04 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-09 23:44 [RFC PATCH 0/6] Better threaded delta resolution in index-pack Jonathan Tan
2019-10-09 23:44 ` [PATCH 1/6] index-pack: unify threaded and unthreaded code Jonathan Tan
2019-10-17 6:20 ` Jeff King
2019-10-09 23:44 ` [PATCH 2/6] index-pack: remove redundant parameter Jonathan Tan
2019-10-17 6:21 ` Jeff King
2019-10-09 23:44 ` [PATCH 3/6] index-pack: remove redundant child field Jonathan Tan
2019-10-10 14:45 ` Derrick Stolee
2019-10-10 19:02 ` Jonathan Tan
2019-10-17 6:24 ` Jeff King
2019-10-17 6:26 ` Jeff King
2019-10-09 23:44 ` [PATCH 4/6] index-pack: calculate {ref,ofs}_{first,last} early Jonathan Tan
2019-10-17 6:30 ` Jeff King
2019-10-09 23:44 ` [PATCH 5/6] index-pack: make resolve_delta() assume base data Jonathan Tan
2019-10-17 6:32 ` Jeff King
2019-10-09 23:44 ` [PATCH 6/6] index-pack: make quantum of work smaller Jonathan Tan
2019-10-17 6:35 ` Jeff King
2019-10-17 20:17 ` [PATCH v2 0/7] Better threaded delta resolution in index-pack Jonathan Tan
2019-10-17 20:17 ` [PATCH v2 1/7] Documentation: deltaBaseCacheLimit is per-thread Jonathan Tan
2019-10-17 20:17 ` [PATCH v2 2/7] index-pack: unify threaded and unthreaded code Jonathan Tan
2019-10-17 20:17 ` [PATCH v2 3/7] index-pack: remove redundant parameter Jonathan Tan
2020-02-28 0:04 ` Josh Steadmon [this message]
2020-03-10 21:29 ` Jonathan Tan
2019-10-17 20:17 ` [PATCH v2 4/7] index-pack: remove redundant child field Jonathan Tan
2020-02-28 0:04 ` Josh Steadmon
2019-10-17 20:17 ` [PATCH v2 5/7] index-pack: calculate {ref,ofs}_{first,last} early Jonathan Tan
2019-10-17 20:17 ` [PATCH v2 6/7] index-pack: make resolve_delta() assume base data Jonathan Tan
2019-10-17 20:17 ` [PATCH v2 7/7] index-pack: make quantum of work smaller Jonathan Tan
2020-02-28 0:04 ` Josh Steadmon
2020-03-10 21:42 ` Jonathan Tan
2020-02-28 0:03 ` [PATCH v2 0/7] Better threaded delta resolution in index-pack Josh Steadmon
2020-03-10 21:45 ` 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=20200228000412.GC12115@google.com \
--to=steadmon@google.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.com \
--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).