From: Taylor Blau <me@ttaylorr.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2 03/15] rev-list: fallback to non-bitmap traversal when filtering
Date: Fri, 14 Feb 2020 16:22:32 -0800 [thread overview]
Message-ID: <20200215002232.GF11400@syl.local> (raw)
In-Reply-To: <20200214182213.GC150965@coredump.intra.peff.net>
On Fri, Feb 14, 2020 at 01:22:13PM -0500, Jeff King wrote:
> The "--use-bitmap-index" option is usually aspirational: if we have
> bitmaps and the request can be fulfilled more quickly using them we'll
> do so, but otherwise fall back to a non-bitmap traversal.
>
> The exception is object filtering, which explicitly dies if the two
> options are combined. Let's convert this to the usual fallback behavior.
> This is a minor convenience for now (since the caller can easily know
> that --filter and --use-bitmap-index don't combine), but will become
> much more useful as we start to support _some_ filters with bitmaps, but
> not others.
Yeah, I think that this convenience is worth it early on instead of
lumping in these changes in a future patch.
> The test infrastructure here is bigger than necessary for checking this
> one small feature. But it will serve as the basis for more filtering
> bitmap tests in future patches.
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> builtin/rev-list.c | 4 ++--
> t/t6113-rev-list-bitmap-filters.sh | 24 ++++++++++++++++++++++++
> 2 files changed, 26 insertions(+), 2 deletions(-)
> create mode 100755 t/t6113-rev-list-bitmap-filters.sh
>
> diff --git a/builtin/rev-list.c b/builtin/rev-list.c
> index e28d62ec64..bce406bd1e 100644
> --- a/builtin/rev-list.c
> +++ b/builtin/rev-list.c
> @@ -521,8 +521,8 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
> if (revs.show_notes)
> die(_("rev-list does not support display of notes"));
>
> - if (filter_options.choice && use_bitmap_index)
> - die(_("cannot combine --use-bitmap-index with object filtering"));
> + if (filter_options.choice)
> + use_bitmap_index = 0;
>
> save_commit_buffer = (revs.verbose_header ||
> revs.grep_filter.pattern_list ||
> diff --git a/t/t6113-rev-list-bitmap-filters.sh b/t/t6113-rev-list-bitmap-filters.sh
> new file mode 100755
> index 0000000000..977f8d0930
> --- /dev/null
> +++ b/t/t6113-rev-list-bitmap-filters.sh
> @@ -0,0 +1,24 @@
> +#!/bin/sh
> +
> +test_description='rev-list combining bitmaps and filters'
> +. ./test-lib.sh
> +
> +test_expect_success 'set up bitmapped repo' '
> + # one commit will have bitmaps, the other will not
> + test_commit one &&
> + git repack -adb &&
> + test_commit two
> +'
> +
> +test_expect_success 'filters fallback to non-bitmap traversal' '
> + # use a path-based filter, since they are inherently incompatible with
> + # bitmaps (i.e., this test will never get confused by later code to
> + # combine the features)
> + filter=$(echo "!one" | git hash-object -w --stdin) &&
> + git rev-list --objects --filter=sparse:oid=$filter HEAD >expect &&
> + git rev-list --use-bitmap-index \
> + --objects --filter=sparse:oid=$filter HEAD >actual &&
> + test_cmp expect actual
> +'
> +
> +test_done
> --
> 2.25.0.796.gcc29325708
Makes sense.
Thanks,
Taylor
next prev parent reply other threads:[~2020-02-15 0:22 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-13 2:15 [PATCH 0/13] combining object filters and bitmaps Jeff King
2020-02-13 2:16 ` [PATCH 01/13] pack-bitmap: factor out type iterator initialization Jeff King
2020-02-13 17:45 ` Junio C Hamano
2020-02-13 2:16 ` [PATCH 02/13] pack-bitmap: fix leak of haves/wants object lists Jeff King
2020-02-13 18:12 ` Junio C Hamano
2020-02-13 2:17 ` [PATCH 03/13] rev-list: fallback to non-bitmap traversal when filtering Jeff King
2020-02-13 18:19 ` Junio C Hamano
2020-02-13 18:40 ` Jeff King
2020-02-13 2:17 ` [PATCH 04/13] rev-list: consolidate bitmap-disabling options Jeff King
2020-02-13 2:18 ` [PATCH 05/13] rev-list: factor out bitmap-optimized routines Jeff King
2020-02-13 18:34 ` Junio C Hamano
2020-02-13 2:19 ` [PATCH 06/13] rev-list: make --count work with --objects Jeff King
2020-02-13 19:14 ` Junio C Hamano
2020-02-13 20:27 ` Jeff King
2020-02-13 2:20 ` [PATCH 07/13] rev-list: allow bitmaps when counting objects Jeff King
2020-02-13 21:47 ` Junio C Hamano
2020-02-13 22:27 ` Jeff King
2020-02-13 2:20 ` [PATCH 08/13] pack-bitmap: basic noop bitmap filter infrastructure Jeff King
2020-02-13 2:21 ` [PATCH 09/13] rev-list: use bitmap filters for traversal Jeff King
2020-02-13 22:22 ` Junio C Hamano
2020-02-13 22:34 ` Jeff King
2020-02-13 2:21 ` [PATCH 10/13] bitmap: add bitmap_unset() function Jeff King
2020-02-13 2:23 ` [PATCH 11/13] pack-bitmap: implement BLOB_NONE filtering Jeff King
2020-02-13 2:25 ` [PATCH 12/13] pack-bitmap: implement BLOB_LIMIT filtering Jeff King
2020-02-13 23:17 ` Junio C Hamano
2020-02-13 2:25 ` [PATCH 13/13] pack-objects: support filters with bitmaps Jeff King
2020-02-14 18:21 ` [PATCH v2 0/15] combining object filters and bitmaps Jeff King
2020-02-14 18:22 ` [PATCH v2 01/15] pack-bitmap: factor out type iterator initialization Jeff King
2020-02-15 0:10 ` Taylor Blau
2020-02-14 18:22 ` [PATCH v2 02/15] pack-bitmap: fix leak of haves/wants object lists Jeff King
2020-02-15 0:15 ` Taylor Blau
2020-02-15 6:46 ` Jeff King
2020-02-18 17:58 ` Derrick Stolee
2020-02-18 20:02 ` Jeff King
2020-02-14 18:22 ` [PATCH v2 03/15] rev-list: fallback to non-bitmap traversal when filtering Jeff King
2020-02-15 0:22 ` Taylor Blau [this message]
2020-02-14 18:22 ` [PATCH v2 04/15] pack-bitmap: refuse to do a bitmap traversal with pathspecs Jeff King
2020-02-14 19:03 ` Junio C Hamano
2020-02-14 20:51 ` Jeff King
2020-02-14 18:22 ` [PATCH v2 05/15] rev-list: factor out bitmap-optimized routines Jeff King
2020-02-15 0:35 ` Taylor Blau
2020-02-14 18:22 ` [PATCH v2 06/15] rev-list: make --count work with --objects Jeff King
2020-02-15 0:42 ` Taylor Blau
2020-02-15 6:48 ` Jeff King
2020-02-16 23:34 ` Junio C Hamano
2020-02-18 5:24 ` Jeff King
2020-02-18 17:28 ` Junio C Hamano
2020-02-18 19:55 ` Jeff King
2020-02-18 21:19 ` Junio C Hamano
2020-02-18 21:23 ` Jeff King
2020-02-18 18:05 ` Derrick Stolee
2020-02-18 19:59 ` Jeff King
2020-02-14 18:22 ` [PATCH v2 07/15] rev-list: allow bitmaps when counting objects Jeff King
2020-02-15 0:45 ` Taylor Blau
2020-02-15 6:55 ` Jeff King
2020-02-16 23:36 ` Junio C Hamano
2020-02-14 18:22 ` [PATCH v2 08/15] t5310: factor out bitmap traversal comparison Jeff King
2020-02-15 2:14 ` Taylor Blau
2020-02-15 7:00 ` Jeff King
2020-02-14 18:22 ` [PATCH v2 09/15] rev-list: allow commit-only bitmap traversals Jeff King
2020-02-18 18:18 ` Derrick Stolee
2020-02-18 20:05 ` Jeff King
2020-02-18 20:11 ` Derrick Stolee
2020-02-14 18:22 ` [PATCH v2 10/15] pack-bitmap: basic noop bitmap filter infrastructure Jeff King
2020-02-14 18:22 ` [PATCH v2 11/15] rev-list: use bitmap filters for traversal Jeff King
2020-02-14 18:22 ` [PATCH v2 12/15] bitmap: add bitmap_unset() function Jeff King
2020-02-14 18:22 ` [PATCH v2 13/15] pack-bitmap: implement BLOB_NONE filtering Jeff King
2020-02-18 19:26 ` Derrick Stolee
2020-02-18 19:36 ` Derrick Stolee
2020-02-18 20:30 ` Jeff King
2020-02-18 20:24 ` Jeff King
2020-02-14 18:22 ` [PATCH v2 14/15] pack-bitmap: implement BLOB_LIMIT filtering Jeff King
2020-02-14 18:22 ` [PATCH v2 15/15] pack-objects: support filters with bitmaps 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=20200215002232.GF11400@syl.local \
--to=me@ttaylorr.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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).