Merge branch 'ds/bitmap-lookup-remove-tracing'
Perf-fix.
* ds/bitmap-lookup-remove-tracing:
pack-bitmap: remove trace2 region from hot path
diff --git a/pack-bitmap.c b/pack-bitmap.c
index 9d52050..440407f 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -830,10 +830,9 @@
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);
diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh
index 7e50f8e..6d693ee 100755
--- a/t/t5310-pack-bitmaps.sh
+++ b/t/t5310-pack-bitmaps.sh
@@ -455,13 +455,6 @@
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 &&
