From: Junio C Hamano <gitster@pobox.com>
To: "René Scharfe" <l.s.r@web.de>
Cc: git@vger.kernel.org, "Jeff King" <peff@peff.net>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: [PATCH 4/3] object-store: retire odb_load_loose_cache()
Date: Mon, 07 Jan 2019 11:32:26 -0800 [thread overview]
Message-ID: <xmqqd0p88drp.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <a836870b-c803-5ff4-0019-58012773efb7@web.de> ("René Scharfe"'s message of "Mon, 7 Jan 2019 18:29:16 +0100")
René Scharfe <l.s.r@web.de> writes:
> Inline odb_load_loose_cache() into its only remaining caller,
> odb_loose_cache(). The latter offers a nicer interface for loading the
> cache, as it doesn't require callers to deal with fanout directory
> numbers directly.
>
> Signed-off-by: Rene Scharfe <l.s.r@web.de>
> ---
OK, that's much better ;-) Thanks.
> object-store.h | 7 -------
> sha1-file.c | 9 ++-------
> 2 files changed, 2 insertions(+), 14 deletions(-)
>
> diff --git a/object-store.h b/object-store.h
> index 2fb6c0e4db..e16aa38cae 100644
> --- a/object-store.h
> +++ b/object-store.h
> @@ -47,13 +47,6 @@ void add_to_alternates_file(const char *dir);
> */
> void add_to_alternates_memory(const char *dir);
>
> -/*
> - * Populate an odb's loose object cache for one particular subdirectory (i.e.,
> - * the one that corresponds to the first byte of objects you're interested in,
> - * from 0 to 255 inclusive).
> - */
> -void odb_load_loose_cache(struct object_directory *odb, int subdir_nr);
> -
> /*
> * Populate and return the loose object cache array corresponding to the
> * given object ID.
> diff --git a/sha1-file.c b/sha1-file.c
> index c3c6e50704..efcb2cbe74 100644
> --- a/sha1-file.c
> +++ b/sha1-file.c
> @@ -2154,12 +2154,6 @@ struct oid_array *odb_loose_cache(struct object_directory *odb,
> const struct object_id *oid)
> {
> int subdir_nr = oid->hash[0];
> - odb_load_loose_cache(odb, subdir_nr);
> - return &odb->loose_objects_cache[subdir_nr];
> -}
> -
> -void odb_load_loose_cache(struct object_directory *odb, int subdir_nr)
> -{
> struct strbuf buf = STRBUF_INIT;
>
> if (subdir_nr < 0 ||
> @@ -2167,7 +2161,7 @@ void odb_load_loose_cache(struct object_directory *odb, int subdir_nr)
> BUG("subdir_nr out of range");
>
> if (odb->loose_objects_subdir_seen[subdir_nr])
> - return;
> + return &odb->loose_objects_cache[subdir_nr];
>
> strbuf_addstr(&buf, odb->path);
> for_each_file_in_obj_subdir(subdir_nr, &buf,
> @@ -2176,6 +2170,7 @@ void odb_load_loose_cache(struct object_directory *odb, int subdir_nr)
> &odb->loose_objects_cache[subdir_nr]);
> odb->loose_objects_subdir_seen[subdir_nr] = 1;
> strbuf_release(&buf);
> + return &odb->loose_objects_cache[subdir_nr];
> }
>
> void odb_clear_loose_cache(struct object_directory *odb)
next prev parent reply other threads:[~2019-01-07 19:32 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-28 18:04 What's cooking in git.git (Dec 2018, #02; Fri, 28) Junio C Hamano
2018-12-28 18:23 ` Elijah Newren
2019-01-03 13:27 ` Johannes Schindelin
2019-01-07 17:13 ` Elijah Newren
2018-12-28 19:21 ` ag/sequencer-reduce-rewriting-todo, was " Alban Gruin
2018-12-28 20:28 ` Junio C Hamano
2018-12-29 12:08 ` Denton Liu
2019-01-03 13:23 ` ps/stash-in-c, was " Johannes Schindelin
2019-01-06 16:39 ` jk/loose-object-cache René Scharfe
2019-01-06 16:45 ` [PATCH 1/3] object-store: factor out odb_loose_cache() René Scharfe
2019-01-07 8:27 ` Jeff King
2019-01-07 13:26 ` René Scharfe
2019-01-07 17:29 ` René Scharfe
2019-01-07 11:27 ` Philip Oakley
2019-01-07 12:30 ` Jeff King
2019-01-07 13:11 ` René Scharfe
2019-01-06 16:45 ` [PATCH 2/3] object-store: factor out odb_clear_loose_cache() René Scharfe
2019-01-06 16:45 ` [PATCH 3/3] object-store: use one oid_array per subdirectory for loose cache René Scharfe
2019-01-06 20:38 ` Ævar Arnfjörð Bjarmason
2019-01-06 22:58 ` René Scharfe
2019-01-07 8:31 ` [PATCH 0/11] jk/loose-object-cache sha1/object_id fixups Jeff King
2019-01-07 8:33 ` [PATCH 01/11] sha1-file: fix outdated sha1 comment references Jeff King
2019-01-07 8:34 ` [PATCH 02/11] update comment references to sha1_object_info() Jeff King
2019-01-07 8:34 ` [PATCH 03/11] http: use struct object_id instead of bare sha1 Jeff King
2019-01-07 8:35 ` [PATCH 04/11] sha1-file: modernize loose object file functions Jeff King
2019-01-07 8:37 ` [PATCH 05/11] sha1-file: modernize loose header/stream functions Jeff King
2019-01-07 8:37 ` [PATCH 06/11] sha1-file: convert pass-through functions to object_id Jeff King
2019-01-07 8:37 ` [PATCH 07/11] convert has_sha1_file() callers to has_object_file() Jeff King
2019-01-07 8:39 ` [PATCH 08/11] sha1-file: drop has_sha1_file() Jeff King
2019-01-07 8:39 ` [PATCH 09/11] sha1-file: prefer "loose object file" to "sha1 file" in messages Jeff King
2019-01-07 8:39 ` [PATCH 10/11] sha1-file: avoid "sha1 file" for generic use " Jeff King
2019-01-07 8:40 ` [PATCH 11/11] prefer "hash mismatch" to "sha1 mismatch" Jeff King
2019-01-08 16:40 ` [PATCH 0/11] jk/loose-object-cache sha1/object_id fixups René Scharfe
2019-01-08 17:39 ` Junio C Hamano
2019-01-08 18:05 ` Jeff King
2019-01-08 18:07 ` Junio C Hamano
2019-01-08 18:27 ` Derrick Stolee
2019-01-08 18:52 ` Junio C Hamano
2019-01-08 21:16 ` Jeff King
2019-01-09 21:37 ` Stefan Beller
2019-01-09 22:42 ` Stefan Beller
2019-01-10 6:17 ` Jeff King
2019-01-07 17:29 ` [PATCH 4/3] object-store: retire odb_load_loose_cache() René Scharfe
2019-01-07 19:32 ` Junio C Hamano [this message]
2019-01-07 19:29 ` jk/loose-object-cache Junio C Hamano
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=xmqqd0p88drp.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=l.s.r@web.de \
--cc=peff@peff.net \
/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).