From: Teng Long <dyroneteng@gmail.com>
To: me@ttaylorr.com
Cc: avarab@gmail.com, derrickstolee@github.com, dyroneteng@gmail.com,
git@vger.kernel.org, tenglong.tl@alibaba-inc.com
Subject: Teng Long
Date: Wed, 30 Mar 2022 15:32:30 +0800 [thread overview]
Message-ID: <20220330073230.61358-1-dyroneteng@gmail.com> (raw)
In-Reply-To: <YkPGq0mDL4NG6D1o@nand.local>
On Tue, 29 Mar 2022 22:55:39 -0400, Taylor Blau wrote:
> You're right; open_pack_bitmap_1() doesn't need to care about whether or
> not bitmap_git->midx is or isn't non-NULL, since:
>
> - if we did open a MIDX bitmap (which we will always attempt first
> before trying to open single-pack bitmaps), then we won't even
> bother to call open_pack_bitmap() at all.
>
> - if we _do_ end up within open_pack_bitmap_1(), then we _know_ that
> no MIDX bitmap could be found/opened, so there is no need to check
> in that case, either.
>
> So I think we realistically could do something like:
>
> --- 8< ---
>
> diff --git a/pack-bitmap.c b/pack-bitmap.c
> index 97909d48da..6e7c89826d 100644
> --- a/pack-bitmap.c
> +++ b/pack-bitmap.c
> @@ -387,3 +387,3 @@ static int open_pack_bitmap_1(struct bitmap_index *bitmap_git, struct packed_git
>
> - if (bitmap_git->pack || bitmap_git->midx) {
> + if (bitmap_git->pack) {
> /* ignore extra bitmap file; we can only handle one */
>
> --- >8 ---
> ...but having the conditional there from the pre-image doesn't hurt,
> either, and it makes the error clearer in case of an accidental
> regression where we start looking for single-pack bitmaps after
> successfully opening a multi-pack one.
I agree with the "accidental regression", it's a protection without
any disadvantages so far. So, if we don't remove the "bitmap_git->midx"
condition for some robust reason, then I think maybe we can let the
warning more detailed if the "accident" happens, like:
diff --git a/pack-bitmap.c b/pack-bitmap.c
index 91a6be358d..e64a85bc59 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -333,7 +333,15 @@ static int open_midx_bitmap_1(struct bitmap_index *bitmap_git,
struct strbuf buf = STRBUF_INIT;
get_midx_filename(&buf, midx->object_dir);
/* ignore extra bitmap file; we can only handle one */
- warning("ignoring extra bitmap file: %s", buf.buf);
+ warning("%signoring extra bitmap file: %s",
+ bitmap_git->pack ?
+ xstrfmt("A non-MIDX bitmap has been opened: %s, ",
+ bitmap_git->pack->pack_name) :
+ bitmap_git->midx ?
+ xstrfmt("A MIDX bitmap has been opened : %s, ",
+ midx_bitmap_filename(bitmap_git->midx)) :
+ "",
+ buf.buf);
close(fd);
strbuf_release(&buf);
return -1;
@@ -398,9 +406,17 @@ static int open_pack_bitmap_1(struct bitmap_index *bitmap_git, struct packed_git
return -1;
}
- if (bitmap_git->pack) {
+ if (bitmap_git->pack || bitmap_git->midx) {
/* ignore extra bitmap file; we can only handle one */
- warning("ignoring extra bitmap file: %s", packfile->pack_name);
+ warning("%signoring extra bitmap file: %s",
+ bitmap_git->pack ?
+ xstrfmt("A non-MIDX bitmap has been opened: %s, ",
+ bitmap_git->pack->pack_name) :
+ bitmap_git->midx ?
+ xstrfmt("A MIDX bitmap has been opened : %s, ",
+ midx_bitmap_filename(bitmap_git->midx)) :
+ "",
+ packfile->pack_name);
close(fd);
return -1;
}
diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh
index f775fc1ce6..a962f6861f 100755
--- a/t/t5310-pack-bitmaps.sh
+++ b/t/t5310-pack-bitmaps.sh
@@ -421,6 +421,7 @@ test_expect_success 'complains about multiple pack bitmaps' '
test_line_count = 2 bitmaps &&
git rev-list --use-bitmap-index HEAD 2>err &&
+ grep "A non-MIDX bitmap has been opened" err &&
grep "ignoring extra bitmap file" err
)
Does that make sense to you?
And also I look codes in "open_midx_bitmap_1()", it's really nice for me to read and
understand, but the "char *idx_name = ..." declaration made me a litte confusing at
the beginning, I think maybe it's better to name it as "bitmap_name" for it, I know
bitmap is also a kind of index structure for using, but when I saw "idx", it brings
me to the ".idx" or "multi-pack-index" like files naturally in git context, of course
this is not a problem and maybe it's just me.
next prev parent reply other threads:[~2022-03-30 7:33 UTC|newest]
Thread overview: 128+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-24 11:43 [PATCH v1 0/3] trace2 output for bitmap decision path Teng Long
2022-03-24 11:43 ` [PATCH v1 1/3] pack-bitmap.c: use "ret" in "open_midx_bitmap()" Teng Long
2022-03-24 19:11 ` Taylor Blau
2022-03-28 7:59 ` [PATCH v1 1/3] pack-bitmap.c: use "ret" in "open_midx_bitmap() Teng Long
2022-03-30 2:39 ` Taylor Blau
2022-03-24 11:44 ` [PATCH v1 2/3] pack-bitmap.c: add "break" statement in "open_pack_bitmap()" Teng Long
2022-03-24 18:40 ` Junio C Hamano
2022-03-24 19:06 ` Taylor Blau
2022-03-24 19:03 ` Taylor Blau
2022-03-29 2:49 ` Teng Long
2022-03-30 2:55 ` Taylor Blau
2022-03-30 7:32 ` Teng Long [this message]
2022-03-30 13:17 ` Teng Long Ævar Arnfjörð Bjarmason
2022-03-24 11:44 ` [PATCH v1 3/3] bitmap: add trace outputs during open "bitmap" file Teng Long
2022-03-24 18:42 ` Junio C Hamano
2022-03-24 13:22 ` [PATCH v1 0/3] trace2 output for bitmap decision path Ævar Arnfjörð Bjarmason
2022-03-29 7:38 ` Teng Long Teng Long
2022-03-29 8:54 ` Ævar Arnfjörð Bjarmason
2022-04-21 13:26 ` [PATCH v2 0/5] trace2 output for bitmap decision path Teng Long
2022-04-21 13:26 ` [PATCH v2 1/5] pack-bitmap.c: continue looping when first MIDX bitmap is found Teng Long
2022-05-11 21:31 ` Taylor Blau
2022-04-21 13:26 ` [PATCH v2 2/5] pack-bitmap.c: rename "idx_name" to "bitmap_name" Teng Long
2022-05-11 21:31 ` Taylor Blau
2022-04-21 13:26 ` [PATCH v2 3/5] pack-bitmap.c: make warnings more detailed when opening bitmap Teng Long
2022-04-21 17:25 ` Taylor Blau
2022-05-06 9:08 ` Teng Long
2022-04-21 13:26 ` [PATCH v2 4/5] bitmap: add trace2 outputs during open "bitmap" file Teng Long
2022-04-21 15:51 ` Ævar Arnfjörð Bjarmason
2022-05-06 11:27 ` Teng Long
2022-05-06 11:53 ` Teng Long
2022-04-21 16:32 ` Jeff Hostetler
2022-05-06 12:43 ` Teng Long
2022-05-10 20:47 ` Jeff Hostetler
2022-04-21 13:26 ` [PATCH v2 5/5] pack-bitmap.c: using error() instead of silently returning -1 Teng Long
2022-04-21 15:41 ` Ævar Arnfjörð Bjarmason
2022-05-06 12:55 ` Teng Long
2022-06-12 7:44 ` [PATCH v3 0/5] Teng Long
2022-06-12 7:44 ` [PATCH v3 1/5] pack-bitmap.c: continue looping when first MIDX bitmap is found Teng Long
2022-06-12 7:44 ` [PATCH v3 2/5] pack-bitmap.c: rename "idx_name" to "bitmap_name" Teng Long
2022-06-12 7:44 ` [PATCH v3 3/5] pack-bitmap.c: make warnings support i18N when opening bitmap Teng Long
2022-06-12 7:44 ` [PATCH v3 4/5] pack-bitmap.c: using error() instead of silently returning -1 Teng Long
2022-06-14 1:15 ` Taylor Blau
2022-06-20 13:17 ` Teng Long
2022-06-12 7:44 ` [PATCH v3 5/5] bitmap: add trace2 outputs during open "bitmap" file Teng Long
2022-06-13 20:59 ` Junio C Hamano
2022-06-20 13:32 ` Teng Long
2022-06-14 1:40 ` Taylor Blau
2022-06-21 6:58 ` Teng Long
2022-06-22 12:51 ` Jeff Hostetler
2022-06-23 9:38 ` Teng Long
2022-06-23 15:14 ` Jeff Hostetler
2022-06-24 8:27 ` [PATCH v3 5/5] bitmap: add trace2 outputs during open "bitmap" Teng Long
2022-06-21 13:25 ` [PATCH v3 0/5] trace2 output for bitmap decision path Teng Long
2022-06-21 13:25 ` [PATCH v3 1/5] pack-bitmap.c: continue looping when first MIDX bitmap is found Teng Long
2022-06-21 13:25 ` [PATCH v3 2/5] pack-bitmap.c: rename "idx_name" to "bitmap_name" Teng Long
2022-06-21 13:25 ` [PATCH v3 3/5] pack-bitmap.c: make warnings support i18N when opening bitmap Teng Long
2022-06-21 13:25 ` [PATCH v3 4/5] pack-bitmap.c: using error() instead of silently returning -1 Teng Long
2022-06-21 13:25 ` [PATCH v3 5/5] bitmap: add trace2 outputs during open "bitmap" file Teng Long
2022-06-22 13:04 ` Jeff Hostetler
2022-06-22 15:12 ` Junio C Hamano
2022-06-28 8:17 ` [PATCH v5 0/5] tr2: avoid to print "interesting" config repeatedly Teng Long
2022-06-28 8:17 ` [PATCH v5 1/5] pack-bitmap.c: continue looping when first MIDX bitmap is found Teng Long
2022-06-28 8:17 ` [PATCH v5 2/5] pack-bitmap.c: rename "idx_name" to "bitmap_name" Teng Long
2022-06-28 8:17 ` [PATCH v5 3/5] pack-bitmap.c: using error() instead of silently returning -1 Teng Long
2022-06-28 18:04 ` Junio C Hamano
2022-07-05 9:04 ` Teng Long
2022-07-05 18:23 ` Junio C Hamano
2022-06-28 8:17 ` [PATCH v5 4/5] pack-bitmap.c: retrieve missing i18n translations Teng Long
2022-06-28 8:58 ` Ævar Arnfjörð Bjarmason
2022-06-28 17:28 ` Eric Sunshine
2022-07-06 14:19 ` Teng Long
2022-07-06 14:06 ` Teng Long
2022-06-28 18:07 ` Junio C Hamano
2022-07-07 11:59 ` Teng Long
2022-07-07 16:45 ` Junio C Hamano
2022-07-11 11:04 ` Teng Long
2022-06-28 8:17 ` [PATCH v5 5/5] tr2: avoid to print "interesting" config repeatedly Teng Long
2022-06-28 9:13 ` Ævar Arnfjörð Bjarmason
2022-06-28 18:12 ` Junio C Hamano
2022-07-01 14:31 ` Jeff Hostetler
2022-07-11 4:11 ` Teng Long
2022-07-11 3:51 ` Teng Long
2022-07-11 12:43 ` [PATCH v6 0/7] trace2: dump scope when print "interesting" config Teng Long
2022-07-11 12:43 ` [PATCH v6 1/7] clean: fixed issues related to text output format Teng Long
2022-07-11 21:08 ` Junio C Hamano
2022-07-13 11:44 ` Teng Long
2022-07-11 12:43 ` [PATCH v6 2/7] pack-bitmap.c: mark more strings for translations Teng Long
2022-07-11 12:43 ` [PATCH v6 3/7] pack-bitmap.c: rename "idx_name" to "bitmap_name" Teng Long
2022-07-11 12:44 ` [PATCH v6 4/7] pack-bitmap.c: don't ignore ENOENT silently Teng Long
2022-07-11 14:38 ` Ævar Arnfjörð Bjarmason
2022-07-13 14:14 ` Teng Long
2022-07-11 21:22 ` Junio C Hamano
2022-07-14 15:25 ` Teng Long
2022-07-11 12:44 ` [PATCH v6 5/7] pack-bitmap.c: using error() instead of silently returning -1 Teng Long
2022-07-11 14:53 ` Ævar Arnfjörð Bjarmason
2022-07-15 2:34 ` Teng Long
2022-07-11 12:44 ` [PATCH v6 6/7] pack-bitmap.c: continue looping when first MIDX bitmap is found Teng Long
2022-07-11 12:44 ` [PATCH v6 7/7] tr2: dump names if config exist in multiple scopes Teng Long
2022-07-11 14:40 ` Ævar Arnfjörð Bjarmason
2022-07-11 19:19 ` Jeff Hostetler
2022-07-11 14:59 ` [PATCH v6 0/7] trace2: dump scope when print "interesting" config Ævar Arnfjörð Bjarmason
2022-07-18 8:36 ` Teng Long
2022-07-18 16:45 ` [PATCH v7 " Teng Long
2022-07-18 16:46 ` [PATCH v7 1/7] pack-bitmap.c: fix formatting of error messages Teng Long
2022-07-18 16:46 ` [PATCH v7 2/7] pack-bitmap.c: mark more strings for translations Teng Long
2022-07-18 16:46 ` [PATCH v7 3/7] pack-bitmap.c: rename "idx_name" to "bitmap_name" Teng Long
2022-07-18 16:46 ` [PATCH v7 4/7] pack-bitmap.c: do not ignore error when opening a bitmap file Teng Long
2022-07-18 16:46 ` [PATCH v7 5/7] pack-bitmap.c: using error() instead of silently returning -1 Teng Long
2022-07-18 16:46 ` [PATCH v7 6/7] pack-bitmap.c: continue looping when first MIDX bitmap is found Teng Long
2022-07-18 16:46 ` [PATCH v7 7/7] tr2: dump names if config exist in multiple scopes Teng Long
2022-07-18 20:13 ` Jeff Hostetler
2022-07-19 7:40 ` tenglong.tl
2022-07-19 21:03 ` Junio C Hamano
2022-07-20 12:48 ` tenglong.tl
2022-07-18 18:57 ` [PATCH v7 0/7] trace2: dump scope when print "interesting" config Junio C Hamano
2022-07-18 19:07 ` Ævar Arnfjörð Bjarmason
2022-07-19 11:26 ` tenglong.tl
2022-07-19 11:42 ` Ævar Arnfjörð Bjarmason
2022-07-19 12:34 ` tenglong.tl
2022-07-21 9:05 ` [PATCH v8 0/6] pack-bitmap.c: optimize error messages tenglong.tl
2022-07-21 9:05 ` [PATCH v8 1/6] pack-bitmap.c: fix formatting of " tenglong.tl
2022-07-21 9:05 ` [PATCH v8 2/6] pack-bitmap.c: mark more strings for translations tenglong.tl
2022-07-21 9:05 ` [PATCH v8 3/6] pack-bitmap.c: rename "idx_name" to "bitmap_name" tenglong.tl
2022-07-21 9:05 ` [PATCH v8 4/6] pack-bitmap.c: do not ignore error when opening a bitmap file tenglong.tl
2022-07-21 9:05 ` [PATCH v8 5/6] pack-bitmap.c: using error() instead of silently returning -1 tenglong.tl
2022-07-21 9:05 ` [PATCH v8 6/6] pack-bitmap.c: continue looping when first MIDX bitmap is found tenglong.tl
2022-07-21 23:01 ` [PATCH v8 0/6] pack-bitmap.c: optimize error messages Junio C Hamano
2022-07-22 6:17 ` tenglong.tl
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=20220330073230.61358-1-dyroneteng@gmail.com \
--to=dyroneteng@gmail.com \
--cc=avarab@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=me@ttaylorr.com \
--cc=tenglong.tl@alibaba-inc.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).