development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 01:58:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' of github.com:git/git

Browse source 
* 'main' of github.com:git/git:
  Git 2.38-rc2
  pack-bitmap: remove trace2 region from hot path
This commit is contained in:
Jiang Xin 2022-09-28 08:03:38 +08:00
commit 4ff58e9690
3 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
GIT-VERSION-GEN
View file

@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
DEF_VER=v2.38.0-rc1
DEF_VER=v2.38.0-rc2
LF='
'

3
pack-bitmap.c
View file

@ -830,10 +830,9 @@ struct ewah_bitmap *bitmap_for_commit(struct bitmap_index *bitmap_git,
if (!bitmap_git->table_lookup)
return NULL;
trace2_region_enter("pack-bitmap", "reading_lookup_table", the_repository);
/* this is a fairly hot codepath - no trace2_region please */
/* NEEDSWORK: cache misses aren't recorded */
bitmap = lazy_bitmap_for_commit(bitmap_git, commit);
trace2_region_leave("pack-bitmap", "reading_lookup_table", the_repository);
if (!bitmap)
return NULL;
return lookup_stored_bitmap(bitmap);

7
t/t5310-pack-bitmaps.sh
View file

@ -455,13 +455,6 @@ test_expect_success 'verify writing bitmap lookup table when enabled' '
grep "\"label\":\"writing_lookup_table\"" trace2
'
test_expect_success 'lookup table is actually used to traverse objects' '
git repack -adb &&
GIT_TRACE2_EVENT="$(pwd)/trace3" \
git rev-list --use-bitmap-index --count --all &&
grep "\"label\":\"reading_lookup_table\"" trace3
'
test_expect_success 'truncated bitmap fails gracefully (lookup table)' '
test_config pack.writebitmaphashcache false &&
git repack -adb &&