From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v2 11/15] rev-list: use bitmap filters for traversal
Date: Fri, 14 Feb 2020 13:22:32 -0500 [thread overview]
Message-ID: <20200214182232.GK150965@coredump.intra.peff.net> (raw)
In-Reply-To: <20200214182147.GA654525@coredump.intra.peff.net>
This just passes the filter-options struct to prepare_bitmap_walk().
Since the bitmap code doesn't actually support any filters yet, it will
fallback to the non-bitmap code if any --filter is specified. But this
lets us exercise that rejection code path, as well as getting us ready
to test filters via rev-list when we _do_ support them.
Signed-off-by: Jeff King <peff@peff.net>
---
builtin/rev-list.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index 6ff5e175fa..35e14ad2ed 100644
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -372,7 +372,8 @@ static inline int parse_missing_action_value(const char *value)
return 0;
}
-static int try_bitmap_count(struct rev_info *revs)
+static int try_bitmap_count(struct rev_info *revs,
+ struct list_objects_filter_options *filter)
{
uint32_t commit_count = 0,
tag_count = 0,
@@ -407,7 +408,7 @@ static int try_bitmap_count(struct rev_info *revs)
*/
max_count = revs->max_count;
- bitmap_git = prepare_bitmap_walk(revs, NULL);
+ bitmap_git = prepare_bitmap_walk(revs, filter);
if (!bitmap_git)
return -1;
@@ -423,7 +424,8 @@ static int try_bitmap_count(struct rev_info *revs)
return 0;
}
-static int try_bitmap_traversal(struct rev_info *revs)
+static int try_bitmap_traversal(struct rev_info *revs,
+ struct list_objects_filter_options *filter)
{
struct bitmap_index *bitmap_git;
@@ -434,7 +436,7 @@ static int try_bitmap_traversal(struct rev_info *revs)
if (revs->max_count >= 0)
return -1;
- bitmap_git = prepare_bitmap_walk(revs, NULL);
+ bitmap_git = prepare_bitmap_walk(revs, filter);
if (!bitmap_git)
return -1;
@@ -605,9 +607,6 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
(revs.left_right || revs.cherry_mark))
die(_("marked counting is incompatible with --objects"));
- if (filter_options.choice)
- use_bitmap_index = 0;
-
save_commit_buffer = (revs.verbose_header ||
revs.grep_filter.pattern_list ||
revs.grep_filter.header_list);
@@ -618,9 +617,9 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
progress = start_delayed_progress(show_progress, 0);
if (use_bitmap_index) {
- if (!try_bitmap_count(&revs))
+ if (!try_bitmap_count(&revs, &filter_options))
return 0;
- if (!try_bitmap_traversal(&revs))
+ if (!try_bitmap_traversal(&revs, &filter_options))
return 0;
}
--
2.25.0.796.gcc29325708
next prev parent reply other threads:[~2020-02-14 18: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
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 ` Jeff King [this message]
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=20200214182232.GK150965@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--subject='Re: [PATCH v2 11/15] rev-list: use bitmap filters for traversal' \
/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
Code repositories for project(s) associated with this 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).