From: Jeff King <peff@peff.net>
To: "René Scharfe" <l.s.r@web.de>
Cc: git@vger.kernel.org, "Junio C Hamano" <gitster@pobox.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 0/11] jk/loose-object-cache sha1/object_id fixups
Date: Mon, 7 Jan 2019 03:31:51 -0500 [thread overview]
Message-ID: <20190107083150.GC21362@sigill.intra.peff.net> (raw)
In-Reply-To: <3512c798-aa42-6fba-ee82-d33a8985be91@web.de>
On Sun, Jan 06, 2019 at 05:39:14PM +0100, René Scharfe wrote:
> Am 28.12.2018 um 19:04 schrieb Junio C Hamano:
> > * jk/loose-object-cache (2018-11-24) 10 commits
> > (merged to 'next' on 2018-12-28 at 5a5faf384e)
> > + odb_load_loose_cache: fix strbuf leak
> > + fetch-pack: drop custom loose object cache
> > + sha1-file: use loose object cache for quick existence check
> > + object-store: provide helpers for loose_objects_cache
> > + sha1-file: use an object_directory for the main object dir
> > + handle alternates paths the same as the main object dir
> > + sha1_file_name(): overwrite buffer instead of appending
> > + rename "alternate_object_database" to "object_directory"
> > + submodule--helper: prefer strip_suffix() to ends_with()
> > + fsck: do not reuse child_process structs
> >
> > Originally merged to 'next' on 2018-11-24
> >
> > Code clean-up with optimization for the codepath that checks
> > (non-)existence of loose objects.
> >
> > Will merge to 'master'.
>
> So this has hit master in the meantime. We discussed a sort performance
> fix in [1]; I'll reply with a short series containing a cleaned-up and
> rebased version as a follow-up.
>
> object-store: factor out odb_loose_cache()
> object-store: factor out odb_clear_loose_cache()
> object-store: use one oid_array per subdirectory for loose cache
Thanks! With the exception of one tiny nit, this looks good to me.
I also cleaned up my sha1/object_id patch and rebased it on top of what
you have here. Though as I worked on it, it expanded in scope a bit.
Possibly it should be a separate series entirely, but that would create
some annoying textual conflicts on merge.
[01/11]: sha1-file: fix outdated sha1 comment references
[02/11]: update comment references to sha1_object_info()
[03/11]: http: use struct object_id instead of bare sha1
[04/11]: sha1-file: modernize loose object file functions
[05/11]: sha1-file: modernize loose header/stream functions
[06/11]: sha1-file: convert pass-through functions to object_id
[07/11]: convert has_sha1_file() callers to has_object_file()
[08/11]: sha1-file: drop has_sha1_file()
[09/11]: sha1-file: prefer "loose object file" to "sha1 file" in messages
[10/11]: sha1-file: avoid "sha1 file" for generic use in messages
[11/11]: prefer "hash mismatch" to "sha1 mismatch"
Documentation/git-fsck.txt | 6 +-
apply.c | 2 +-
builtin/cat-file.c | 6 +-
builtin/fetch.c | 7 +-
builtin/index-pack.c | 2 +-
builtin/pack-objects.c | 4 +-
builtin/reflog.c | 2 +-
builtin/show-ref.c | 2 +-
bulk-checkin.c | 2 +-
cache-tree.c | 4 +-
cache.h | 6 +-
http-push.c | 2 +-
http-walker.c | 10 +-
http.c | 14 +--
http.h | 6 +-
object-store.h | 20 ++--
object.c | 4 +-
refs.c | 2 +-
send-pack.c | 2 +-
sha1-file.c | 219 +++++++++++++++++--------------------
streaming.c | 16 +--
t/t1450-fsck.sh | 2 +-
22 files changed, 161 insertions(+), 179 deletions(-)
-Peff
next prev parent reply other threads:[~2019-01-07 8:31 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 ` Jeff King [this message]
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
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=20190107083150.GC21362@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
/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).