From: Philip Oakley <philipoakley@iee.email>
To: Christian Couder <christian.couder@gmail.com>, git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Christian Couder <chriscool@tuxfamily.org>,
Ramsay Jones <ramsay@ramsayjones.plus.com>,
Jonathan Tan <jonathantanmy@google.com>
Subject: Re: [PATCH v2 5/9] pack-bitmap: introduce bitmap_walk_contains()
Date: Sat, 19 Oct 2019 16:25:19 +0100 [thread overview]
Message-ID: <dce8e0b5-c4ea-f4f6-6275-1322f2d7200b@iee.email> (raw)
In-Reply-To: <20191019103531.23274-6-chriscool@tuxfamily.org>
Hi Christian,
can I check one thing?
On 19/10/2019 11:35, Christian Couder wrote:
> From: Jeff King <peff@peff.net>
>
> We will use this helper function in a following commit to
> tell us if an object is packed.
>
> Signed-off-by: Jeff King <peff@peff.net>
> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
> ---
> pack-bitmap.c | 12 ++++++++++++
> pack-bitmap.h | 3 +++
> 2 files changed, 15 insertions(+)
>
> diff --git a/pack-bitmap.c b/pack-bitmap.c
> index 016d0319fc..8a51302a1a 100644
> --- a/pack-bitmap.c
> +++ b/pack-bitmap.c
> @@ -826,6 +826,18 @@ int reuse_partial_packfile_from_bitmap(struct bitmap_index *bitmap_git,
> return 0;
> }
>
> +int bitmap_walk_contains(struct bitmap_index *bitmap_git,
> + struct bitmap *bitmap, const struct object_id *oid)
> +{
> + int idx;
Excuse my ignorance here...
For the case on Windows (int/long 32 bit), is this return value
guaranteed to be less than 2GiB, i.e. not a memory offset?
I'm just thinking ahead to the resolution of the 4GiB file limit issue
on Git-for-Windows (https://github.com/git-for-windows/git/pull/2179)
> +
> + if (!bitmap)
> + return 0;
> +
> + idx = bitmap_position(bitmap_git, oid);
> + return idx >= 0 && bitmap_get(bitmap, idx);
> +}
> +
> void traverse_bitmap_commit_list(struct bitmap_index *bitmap_git,
> show_reachable_fn show_reachable)
> {
> diff --git a/pack-bitmap.h b/pack-bitmap.h
> index 466c5afa09..6ab6033dbe 100644
> --- a/pack-bitmap.h
> +++ b/pack-bitmap.h
> @@ -3,6 +3,7 @@
>
> #include "ewah/ewok.h"
> #include "khash.h"
> +#include "pack.h"
> #include "pack-objects.h"
>
> struct commit;
> @@ -53,6 +54,8 @@ int reuse_partial_packfile_from_bitmap(struct bitmap_index *,
> int rebuild_existing_bitmaps(struct bitmap_index *, struct packing_data *mapping,
> kh_oid_map_t *reused_bitmaps, int show_progress);
> void free_bitmap_index(struct bitmap_index *);
> +int bitmap_walk_contains(struct bitmap_index *,
> + struct bitmap *bitmap, const struct object_id *oid);
>
> /*
> * After a traversal has been performed by prepare_bitmap_walk(), this can be
--
Philip
next prev parent reply other threads:[~2019-10-19 15:25 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-19 10:35 [PATCH v2 0/9] Rewrite packfile reuse code Christian Couder
2019-10-19 10:35 ` [PATCH v2 1/9] builtin/pack-objects: report reused packfile objects Christian Couder
2019-10-19 10:35 ` [PATCH v2 2/9] packfile: expose get_delta_base() Christian Couder
2019-10-19 10:35 ` [PATCH v2 3/9] ewah/bitmap: introduce bitmap_word_alloc() Christian Couder
2019-10-22 17:46 ` Jonathan Tan
2019-10-26 9:29 ` Christian Couder
2019-10-19 10:35 ` [PATCH v2 4/9] pack-bitmap: don't rely on bitmap_git->reuse_objects Christian Couder
2019-10-19 10:35 ` [PATCH v2 5/9] pack-bitmap: introduce bitmap_walk_contains() Christian Couder
2019-10-19 15:25 ` Philip Oakley [this message]
2019-10-19 18:55 ` Christian Couder
2019-10-19 20:15 ` Philip Oakley
2019-10-19 23:18 ` Jeff King
2019-10-19 10:35 ` [PATCH v2 6/9] csum-file: introduce hashfile_total() Christian Couder
2019-10-19 10:35 ` [PATCH v2 7/9] pack-objects: introduce pack.allowPackReuse Christian Couder
2019-10-19 10:35 ` [PATCH v2 8/9] builtin/pack-objects: introduce obj_is_packed() Christian Couder
2019-10-19 10:35 ` [PATCH v2 9/9] pack-objects: improve partial packfile reuse Christian Couder
2019-10-19 15:30 ` Philip Oakley
2019-10-19 19:20 ` Christian Couder
2019-10-19 23:23 ` Jeff King
2019-10-20 11:26 ` Philip Oakley
2019-10-22 19:48 ` Jonathan Tan
2019-10-26 9:29 ` Christian Couder
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=dce8e0b5-c4ea-f4f6-6275-1322f2d7200b@iee.email \
--to=philipoakley@iee.email \
--cc=chriscool@tuxfamily.org \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--cc=peff@peff.net \
--cc=ramsay@ramsayjones.plus.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).