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

Re: [PATCH v4 09/16] refs/packed-backend.c: implement jump lists to avoid excluded pattern(s)

From
Taylor Blau <me@ttaylorr.com>
Date
Jul 3, 2023, 17:38 UTC
Message-ID
<ZKMHhUVQ3EckJFIE@nand.local>
In-Reply-To
<20230703055627.GF3502534@coredump.intra.peff.net>
On Mon, Jul 03, 2023 at 01:56:27AM -0400, Jeff King wrote:
Show 13 quoted lines
> On Tue, Jun 20, 2023 at 10:21:42AM -0400, Taylor Blau wrote:
>
> > Second, note that the jump list is best-effort, since we do not handle
> > loose references, and because of the meta-character issue above. The
> > jump list may not skip past all references which won't appear in the
> > results, but will never skip over a reference which does appear in the
> > result set.
>
> I wonder if we should be advertising this in a docstring comment above
> the relevant function. The problem may be that there are several such
> functions. I just think that it's a gotcha that may affect somebody who
> wants to call the function, and they're not going to think to dig up
> this commit message.
Good idea, thanks.
Show 21 quoted lines
> >     $ hyperfine \
> >       'git for-each-ref --format="%(objectname) %(refname)" | grep -vE "^[0-9a-f]{40} refs/pull/"' \
> >       'git.compile for-each-ref --format="%(objectname) %(refname)" --exclude="refs/pull"'
> >     Benchmark 1: git for-each-ref --format="%(objectname) %(refname)" | grep -vE "^[0-9a-f]{40} refs/pull/"
> >       Time (mean ± σ):     802.7 ms ±   2.1 ms    [User: 691.6 ms, System: 147.0 ms]
> >       Range (min … max):   800.0 ms … 807.7 ms    10 runs
> >
> >     Benchmark 2: git.compile for-each-ref --format="%(objectname) %(refname)" --exclude="refs/pull"
> >       Time (mean ± σ):       4.7 ms ±   0.3 ms    [User: 0.7 ms, System: 4.0 ms]
> >       Range (min … max):     4.3 ms …   6.7 ms    422 runs
> >
> >     Summary
> >       'git.compile for-each-ref --format="%(objectname) %(refname)" --exclude="refs/pull"' ran
> >       172.03 ± 9.60 times faster than 'git for-each-ref --format="%(objectname) %(refname)" | grep -vE "^[0-9a-f]{40} refs/pull/"'
>
> This measurement is cheating a little, I think, because the earlier
> patch to implement --exclude sped that up from ~800ms to ~100ms (because
> we avoid writing and all of the ref-filter malloc slowness for the
> excluded entries). So the better comparison is between two invocations
> with "--exclude", but before/after this patch. You should still see a
> 20x speedup (100ms down to 5).

I agree. I included a build from the previous commit in this benchmark. As expected, it's around ~100ms, but at least it gives readers a clearer picture of how performance changes as a result of this patch. (

Show 37 quoted lines
> > @@ -802,14 +826,34 @@ struct packed_ref_iterator {
> >   */
> >  static int next_record(struct packed_ref_iterator *iter)
> >  {
> > -	const char *p = iter->pos, *eol;
> > +	const char *p, *eol;
> >
> >  	strbuf_reset(&iter->refname_buf);
> >
> > +	/*
> > +	 * If iter->pos is contained within a skipped region, jump past
> > +	 * it.
> > +	 *
> > +	 * Note that each skipped region is considered at most once,
> > +	 * since they are ordered based on their starting position.
> > +	 */
> > +	while (iter->jump_cur < iter->jump_nr) {
> > +		struct jump_list_entry *curr = &iter->jump[iter->jump_cur];
> > +		if (iter->pos < curr->start)
> > +			break; /* not to the next jump yet */
> > +
> > +		iter->jump_cur++;
> > +		if (iter->pos < curr->end) {
> > +			iter->pos = curr->end;
> > +			break;
> > +		}
> > +	}
>
> It took me a minute to convince myself that this second "break" was
> right. If we get to it, we know that iter->pos (the current record we
> are looking at) is in the current jump region. So it makes sense to
> advance to curr->end. But might we hit another jump region immediately?
>
> I guess not, because earlier we would have coalesced the jump regions.
> So either there is a non-excluded entry there _or_ we would have
> coalesced the later region into a single larger region. So breaking is
> the right thing to do.

Exactly. I added a short comment to this effect to hopefully avoid any confusion here.

Show 17 quoted lines
> > +	for (pattern = excluded_patterns; *pattern; pattern++) {
> > +		struct jump_list_entry *e;
> > +
> > +		/*
> > +		 * We can't feed any excludes with globs in them to the
> > +		 * refs machinery.  It only understands prefix matching.
> > +		 * We likewise can't even feed the string leading up to
> > +		 * the first meta-character, as something like "foo[a]"
> > +		 * should not exclude "foobar" (but the prefix "foo"
> > +		 * would match that and mark it for exclusion).
> > +		 */
> > +		if (has_glob_special(*pattern))
> > +			continue;
>
> OK, and here's where we could split "foo[ac]" into "fooa" and "foob" if
> we wanted. But I think it is a very good idea to leave that out of this
> initial patch. :)
Oh, definitely ;-).
Show 29 quoted lines
> > +	/*
> > +	 * As an optimization, merge adjacent entries in the jump list
> > +	 * to jump forwards as far as possible when entering a skipped
> > +	 * region.
> > +	 *
> > +	 * For example, if we have two skipped regions:
> > +	 *
> > +	 *	[[A, B], [B, C]]
> > +	 *
> > +	 * we want to combine that into a single entry jumping from A to
> > +	 * C.
> > +	 */
> > +	last_disjoint = iter->jump;
> > +
> > +	for (i = 1, j = 1; i < iter->jump_nr; i++) {
> > +		struct jump_list_entry *ours = &iter->jump[i];
> > +
> > +		if (ours->start == ours->end) {
> > +			/* ignore empty regions (no matching entries) */
> > +			continue;
>
> Dropping empty regions makes sense, but our iteration starts at "1"
> (because the rest of the checks are inherently looking at last_disjoint
> before deciding if each region is worth keeping). So we'd fail to throw
> away iter->jump[0] if it is empty, I think.
>
> That could be fixed here by iterating from 0 and checking for a NULL
> last_disjoint, but maybe it would be easier to avoid allocating at all
> in the earlier loop, when we find that start == end?

Yeah, I agree with this. I think Patrick made a similar suggestion in an earlier response, and I decided not to take it since it makes the patch more verbose.

But I think that avoiding the empty region special case is worth it. Thanks, both :-).

Thanks, Taylor

Previous: Jeff KingNext: Taylor Blau
Message 114 of 149 in “refs: implement skip lists for packed backend”
  1. 00/15 refs: implement skip lists for packed backendTaylor Blau, May 8, 2023
  2. 01/15 refs.c: rename `ref_filter`Taylor Blau, May 8, 2023
  3. 03/15 ref-filter: clear reachable list pointers after freeingTaylor Blau, May 8, 2023
  4. 02/15 ref-filter.h: provide `REF_FILTER_INIT`Taylor Blau, May 8, 2023
  5. 04/15 ref-filter: add ref_filter_clear()Taylor Blau, May 8, 2023
  6. Junio C HamanoMay 8, 2023
  7. Taylor BlauMay 8, 2023
  8. Patrick SteinhardtMay 9, 2023
  9. Taylor BlauMay 9, 2023
  10. 05/15 ref-filter.c: parameterize match functions over patternsTaylor Blau, May 8, 2023
  11. Junio C HamanoMay 8, 2023
  12. Taylor BlauMay 9, 2023
  13. 06/15 builtin/for-each-ref.c: add `--exclude` optionTaylor Blau, May 8, 2023
  14. Junio C HamanoMay 8, 2023
  15. Taylor BlauMay 9, 2023
  16. 07/15 refs: plumb `exclude_patterns` argument throughoutTaylor Blau, May 8, 2023
  17. Patrick SteinhardtMay 9, 2023
  18. Taylor BlauMay 9, 2023
  19. 08/15 refs/packed-backend.c: refactor `find_reference_location()`Taylor Blau, May 8, 2023
  20. Junio C HamanoMay 8, 2023
  21. Taylor BlauMay 9, 2023
  22. 09/15 refs/packed-backend.c: implement skip lists to avoid excluded pattern(s)Taylor Blau, May 8, 2023
  23. Chris TorekMay 9, 2023
  24. Taylor BlauMay 9, 2023
  25. Patrick SteinhardtMay 9, 2023
  26. Taylor BlauMay 9, 2023
  27. Taylor BlauMay 9, 2023
  28. Patrick SteinhardtMay 10, 2023
  29. Junio C HamanoMay 9, 2023
  30. Taylor BlauMay 10, 2023
  31. 10/15 refs/packed-backend.c: add trace2 counters for skip listTaylor Blau, May 8, 2023
  32. 12/15 refs/packed-backend.c: ignore complicated hidden refs rulesTaylor Blau, May 8, 2023
  33. 11/15 revision.h: store hidden refs in a `strvec`Taylor Blau, May 8, 2023
  34. 13/15 refs.h: let `for_each_namespaced_ref()` take excluded patternsTaylor Blau, May 8, 2023
  35. 14/15 upload-pack.c: avoid enumerating hidden refs where possibleTaylor Blau, May 8, 2023
  36. Patrick SteinhardtMay 9, 2023
  37. Taylor BlauMay 9, 2023
  38. 15/15 builtin/receive-pack.c: avoid enumerating hidden referencesTaylor Blau, May 8, 2023
  39. 00/16 refs: implement jump lists for packed backendTaylor Blau, May 15, 2023
  40. 01/16 refs.c: rename `ref_filter`Taylor Blau, May 15, 2023
  41. 02/16 ref-filter.h: provide `REF_FILTER_INIT`Taylor Blau, May 15, 2023
  42. 03/16 ref-filter: clear reachable list pointers after freeingTaylor Blau, May 15, 2023
  43. 04/16 ref-filter: add `ref_filter_clear()`Taylor Blau, May 15, 2023
  44. 05/16 ref-filter.c: parameterize match functions over patternsTaylor Blau, May 15, 2023
  45. 06/16 builtin/for-each-ref.c: add `--exclude` optionTaylor Blau, May 15, 2023
  46. 07/16 refs: plumb `exclude_patterns` argument throughoutTaylor Blau, May 15, 2023
  47. 08/16 refs/packed-backend.c: refactor `find_reference_location()`Taylor Blau, May 15, 2023
  48. 09/16 refs/packed-backend.c: implement jump lists to avoid excluded pattern(s)Taylor Blau, May 15, 2023
  49. Patrick SteinhardtJun 6, 2023
  50. Taylor BlauJun 20, 2023
  51. 10/16 refs/packed-backend.c: add trace2 counters for jump listTaylor Blau, May 15, 2023
  52. 11/16 revision.h: store hidden refs in a `strvec`Taylor Blau, May 15, 2023
  53. Patrick SteinhardtJun 6, 2023
  54. Taylor BlauJun 20, 2023
  55. 12/16 refs/packed-backend.c: ignore complicated hidden refs rulesTaylor Blau, May 15, 2023
  56. 13/16 refs.h: let `for_each_namespaced_ref()` take excluded patternsTaylor Blau, May 15, 2023
  57. Patrick SteinhardtJun 6, 2023
  58. Taylor BlauJun 20, 2023
  59. 14/16 builtin/receive-pack.c: avoid enumerating hidden referencesTaylor Blau, May 15, 2023
  60. 15/16 upload-pack.c: avoid enumerating hidden refs where possibleTaylor Blau, May 15, 2023
  61. 16/16 ls-refs.c: avoid enumerating hidden refs where possibleTaylor Blau, May 15, 2023
  62. Patrick SteinhardtJun 6, 2023
  63. Taylor BlauJun 20, 2023
  64. 00/16 refs: implement jump lists for packed backendTaylor Blau, Jun 7, 2023
  65. 01/16 refs.c: rename `ref_filter`Taylor Blau, Jun 7, 2023
  66. Junio C HamanoJun 13, 2023
  67. 02/16 ref-filter.h: provide `REF_FILTER_INIT`Taylor Blau, Jun 7, 2023
  68. 03/16 ref-filter: clear reachable list pointers after freeingTaylor Blau, Jun 7, 2023
  69. 04/16 ref-filter: add `ref_filter_clear()`Taylor Blau, Jun 7, 2023
  70. 05/16 ref-filter.c: parameterize match functions over patternsTaylor Blau, Jun 7, 2023
  71. Junio C HamanoJun 13, 2023
  72. 06/16 builtin/for-each-ref.c: add `--exclude` optionTaylor Blau, Jun 7, 2023
  73. 07/16 refs: plumb `exclude_patterns` argument throughoutTaylor Blau, Jun 7, 2023
  74. Junio C HamanoJun 13, 2023
  75. Taylor BlauJun 20, 2023
  76. 08/16 refs/packed-backend.c: refactor `find_reference_location()`Taylor Blau, Jun 7, 2023
  77. 09/16 refs/packed-backend.c: implement jump lists to avoid excluded pattern(s)Taylor Blau, Jun 7, 2023
  78. Junio C HamanoJun 14, 2023
  79. Taylor BlauJun 20, 2023
  80. Junio C HamanoJun 20, 2023
  81. 10/16 refs/packed-backend.c: add trace2 counters for jump listTaylor Blau, Jun 7, 2023
  82. Junio C HamanoJun 14, 2023
  83. Taylor BlauJun 20, 2023
  84. 11/16 revision.h: store hidden refs in a `strvec`Taylor Blau, Jun 7, 2023
  85. 12/16 refs/packed-backend.c: ignore complicated hidden refs rulesTaylor Blau, Jun 7, 2023
  86. Junio C HamanoJun 14, 2023
  87. 13/16 refs.h: let `for_each_namespaced_ref()` take excluded patternsTaylor Blau, Jun 7, 2023
  88. 14/16 builtin/receive-pack.c: avoid enumerating hidden referencesTaylor Blau, Jun 7, 2023
  89. 15/16 upload-pack.c: avoid enumerating hidden refs where possibleTaylor Blau, Jun 7, 2023
  90. 16/16 ls-refs.c: avoid enumerating hidden refs where possibleTaylor Blau, Jun 7, 2023
  91. Junio C HamanoJun 12, 2023
  92. 00/16 refs: implement jump lists for packed backendTaylor Blau, Jun 20, 2023
  93. 01/16 refs.c: rename `ref_filter`Taylor Blau, Jun 20, 2023
  94. Jeff KingJul 3, 2023
  95. 02/16 ref-filter.h: provide `REF_FILTER_INIT`Taylor Blau, Jun 20, 2023
  96. Jeff KingJul 3, 2023
  97. Taylor BlauJul 3, 2023
  98. 03/16 ref-filter: clear reachable list pointers after freeingTaylor Blau, Jun 20, 2023
  99. Jeff KingJul 3, 2023
  100. 04/16 ref-filter: add `ref_filter_clear()`Taylor Blau, Jun 20, 2023
  101. Jeff KingJul 3, 2023
  102. Taylor BlauJul 3, 2023
  103. Jeff KingJul 3, 2023
  104. 05/16 ref-filter.c: parameterize match functions over patternsTaylor Blau, Jun 20, 2023
  105. Jeff KingJul 3, 2023
  106. Taylor BlauJul 3, 2023
  107. Taylor BlauJul 3, 2023
  108. Jeff KingJul 3, 2023
  109. 06/16 builtin/for-each-ref.c: add `--exclude` optionTaylor Blau, Jun 20, 2023
  110. 07/16 refs: plumb `exclude_patterns` argument throughoutTaylor Blau, Jun 20, 2023
  111. 08/16 refs/packed-backend.c: refactor `find_reference_location()`Taylor Blau, Jun 20, 2023
  112. 09/16 refs/packed-backend.c: implement jump lists to avoid excluded pattern(s)Taylor Blau, Jun 20, 2023
  113. Jeff KingJul 3, 2023
  114. Taylor BlauJul 3, 2023
  115. 10/16 refs/packed-backend.c: add trace2 counters for jump listTaylor Blau, Jun 20, 2023
  116. 11/16 revision.h: store hidden refs in a `strvec`Taylor Blau, Jun 20, 2023
  117. Jeff KingJul 3, 2023
  118. 12/16 refs/packed-backend.c: ignore complicated hidden refs rulesTaylor Blau, Jun 20, 2023
  119. Jeff KingJul 3, 2023
  120. Taylor BlauJul 4, 2023
  121. 13/16 refs.h: let `for_each_namespaced_ref()` take excluded patternsTaylor Blau, Jun 20, 2023
  122. 14/16 builtin/receive-pack.c: avoid enumerating hidden referencesTaylor Blau, Jun 20, 2023
  123. 15/16 upload-pack.c: avoid enumerating hidden refs where possibleTaylor Blau, Jun 20, 2023
  124. Jeff KingJul 3, 2023
  125. Taylor BlauJul 4, 2023
  126. 16/16 ls-refs.c: avoid enumerating hidden refs where possibleTaylor Blau, Jun 20, 2023
  127. Jeff KingJul 3, 2023
  128. Jeff KingJul 3, 2023
  129. 00/16 refs: implement jump lists for packed backendTaylor Blau, Jul 10, 2023
  130. 01/16 refs.c: rename `ref_filter`Taylor Blau, Jul 10, 2023
  131. 02/16 ref-filter.h: provide `REF_FILTER_INIT`Taylor Blau, Jul 10, 2023
  132. 03/16 ref-filter: clear reachable list pointers after freeingTaylor Blau, Jul 10, 2023
  133. 04/16 ref-filter: add `ref_filter_clear()`Taylor Blau, Jul 10, 2023
  134. 05/16 ref-filter.c: parameterize match functions over patternsTaylor Blau, Jul 10, 2023
  135. 06/16 builtin/for-each-ref.c: add `--exclude` optionTaylor Blau, Jul 10, 2023
  136. 07/16 refs: plumb `exclude_patterns` argument throughoutTaylor Blau, Jul 10, 2023
  137. 08/16 refs/packed-backend.c: refactor `find_reference_location()`Taylor Blau, Jul 10, 2023
  138. 09/16 refs/packed-backend.c: implement jump lists to avoid excluded pattern(s)Taylor Blau, Jul 10, 2023
  139. 10/16 refs/packed-backend.c: add trace2 counters for jump listTaylor Blau, Jul 10, 2023
  140. 11/16 revision.h: store hidden refs in a `strvec`Taylor Blau, Jul 10, 2023
  141. 12/16 refs.h: let `for_each_namespaced_ref()` take excluded patternsTaylor Blau, Jul 10, 2023
  142. 14/16 builtin/receive-pack.c: avoid enumerating hidden referencesTaylor Blau, Jul 10, 2023
  143. 13/16 refs.h: implement `hidden_refs_to_excludes()`Taylor Blau, Jul 10, 2023
  144. 15/16 upload-pack.c: avoid enumerating hidden refs where possibleTaylor Blau, Jul 10, 2023
  145. 16/16 ls-refs.c: avoid enumerating hidden refs where possibleTaylor Blau, Jul 10, 2023
  146. Junio C HamanoJul 10, 2023
  147. Patrick SteinhardtJul 11, 2023
  148. Junio C HamanoJul 11, 2023
  149. Taylor BlauJul 11, 2023

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.