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

[PATCH v4 0/4] Improve abbreviation disambiguation

From
Derrick Stolee <dstolee@microsoft.com>
Date
Oct 8, 2017, 18:49 UTC
Message-ID
<20171008184942.69444-1-dstolee@microsoft.com>
Changes since previous version:
* Fixed an overflow error in the binary search. I sent a separate patch
  to fix this error in existing searches; that patch should be applied
  before this one.
* Removed test-list-objects and test-abbrev in favor of a new git log
  test in p4211-line-log.sh. Limited perf numbers for Linux repo are
  given in cover letter and commit 4/4.
* Silently skip packfiles that fail to open with open_pack_index()
Thanks for all the comments from Jeff, Junio, Ramsey, and Stefan!
Thanks,
 Stolee
---

When displaying object ids, we frequently want to see an abbreviation for easier typing. That abbreviation must be unambiguous among all object ids.

The current implementation of find_unique_abbrev() performs a loop checking if each abbreviation length is unambiguous until finding one that works. This causes multiple round-trips to the disk when starting with the default abbreviation length (usually 7) but needing up to 12 characters for an unambiguous short-sha. For very large repos, this effect is pronounced and causes issues with several commands, from obvious consumers `status` and `log` to less obvious commands such as `fetch` and `push`.

This patch improves performance by iterating over objects matching the short abbreviation only once, inspecting each object id, and reporting the minimum length of an unambiguous abbreviation.

Add a new perf test for testing the performance of log while computing OID abbreviations. Using --oneline --raw and --parents options maximizes the number of OIDs to abbreviate while still spending some time computing diffs. Below we report performance statistics for perf test 4211.6 from p4211-line-log.sh using three copies of the Linux repo:

| Packs | Loose  | Base Time | New Time | Rel%  |
|-------|--------|-----------|----------|-------|
|  1    |      0 |   41.27 s |  38.93 s | -4.8% |
| 24    |      0 |   98.04 s |  91.35 s | -5.7% |
| 23    | 323952 |  117.78 s | 112.18 s | -4.8% |
Derrick Stolee (4):
  p4211-line-log.sh: add log --online --raw --parents perf test
  sha1_name: Unroll len loop in find_unique_abbrev_r
  sha1_name: Parse less while finding common prefix
  sha1_name: Minimize OID comparisons during disambiguation
 sha1_name.c              | 129 +++++++++++++++++++++++++++++++++++++++++------
 t/perf/p4211-line-log.sh |   4 ++
 2 files changed, 118 insertions(+), 15 deletions(-)
-- 
2.14.1.538.g56ec8fc98.dirty
Next: Derrick Stolee
Message 1 of 22 in “Improve abbreviation disambiguation”
  1. 0/4 Improve abbreviation disambiguationDerrick Stolee, Oct 8, 2017
  2. 1/4 p4211-line-log.sh: add log --online --raw --parents perf testDerrick Stolee, Oct 8, 2017
  3. 3/4 sha1_name: parse less while finding common prefixDerrick Stolee, Oct 8, 2017
  4. Jeff KingOct 9, 2017
  5. 4/4 sha1_name: minimize OID comparisons during disambiguationDerrick Stolee, Oct 8, 2017
  6. Jeff KingOct 9, 2017
  7. Derrick StoleeOct 10, 2017
  8. Jeff KingOct 10, 2017
  9. Junio C HamanoOct 10, 2017
  10. Jeff KingOct 10, 2017
  11. Derrick StoleeOct 10, 2017
  12. Jeff KingOct 10, 2017
  13. Derrick StoleeOct 11, 2017
  14. 0/4 Improve abbreviation disambiguationDerrick Stolee, Oct 12, 2017
  15. Derrick StoleeOct 12, 2017
  16. Junio C HamanoOct 12, 2017
  17. Jeff KingOct 12, 2017
  18. 3/4 sha1_name: parse less while finding common prefixDerrick Stolee, Oct 12, 2017
  19. 2/4 sha1_name: unroll len loop in find_unique_abbrev_rDerrick Stolee, Oct 12, 2017
  20. 1/4 p4211-line-log.sh: add log --online --raw --parents perf testDerrick Stolee, Oct 12, 2017
  21. 4/4 sha1_name: minimize OID comparisons during disambiguationDerrick Stolee, Oct 12, 2017
  22. 2/4 sha1_name: unroll len loop in find_unique_abbrev_rDerrick Stolee, Oct 8, 2017

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.