git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 1/4] bitmap_has_sha1_in_uninteresting(): drop BUG check

From
Jeff King <peff@peff.net>
Date
Sep 1, 2018, 07:44 UTC
Message-ID
<20180901074448.GA25461@sigill.intra.peff.net>
In-Reply-To
<20180901074145.GA24023@sigill.intra.peff.net>

Commit 30cdc33fba (pack-bitmap: save "have" bitmap from walk, 2018-08-21) introduced a new function for looking at the "have" side of a bitmap walk. Because it only makes sense to do so after we've finished the walk, we added an extra safety assertion, making sure that bitmap_git->result is non-NULL.

However, this safety is misguided. It was trying to catch the case where we had called prepare_bitmap_walk() to give us a "struct bitmap_index", but had not yet called traverse_bitmap_commit_list() to walk it. But all of the interesting computation (including setting up the result and "have" bitmaps) happens in the first function! The latter function only delivers the result to a callback function.

So the case we were worried about is impossible; if you get a non-NULL result from prepare_bitmap_walk(), then its "have" field will be fully formed.

But much worse, traverse_bitmap_commit_list() actually frees the result field as it finishes. Which means that this assertion is worse than useless: it's almost guaranteed to trigger!

Our test suite didn't catch this because the function isn't actually exercised at all. The only caller comes from 6a1e32d532 (pack-objects: reuse on-disk deltas for thin "have" objects, 2018-08-21), and that's triggered only when you fetch or push history that contains an object with a base that is found deep in history. Our test suite fetches and pushes either don't use bitmaps, or use too-small example repositories. But any reasonably-sized real-world push or fetch (with bitmaps) would trigger this.

This patch drops the harmful assertion and tweaks the docstring for the function to make the precondition clear. The tests need to be improved to exercise this new pack-objects feature, but we'll do that in a separate commit.

Signed-off-by: Jeff King <peff@peff.net>
---
 pack-bitmap.c | 2 --
 pack-bitmap.h | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/pack-bitmap.c b/pack-bitmap.c
index c3231ef9ef..76fd93a3de 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -1128,8 +1128,6 @@ int bitmap_has_sha1_in_uninteresting(struct bitmap_index *bitmap_git,
 
 	if (!bitmap_git)
 		return 0; /* no bitmap loaded */
-	if (!bitmap_git->result)
-		BUG("failed to perform bitmap walk before querying");
 	if (!bitmap_git->haves)
 		return 0; /* walk had no "haves" */
 
diff --git a/pack-bitmap.h b/pack-bitmap.h
index c633bf5238..189dd68ad3 100644
--- a/pack-bitmap.h
+++ b/pack-bitmap.h
@@ -54,7 +54,7 @@ int rebuild_existing_bitmaps(struct bitmap_index *, struct packing_data *mapping
 void free_bitmap_index(struct bitmap_index *);
 
 /*
- * After a traversal has been performed on the bitmap_index, this can be
+ * After a traversal has been performed by prepare_bitmap_walk(), this can be
  * queried to see if a particular object was reachable from any of the
  * objects flagged as UNINTERESTING.
  */
-- 
2.19.0.rc1.549.g6ce4dc0f08
Previous: Jeff KingNext: Jeff King
Message 15 of 53 in “test-tool.h: include git-compat-util.h”
  1. test-tool.h: include git-compat-util.hJeff King, Aug 21, 2018
  2. Junio C HamanoAug 21, 2018
  3. 1/6 t/perf: factor boilerplate out of test_perfJeff King, Aug 21, 2018
  4. 2/6 t/perf: factor out percent calculationsJeff King, Aug 21, 2018
  5. 3/6 t/perf: add infrastructure for measuring sizesJeff King, Aug 21, 2018
  6. Derrick StoleeAug 22, 2018
  7. Jeff KingAug 22, 2018
  8. 4/6 t/perf: add perf tests for fetches from a bitmapped serverJeff King, Aug 21, 2018
  9. 5/6 pack-bitmap: save "have" bitmap from walkJeff King, Aug 21, 2018
  10. Derrick StoleeAug 21, 2018
  11. Jeff KingAug 21, 2018
  12. Ævar Arnfjörð BjarmasonAug 31, 2018
  13. Jeff KingAug 31, 2018
  14. 0/4 un-breaking pack-objects with bitmapsJeff King, Sep 1, 2018
  15. 1/4 bitmap_has_sha1_in_uninteresting(): drop BUG checkJeff King, Sep 1, 2018
  16. 2/4 t5310: test delta reuse with bitmapsJeff King, Sep 1, 2018
  17. Jeff KingSep 1, 2018
  18. Ævar Arnfjörð BjarmasonSep 1, 2018
  19. Ben PeartSep 1, 2018
  20. Jeff KingSep 2, 2018
  21. Stefan BellerSep 4, 2018
  22. Junio C HamanoSep 4, 2018
  23. Jeff KingSep 4, 2018
  24. 3/4 traverse_bitmap_commit_list(): don't free resultJeff King, Sep 1, 2018
  25. 4/4 pack-bitmap: drop "loaded" flagJeff King, Sep 1, 2018
  26. Stefan BellerSep 4, 2018
  27. Jeff KingSep 4, 2018
  28. Ævar Arnfjörð BjarmasonSep 8, 2018
  29. Junio C HamanoSep 10, 2018
  30. Jeff KingSep 10, 2018
  31. Junio C HamanoSep 10, 2018
  32. 6/6 pack-objects: reuse on-disk deltas for thin "have" objectsJeff King, Aug 21, 2018
  33. Junio C HamanoAug 21, 2018
  34. Junio C HamanoAug 21, 2018
  35. Jeff KingAug 21, 2018
  36. Jeff KingAug 21, 2018
  37. Junio C HamanoAug 21, 2018
  38. Jeff KingAug 21, 2018
  39. Junio C HamanoAug 21, 2018
  40. Jeff KingAug 21, 2018
  41. 0/9 trailer-parsing false positivesJeff King, Aug 23, 2018
  42. 1/9 trailer: use size_t for string offsetsJeff King, Aug 23, 2018
  43. 2/9 trailer: use size_t for iterating trailer listJeff King, Aug 23, 2018
  44. 3/9 trailer: pass process_trailer_opts to trailer_info_get()Jeff King, Aug 23, 2018
  45. 4/9 interpret-trailers: tighten check for "---" patch boundaryJeff King, Aug 23, 2018
  46. 5/9 interpret-trailers: allow suppressing "---" dividerJeff King, Aug 23, 2018
  47. 6/9 pretty, ref-filter: format %(trailers) with no_divider optionJeff King, Aug 23, 2018
  48. 7/9 sequencer: ignore "---" divider when parsing trailersJeff King, Aug 23, 2018
  49. 8/9 append_signoff: use size_t for string offsetsJeff King, Aug 23, 2018
  50. 9/9 sequencer: handle ignore_footer when parsing trailersJeff King, Aug 23, 2018
  51. Junio C HamanoAug 23, 2018
  52. Jeff KingAug 24, 2018
  53. Jeff KingAug 21, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.