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

Re: [PATCH 0/7] rev-parse: implement object type filter

From
Patrick Steinhardt <ps@pks.im>
Date
Mar 15, 2021, 11:25 UTC
Message-ID
<YE9ENGKkKRbzUL7I@ncase>
In-Reply-To
<YEk8iiDf/FMxzhIF@coredump.intra.peff.net>
On Wed, Mar 10, 2021 at 04:39:22PM -0500, Jeff King wrote:
Show 59 quoted lines
> On Mon, Mar 01, 2021 at 01:20:26PM +0100, Patrick Steinhardt wrote:
> 
> > Altogether, this ends up with the following queries, both of which have
> > been executed in a well-packed linux.git repository:
> > 
> >     # Previous query which uses object names as a heuristic to filter
> >     # non-blob objects, which bars us from using bitmap indices because
> >     # they cannot print paths.
> >     $ time git rev-list --objects --filter=blob:limit=200 \
> >         --object-names --all | sed -r '/^.{,41}$/d' | wc -l
> >     4502300
> > 
> >     real 1m23.872s
> >     user 1m30.076s
> >     sys  0m6.002s
> > 
> >     # New query.
> >     $ time git rev-list --objects --filter-provided \
> >         --filter=object:type=blob --filter=blob:limit=200 \
> >         --use-bitmap-index --all | wc -l
> >     22585
> > 
> >     real 0m19.216s
> >     user 0m16.768s
> >     sys  0m2.450s
> 
> Those produce very different answers. I guess because in the first one,
> you still have a bunch of tree objects, too. You'd do much better to get
> the actual types from cat-file, and filter on that. That also lets you
> use bitmaps for the traversal portion. E.g.:
> 
>   $ time git rev-list --use-bitmap-index --objects --filter=blob:limit=200 --all |
>          git cat-file --buffer --batch-check='%(objecttype) %(objectname)' |
> 	 perl -lne 'print $1 if /^blob (.*)/' | wc -l
>   14966
>   
>   real	0m6.248s
>   user	0m7.810s
>   sys	0m0.440s
> 
> which is faster than what you showed above (this is on linux.git, but my
> result is different; maybe you have more refs than me?). But we should
> be able to do better purely internally, so I suspect my computer is just
> faster (or maybe your extra refs just aren't well-covered by bitmaps).
> Running with your patches I get:
> 
>   $ time git rev-list --objects --use-bitmap-index --all \
>              --filter-provided --filter=object:type=blob \
> 	     --filter=blob:limit=200 | wc -l
>   16339
> 
>   real	0m1.309s
>   user	0m1.234s
>   sys	0m0.079s
> 
> which is indeed faster. It's quite curious that the answer is not the
> same, though! I think yours has some bugs. If I sort and diff the
> results, I see some commits mentioned in the output. Perhaps this is
> --filter-provided not working, as they all seem to be ref tips.
[snip]

I've found the issue: when converting filters to a combined filter via `transform_to_combine_type()`, we reset the top-level filter via a call to `memset()`. So for combined filters, the option wouldn't have taken any effect because it got reset iff the `--filter-provided` option comes before the second filter.

Patrick
Previous: Jeff KingNext: Taylor Blau
Message 12 of 97 in “rev-parse: implement object type filter”
  1. 0/7 rev-parse: implement object type filterPatrick Steinhardt, Mar 1, 2021
  2. 3/7 list-objects: support filtering by tag and commitPatrick Steinhardt, Mar 1, 2021
  3. 4/7 list-objects: implement object type filterPatrick Steinhardt, Mar 1, 2021
  4. 1/7 revision: mark commit parents as NOT_USER_GIVENPatrick Steinhardt, Mar 1, 2021
  5. 2/7 list-objects: move tag processing into its own functionPatrick Steinhardt, Mar 1, 2021
  6. 6/7 pack-bitmap: implement combined filterPatrick Steinhardt, Mar 1, 2021
  7. 5/7 pack-bitmap: implement object type filterPatrick Steinhardt, Mar 1, 2021
  8. 7/7 rev-list: allow filtering of provided itemsPatrick Steinhardt, Mar 1, 2021
  9. Jeff KingMar 10, 2021
  10. Patrick SteinhardtMar 11, 2021
  11. Jeff KingMar 11, 2021
  12. Patrick SteinhardtMar 15, 2021
  13. Taylor BlauMar 10, 2021
  14. Jeff KingMar 10, 2021
  15. Patrick SteinhardtMar 11, 2021
  16. Jeff KingMar 11, 2021
  17. 0/8 rev-parse: implement object type filterPatrick Steinhardt, Mar 15, 2021
  18. 1/8 uploadpack.txt: document implication of `uploadpackfilter.allow`Patrick Steinhardt, Mar 15, 2021
  19. Jeff KingApr 6, 2021
  20. 2/8 revision: mark commit parents as NOT_USER_GIVENPatrick Steinhardt, Mar 15, 2021
  21. Jeff KingApr 6, 2021
  22. Patrick SteinhardtApr 9, 2021
  23. 4/8 list-objects: support filtering by tag and commitPatrick Steinhardt, Mar 15, 2021
  24. 3/8 list-objects: move tag processing into its own functionPatrick Steinhardt, Mar 15, 2021
  25. Jeff KingApr 6, 2021
  26. 5/8 list-objects: implement object type filterPatrick Steinhardt, Mar 15, 2021
  27. Jeff KingApr 6, 2021
  28. 7/8 pack-bitmap: implement combined filterPatrick Steinhardt, Mar 15, 2021
  29. Jeff KingApr 6, 2021
  30. Patrick SteinhardtApr 9, 2021
  31. Jeff KingApr 9, 2021
  32. Patrick SteinhardtApr 9, 2021
  33. Jeff KingApr 9, 2021
  34. 8/8 rev-list: allow filtering of provided itemsPatrick Steinhardt, Mar 15, 2021
  35. Jeff KingApr 6, 2021
  36. Patrick SteinhardtApr 9, 2021
  37. Jeff KingApr 9, 2021
  38. 6/8 pack-bitmap: implement object type filterPatrick Steinhardt, Mar 15, 2021
  39. Jeff KingApr 6, 2021
  40. Junio C HamanoMar 20, 2021
  41. Jeff KingApr 6, 2021
  42. Patrick SteinhardtApr 9, 2021
  43. Jeff KingApr 9, 2021
  44. 0/8 rev-parse: implement object type filterPatrick Steinhardt, Apr 9, 2021
  45. 1/8 uploadpack.txt: document implication of `uploadpackfilter.allow`Patrick Steinhardt, Apr 9, 2021
  46. 2/8 revision: mark commit parents as NOT_USER_GIVENPatrick Steinhardt, Apr 9, 2021
  47. 3/8 list-objects: move tag processing into its own functionPatrick Steinhardt, Apr 9, 2021
  48. 4/8 list-objects: support filtering by tag and commitPatrick Steinhardt, Apr 9, 2021
  49. Junio C HamanoApr 11, 2021
  50. 5/8 list-objects: implement object type filterPatrick Steinhardt, Apr 9, 2021
  51. 6/8 pack-bitmap: implement object type filterPatrick Steinhardt, Apr 9, 2021
  52. 7/8 pack-bitmap: implement combined filterPatrick Steinhardt, Apr 9, 2021
  53. 8/8 rev-list: allow filtering of provided itemsPatrick Steinhardt, Apr 9, 2021
  54. 8/8 rev-list: allow filtering of provided itemsPatrick Steinhardt, Apr 9, 2021
  55. Philip OakleyApr 9, 2021
  56. Patrick SteinhardtApr 12, 2021
  57. Junio C HamanoApr 11, 2021
  58. Patrick SteinhardtApr 12, 2021
  59. 0/8 rev-list: implement object type filterPatrick Steinhardt, Apr 12, 2021
  60. 1/8 uploadpack.txt: document implication of `uploadpackfilter.allow`Patrick Steinhardt, Apr 12, 2021
  61. 2/8 revision: mark commit parents as NOT_USER_GIVENPatrick Steinhardt, Apr 12, 2021
  62. 3/8 list-objects: move tag processing into its own functionPatrick Steinhardt, Apr 12, 2021
  63. 4/8 list-objects: support filtering by tag and commitPatrick Steinhardt, Apr 12, 2021
  64. 5/8 list-objects: implement object type filterPatrick Steinhardt, Apr 12, 2021
  65. Ævar Arnfjörð BjarmasonApr 13, 2021
  66. Andreas SchwabApr 13, 2021
  67. Patrick SteinhardtApr 14, 2021
  68. 6/8 pack-bitmap: implement object type filterPatrick Steinhardt, Apr 12, 2021
  69. 7/8 pack-bitmap: implement combined filterPatrick Steinhardt, Apr 12, 2021
  70. 8/8 rev-list: allow filtering of provided itemsPatrick Steinhardt, Apr 12, 2021
  71. Jeff KingApr 13, 2021
  72. Patrick SteinhardtApr 13, 2021
  73. Jeff KingApr 15, 2021
  74. Junio C HamanoApr 16, 2021
  75. Junio C HamanoApr 16, 2021
  76. Ramsay JonesApr 17, 2021
  77. Jeff KingApr 17, 2021
  78. Junio C HamanoApr 17, 2021
  79. Junio C HamanoApr 13, 2021
  80. Patrick SteinhardtApr 14, 2021
  81. Junio C HamanoApr 14, 2021
  82. Jeff KingApr 15, 2021
  83. Junio C HamanoApr 15, 2021
  84. Junio C HamanoApr 15, 2021
  85. Jeff KingApr 17, 2021
  86. 0/8 rev-list: implement object type filterPatrick Steinhardt, Apr 19, 2021
  87. 1/8 uploadpack.txt: document implication of `uploadpackfilter.allow`Patrick Steinhardt, Apr 19, 2021
  88. 2/8 revision: mark commit parents as NOT_USER_GIVENPatrick Steinhardt, Apr 19, 2021
  89. 3/8 list-objects: move tag processing into its own functionPatrick Steinhardt, Apr 19, 2021
  90. 4/8 list-objects: support filtering by tag and commitPatrick Steinhardt, Apr 19, 2021
  91. 5/8 list-objects: implement object type filterPatrick Steinhardt, Apr 19, 2021
  92. 7/8 pack-bitmap: implement combined filterPatrick Steinhardt, Apr 19, 2021
  93. 6/8 pack-bitmap: implement object type filterPatrick Steinhardt, Apr 19, 2021
  94. 8/8 rev-list: allow filtering of provided itemsPatrick Steinhardt, Apr 19, 2021
  95. Junio C HamanoApr 19, 2021
  96. Jeff KingApr 23, 2021
  97. Junio C HamanoApr 28, 2021

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.