From: Jeff King <peff@peff.net>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Junio C Hamano <gitster@pobox.com>, Johannes Sixt <j6t@kdbg.org>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 4/4] core.abbrev: raise the default abbreviation to 12 hexdigits
Date: Fri, 30 Sep 2016 14:05:04 -0400 [thread overview]
Message-ID: <20160930180504.p6ueuxj6g7qzcbwq@sigill.intra.peff.net> (raw)
In-Reply-To: <CA+55aFxW1S6FNUh8YjSXkfC8=F5dka1rY-As6PWfG2rqmrsXXA@mail.gmail.com>
On Fri, Sep 30, 2016 at 10:54:16AM -0700, Linus Torvalds wrote:
> On Fri, Sep 30, 2016 at 1:06 AM, Jeff King <peff@peff.net> wrote:
> >
> > I agree that this deals with the performance concerns by caching the
> > default_abbrev_len and starting there. I still think it's unnecessarily
> > invasive to touch get_short_sha1() at all, which is otherwise only a
> > reading function.
>
> So the reason that d oesn't work is that the "disambiguate_state" data
> where we keep the number of objects is only visible within
> get_short_sha1().
>
> So outside that function, you don't have any sane way to figure out
> how many objects. So then you have to do the extra counting function..
Right. I think you should do the extra counting function. It's a few
more lines, but the design is way less tangled.
> > So IMHO, the best combination is the init_default_abbrev() you posted in
> > [1], but initialized at the top of find_unique_abbrev(). And cached
> > there, obviously, in a similar way.
>
> That's certainly possible, but I'm really not happy with how the
> counting function looks. And nobody actually stood up to say "yeah,
> that gets alternate loose objects right" or "if you have tons of those
> alternate loose objects you have other issues anyway". I think
> somebody would have to "own" that counting function, the advantage of
> just putting it into disambiguate_state is that we just get the
> counting for free..
I don't think you _need_ get the alternate loose objects right. In fact,
I don't think you need to care about loose objects at all. For the
scales we're talking about, they're a rounding error. I would have done
it like this:
diff --git a/sha1_file.c b/sha1_file.c
index 65deaf9..1845502 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1382,6 +1382,32 @@ static void prepare_packed_git_one(char *objdir, int local)
strbuf_release(&path);
}
+static int approximate_object_count_valid;
+
+/*
+ * Give a fast, rough count of the number of objects in the repository. This
+ * ignores loose objects completely. If you have a lot of them, then either
+ * you should repack because your performance will be awful, or they are
+ * all unreachable objects about to be pruned, in which case they're not really
+ * interesting as a measure of repo size in the first place.
+ */
+unsigned long approximate_object_count(void)
+{
+ static unsigned long count;
+ if (!approximate_object_count_valid) {
+ struct packed_git *p;
+
+ prepare_packed_git();
+ count = 0;
+ for (p = packed_git; p; p = p->next) {
+ if (open_pack_index(p))
+ continue;
+ count += p->num_objects;
+ }
+ }
+ return count;
+}
+
static void *get_next_packed_git(const void *p)
{
return ((const struct packed_git *)p)->next;
@@ -1456,6 +1482,7 @@ void prepare_packed_git(void)
void reprepare_packed_git(void)
{
+ approximate_object_count_valid = 0;
prepare_packed_git_run_once = 0;
prepare_packed_git();
}
next prev parent reply other threads:[~2016-09-30 18:05 UTC|newest]
Thread overview: 111+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-26 1:39 Changing the default for "core.abbrev"? Linus Torvalds
2016-09-26 3:46 ` Junio C Hamano
2016-09-26 4:34 ` Jeff King
2016-09-26 4:45 ` Junio C Hamano
2016-09-26 11:57 ` [PATCH 0/10] helping people resolve ambiguous sha1s Jeff King
2016-09-26 11:59 ` [PATCH 01/10] get_sha1: detect buggy calls with multiple disambiguators Jeff King
2016-09-26 16:37 ` Junio C Hamano
2016-09-26 17:21 ` Jeff King
2016-09-26 17:50 ` Junio C Hamano
2016-09-26 11:59 ` [PATCH 02/10] get_sha1: avoid repeating ourselves via ONLY_TO_DIE Jeff King
2016-09-26 11:59 ` [PATCH 03/10] get_sha1: propagate flags to child functions Jeff King
2016-09-26 11:59 ` [PATCH 04/10] get_short_sha1: peel tags when looking for treeish Jeff King
2016-09-26 12:11 ` Jeff King
2016-09-26 16:55 ` Junio C Hamano
2016-09-26 17:23 ` Jeff King
2016-09-26 12:00 ` [PATCH 05/10] get_short_sha1: refactor init of disambiguation code Jeff King
2016-09-26 12:00 ` [PATCH 06/10] get_short_sha1: NUL-terminate hex prefix Jeff King
2016-09-26 17:10 ` Junio C Hamano
2016-09-26 17:25 ` Jeff King
2016-09-26 17:36 ` Junio C Hamano
2016-09-26 12:00 ` [PATCH 07/10] get_short_sha1: mark ambiguity error for translation Jeff King
2016-09-26 12:00 ` [PATCH 08/10] sha1_array: let callbacks interrupt iteration Jeff King
2016-09-26 12:00 ` [PATCH 09/10] for_each_abbrev: drop duplicate objects Jeff King
2016-09-26 12:00 ` [PATCH 10/10] get_short_sha1: list ambiguous objects on error Jeff King
2016-09-26 16:36 ` Linus Torvalds
2016-09-27 5:42 ` Jacob Keller
2016-09-27 12:38 ` Jeff King
2016-09-29 13:01 ` Kyle J. McKay
2016-09-29 13:24 ` Jeff King
2016-09-29 14:36 ` Kyle J. McKay
2016-09-29 14:55 ` Jeff King
2016-09-26 17:30 ` Junio C Hamano
2016-09-26 17:34 ` Jeff King
2016-09-26 17:39 ` Junio C Hamano
2016-09-29 11:46 ` Kyle J. McKay
2016-09-29 13:03 ` Jeff King
2016-09-29 17:19 ` Junio C Hamano
2016-09-30 5:51 ` Jacob Keller
2019-02-04 16:12 ` [RFC/PATCH] core.abbrev doc: document and test the abbreviation length Ævar Arnfjörð Bjarmason
2019-02-04 19:13 ` Junio C Hamano
2019-02-04 20:04 ` Junio C Hamano
2019-02-04 21:36 ` Ævar Arnfjörð Bjarmason
2019-02-04 23:32 ` Jeff King
2019-02-04 23:50 ` Ævar Arnfjörð Bjarmason
2019-02-06 18:29 ` Jeff King
2019-02-06 18:36 ` Ævar Arnfjörð Bjarmason
2016-09-26 6:33 ` Changing the default for "core.abbrev"? Matthieu Moy
2016-09-26 12:09 ` Jeff King
2016-09-29 13:01 ` Kyle J. McKay
2016-09-26 7:13 ` Christian Couder
2016-09-28 23:30 ` [PATCH 0/4] raising core.abbrev default to 12 hexdigits Junio C Hamano
2016-09-28 23:30 ` [PATCH 1/4] config: allow customizing /etc/gitconfig location Junio C Hamano
2016-09-29 9:53 ` Jakub Narębski
2016-09-29 17:20 ` Junio C Hamano
2016-09-29 17:45 ` Matthieu Moy
2016-09-28 23:30 ` [PATCH 2/4] t13xx: do not assume system config is empty Junio C Hamano
2016-09-29 9:01 ` Jeff King
2016-09-29 18:13 ` Junio C Hamano
2016-09-29 18:26 ` Jeff King
2016-09-29 18:57 ` Junio C Hamano
2016-09-29 19:18 ` Jeff King
2016-09-29 19:57 ` Junio C Hamano
2016-09-29 19:06 ` Junio C Hamano
2016-09-29 19:26 ` Jeff King
2016-09-29 21:03 ` Junio C Hamano
2016-09-29 21:08 ` Jeff King
2016-09-28 23:30 ` [PATCH 3/4] worktree: honor configuration variables Junio C Hamano
2016-09-28 23:30 ` [PATCH 4/4] core.abbrev: raise the default abbreviation to 12 hexdigits Junio C Hamano
2016-09-29 2:44 ` SZEDER Gábor
2016-09-29 5:27 ` Lukas Fleischer
2016-09-29 9:22 ` Jeff King
2016-09-29 9:15 ` Jeff King
2016-09-29 10:03 ` Matthieu Moy
2016-09-29 12:52 ` SZEDER Gábor
2016-09-29 5:58 ` Johannes Sixt
2016-09-29 18:05 ` Junio C Hamano
2016-09-29 18:37 ` Linus Torvalds
2016-09-29 18:55 ` Linus Torvalds
2016-09-29 19:06 ` Linus Torvalds
2016-09-29 19:42 ` Junio C Hamano
2016-09-30 0:56 ` Mike Hommey
2016-09-30 1:01 ` Linus Torvalds
2016-09-30 19:41 ` Ævar Arnfjörð Bjarmason
2016-09-29 19:16 ` Jeff King
2016-09-29 19:40 ` Linus Torvalds
2016-09-29 19:45 ` Junio C Hamano
2016-09-29 21:53 ` Linus Torvalds
2016-09-29 23:13 ` Junio C Hamano
2016-09-29 23:20 ` Junio C Hamano
2016-09-30 0:20 ` Linus Torvalds
2016-09-30 0:28 ` Linus Torvalds
2016-09-30 0:57 ` Linus Torvalds
2016-09-30 1:18 ` Linus Torvalds
2016-09-30 3:54 ` Junio C Hamano
2016-09-30 4:10 ` Junio C Hamano
2016-09-30 4:18 ` Linus Torvalds
2016-09-30 4:29 ` Linus Torvalds
2016-09-30 4:27 ` Junio C Hamano
2016-09-30 4:35 ` Junio C Hamano
2016-09-30 18:40 ` Junio C Hamano
2016-09-30 18:51 ` Linus Torvalds
2016-09-30 19:00 ` Junio C Hamano
2016-09-30 4:11 ` Linus Torvalds
2016-09-30 8:06 ` Jeff King
2016-09-30 17:54 ` Linus Torvalds
2016-09-30 18:05 ` Jeff King [this message]
2016-09-30 18:21 ` Linus Torvalds
2016-09-30 20:01 ` Junio C Hamano
2016-09-30 17:56 ` Junio C Hamano
2016-09-30 7:47 ` Jeff King
2016-09-29 9:25 ` Jeff King
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=20160930180504.p6ueuxj6g7qzcbwq@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=torvalds@linux-foundation.org \
/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).