From: Jeff King <peff@peff.net>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: Stefan Beller <sbeller@google.com>,
git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 4/4] pack-bitmap: drop "loaded" flag
Date: Sat, 1 Sep 2018 03:50:57 -0400 [thread overview]
Message-ID: <20180901075056.GD25461@sigill.intra.peff.net> (raw)
In-Reply-To: <20180901074145.GA24023@sigill.intra.peff.net>
In the early days of the bitmap code, there was a single
static bitmap_index struct that was used behind the scenes,
and any bitmap-related functions could lazily check
bitmap_git.loaded to see if they needed to read the on-disk
data.
But since 3ae5fa0768 (pack-bitmap: remove bitmap_git global
variable, 2018-06-07), the caller is responsible for the
lifetime of the bitmap_index struct, and we return it from
prepare_bitmap_git() and prepare_bitmap_walk(), both of
which load the on-disk data (or return NULL).
So outside of these functions, it's not possible to have a
bitmap_index for which the loaded flag is not true. Nor is
it possible to accidentally pass an already-loaded
bitmap_index to the loading function (which is static-local
to the file).
We can drop this unnecessary and confusing flag.
Signed-off-by: Jeff King <peff@peff.net>
---
pack-bitmap.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/pack-bitmap.c b/pack-bitmap.c
index 8c1af1cca2..40debd5e20 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -91,8 +91,6 @@ struct bitmap_index {
/* Version of the bitmap index */
unsigned int version;
-
- unsigned loaded : 1;
};
static struct ewah_bitmap *lookup_stored_bitmap(struct stored_bitmap *st)
@@ -306,7 +304,7 @@ static int open_pack_bitmap_1(struct bitmap_index *bitmap_git, struct packed_git
static int load_pack_bitmap(struct bitmap_index *bitmap_git)
{
- assert(bitmap_git->map && !bitmap_git->loaded);
+ assert(bitmap_git->map);
bitmap_git->bitmaps = kh_init_sha1();
bitmap_git->ext_index.positions = kh_init_sha1_pos();
@@ -321,7 +319,6 @@ static int load_pack_bitmap(struct bitmap_index *bitmap_git)
if (load_bitmap_entries_v1(bitmap_git) < 0)
goto failed;
- bitmap_git->loaded = 1;
return 0;
failed:
@@ -336,7 +333,7 @@ static int open_pack_bitmap(struct bitmap_index *bitmap_git)
struct packed_git *p;
int ret = -1;
- assert(!bitmap_git->map && !bitmap_git->loaded);
+ assert(!bitmap_git->map);
for (p = get_packed_git(the_repository); p; p = p->next) {
if (open_pack_bitmap_1(bitmap_git, p) == 0)
@@ -738,7 +735,7 @@ struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs)
* from disk. this is the point of no return; after this the rev_list
* becomes invalidated and we must perform the revwalk through bitmaps
*/
- if (!bitmap_git->loaded && load_pack_bitmap(bitmap_git) < 0)
+ if (load_pack_bitmap(bitmap_git) < 0)
goto cleanup;
object_array_clear(&revs->pending);
--
2.19.0.rc1.549.g6ce4dc0f08
next prev parent reply other threads:[~2018-09-01 7:51 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-21 18:41 [PATCH] test-tool.h: include git-compat-util.h Jeff King
2018-08-21 19:03 ` Junio C Hamano
2018-08-21 19:06 ` [PATCH 1/6] t/perf: factor boilerplate out of test_perf Jeff King
2018-08-21 19:06 ` [PATCH 2/6] t/perf: factor out percent calculations Jeff King
2018-08-21 19:06 ` [PATCH 3/6] t/perf: add infrastructure for measuring sizes Jeff King
2018-08-22 13:40 ` Derrick Stolee
2018-08-22 15:31 ` Jeff King
2018-08-21 19:06 ` [PATCH 4/6] t/perf: add perf tests for fetches from a bitmapped server Jeff King
2018-08-21 19:07 ` [PATCH 5/6] pack-bitmap: save "have" bitmap from walk Jeff King
2018-08-21 19:47 ` Derrick Stolee
2018-08-21 19:54 ` Jeff King
2018-08-31 15:23 ` Ævar Arnfjörð Bjarmason
2018-08-31 22:55 ` Jeff King
2018-09-01 7:41 ` [PATCH 0/4] un-breaking pack-objects with bitmaps Jeff King
2018-09-01 7:44 ` [PATCH 1/4] bitmap_has_sha1_in_uninteresting(): drop BUG check Jeff King
2018-09-01 7:48 ` [PATCH 2/4] t5310: test delta reuse with bitmaps Jeff King
2018-09-01 8:03 ` Jeff King
2018-09-01 20:29 ` Ævar Arnfjörð Bjarmason
2018-09-01 22:46 ` Ben Peart
2018-09-02 5:51 ` Jeff King
2018-09-04 19:05 ` Stefan Beller
2018-09-04 19:45 ` Junio C Hamano
2018-09-04 20:02 ` Jeff King
2018-09-01 7:49 ` [PATCH 3/4] traverse_bitmap_commit_list(): don't free result Jeff King
2018-09-01 7:50 ` Jeff King [this message]
2018-09-04 19:30 ` [PATCH 0/4] un-breaking pack-objects with bitmaps Stefan Beller
2018-09-04 20:03 ` Jeff King
2018-09-08 6:43 ` Ævar Arnfjörð Bjarmason
2018-09-10 16:53 ` Junio C Hamano
2018-09-10 18:48 ` Jeff King
2018-09-10 19:23 ` Junio C Hamano
2018-08-21 19:07 ` [PATCH 6/6] pack-objects: reuse on-disk deltas for thin "have" objects Jeff King
2018-08-21 19:43 ` Junio C Hamano
2018-08-21 19:50 ` Junio C Hamano
2018-08-21 20:07 ` Jeff King
2018-08-21 20:14 ` Jeff King
2018-08-21 20:52 ` Junio C Hamano
2018-08-21 21:30 ` Jeff King
2018-08-21 20:57 ` Junio C Hamano
2018-08-21 21:32 ` Jeff King
2018-08-23 0:43 ` [PATCH 0/9] trailer-parsing false positives Jeff King
2018-08-23 0:44 ` [PATCH 1/9] trailer: use size_t for string offsets Jeff King
2018-08-23 0:45 ` [PATCH 2/9] trailer: use size_t for iterating trailer list Jeff King
2018-08-23 0:46 ` [PATCH 3/9] trailer: pass process_trailer_opts to trailer_info_get() Jeff King
2018-08-23 0:48 ` [PATCH 4/9] interpret-trailers: tighten check for "---" patch boundary Jeff King
2018-08-23 0:49 ` [PATCH 5/9] interpret-trailers: allow suppressing "---" divider Jeff King
2018-08-23 0:50 ` [PATCH 6/9] pretty, ref-filter: format %(trailers) with no_divider option Jeff King
2018-08-23 0:50 ` [PATCH 7/9] sequencer: ignore "---" divider when parsing trailers Jeff King
2018-08-23 0:50 ` [PATCH 8/9] append_signoff: use size_t for string offsets Jeff King
2018-08-23 0:51 ` [PATCH 9/9] sequencer: handle ignore_footer when parsing trailers Jeff King
2018-08-23 18:30 ` [PATCH 0/9] trailer-parsing false positives Junio C Hamano
2018-08-24 7:26 ` Jeff King
2018-08-21 20:00 ` [PATCH 6/6] pack-objects: reuse on-disk deltas for thin "have" objects 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=20180901075056.GD25461@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sbeller@google.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).