reftable/stack: use geometric table compaction

To reduce the number of on-disk reftables, compaction is performed.
Contiguous tables with the same binary log value of size are grouped
into segments. The segment that has both the lowest binary log value and
contains more than one table is set as the starting point when
identifying the compaction segment.

Since segments containing a single table are not initially considered
for compaction, if the table appended to the list does not match the
previous table log value, no compaction occurs for the new table. It is
therefore possible for unbounded growth of the table list. This can be
demonstrated by repeating the following sequence:

git branch -f foo
git branch -d foo

Each operation results in a new table being written with no compaction
occurring until a separate operation produces a table matching the
previous table log value.

Instead, to avoid unbounded growth of the table list, the compaction
strategy is updated to ensure tables follow a geometric sequence after
each operation by individually evaluating each table in reverse index
order. This strategy results in a much simpler and more robust algorithm
compared to the previous one while also maintaining a minimal ordered
set of tables on-disk.

When creating 10 thousand references, the new strategy has no
performance impact:

Benchmark 1: update-ref: create refs sequentially (revision = HEAD~)
  Time (mean ± σ):     26.516 s ±  0.047 s    [User: 17.864 s, System: 8.491 s]
  Range (min … max):   26.447 s … 26.569 s    10 runs

Benchmark 2: update-ref: create refs sequentially (revision = HEAD)
  Time (mean ± σ):     26.417 s ±  0.028 s    [User: 17.738 s, System: 8.500 s]
  Range (min … max):   26.366 s … 26.444 s    10 runs

Summary
  update-ref: create refs sequentially (revision = HEAD) ran
    1.00 ± 0.00 times faster than update-ref: create refs sequentially (revision = HEAD~)

Some tests in `t0610-reftable-basics.sh` assert the on-disk state of
tables and are therefore updated to specify the correct new table count.
Since compaction is more aggressive in ensuring tables maintain a
geometric sequence, the expected table count is reduced in these tests.
In `reftable/stack_test.c` tests related to `sizes_to_segments()` are
removed because the function is no longer needed. Also, the
`test_suggest_compaction_segment()` test is updated to better showcase
and reflect the new geometric compaction behavior.

Signed-off-by: Justin Tobler <jltobler@gmail.com>
Acked-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 files changed
tree: ce902fd70128c76ad2387baefb108c7f1bc36433
  1. .github/
  2. block-sha1/
  3. builtin/
  4. ci/
  5. compat/
  6. contrib/
  7. Documentation/
  8. ewah/
  9. git-gui/
  10. gitk-git/
  11. gitweb/
  12. mergetools/
  13. negotiator/
  14. oss-fuzz/
  15. perl/
  16. po/
  17. refs/
  18. reftable/
  19. sha1/
  20. sha1dc/
  21. sha256/
  22. t/
  23. templates/
  24. trace2/
  25. xdiff/
  26. .cirrus.yml
  27. .clang-format
  28. .editorconfig
  29. .gitattributes
  30. .gitignore
  31. .gitlab-ci.yml
  32. .gitmodules
  33. .mailmap
  34. .tsan-suppressions
  35. abspath.c
  36. abspath.h
  37. aclocal.m4
  38. add-interactive.c
  39. add-interactive.h
  40. add-patch.c
  41. advice.c
  42. advice.h
  43. alias.c
  44. alias.h
  45. alloc.c
  46. alloc.h
  47. apply.c
  48. apply.h
  49. archive-tar.c
  50. archive-zip.c
  51. archive.c
  52. archive.h
  53. attr.c
  54. attr.h
  55. banned.h
  56. base85.c
  57. base85.h
  58. bisect.c
  59. bisect.h
  60. blame.c
  61. blame.h
  62. blob.c
  63. blob.h
  64. bloom.c
  65. bloom.h
  66. branch.c
  67. branch.h
  68. builtin.h
  69. bulk-checkin.c
  70. bulk-checkin.h
  71. bundle-uri.c
  72. bundle-uri.h
  73. bundle.c
  74. bundle.h
  75. cache-tree.c
  76. cache-tree.h
  77. cbtree.c
  78. cbtree.h
  79. chdir-notify.c
  80. chdir-notify.h
  81. check-builtins.sh
  82. checkout.c
  83. checkout.h
  84. chunk-format.c
  85. chunk-format.h
  86. CODE_OF_CONDUCT.md
  87. color.c
  88. color.h
  89. column.c
  90. column.h
  91. combine-diff.c
  92. command-list.txt
  93. commit-graph.c
  94. commit-graph.h
  95. commit-reach.c
  96. commit-reach.h
  97. commit-slab-decl.h
  98. commit-slab-impl.h
  99. commit-slab.h
  100. commit.c
  101. commit.h
  102. common-main.c
  103. config.c
  104. config.h
  105. config.mak.dev
  106. config.mak.in
  107. config.mak.uname
  108. configure.ac
  109. connect.c
  110. connect.h
  111. connected.c
  112. connected.h
  113. convert.c
  114. convert.h
  115. copy.c
  116. copy.h
  117. COPYING
  118. credential.c
  119. credential.h
  120. csum-file.c
  121. csum-file.h
  122. ctype.c
  123. daemon.c
  124. date.c
  125. date.h
  126. decorate.c
  127. decorate.h
  128. delta-islands.c
  129. delta-islands.h
  130. delta.h
  131. detect-compiler
  132. diagnose.c
  133. diagnose.h
  134. diff-delta.c
  135. diff-lib.c
  136. diff-merges.c
  137. diff-merges.h
  138. diff-no-index.c
  139. diff.c
  140. diff.h
  141. diffcore-break.c
  142. diffcore-delta.c
  143. diffcore-order.c
  144. diffcore-pickaxe.c
  145. diffcore-rename.c
  146. diffcore-rotate.c
  147. diffcore.h
  148. dir-iterator.c
  149. dir-iterator.h
  150. dir.c
  151. dir.h
  152. editor.c
  153. editor.h
  154. entry.c
  155. entry.h
  156. environment.c
  157. environment.h
  158. exec-cmd.c
  159. exec-cmd.h
  160. fetch-negotiator.c
  161. fetch-negotiator.h
  162. fetch-pack.c
  163. fetch-pack.h
  164. fmt-merge-msg.c
  165. fmt-merge-msg.h
  166. fsck.c
  167. fsck.h
  168. fsmonitor--daemon.h
  169. fsmonitor-ipc.c
  170. fsmonitor-ipc.h
  171. fsmonitor-ll.h
  172. fsmonitor-path-utils.h
  173. fsmonitor-settings.c
  174. fsmonitor-settings.h
  175. fsmonitor.c
  176. fsmonitor.h
  177. generate-cmdlist.sh
  178. generate-configlist.sh
  179. generate-hooklist.sh
  180. gettext.c
  181. gettext.h
  182. git-archimport.perl
  183. git-compat-util.h
  184. git-curl-compat.h
  185. git-cvsexportcommit.perl
  186. git-cvsimport.perl
  187. git-cvsserver.perl
  188. git-difftool--helper.sh
  189. git-filter-branch.sh
  190. git-instaweb.sh
  191. git-merge-octopus.sh
  192. git-merge-one-file.sh
  193. git-merge-resolve.sh
  194. git-mergetool--lib.sh
  195. git-mergetool.sh
  196. git-p4.py
  197. git-quiltimport.sh
  198. git-request-pull.sh
  199. git-send-email.perl
  200. git-sh-i18n.sh
  201. git-sh-setup.sh
  202. git-submodule.sh
  203. git-svn.perl
  204. GIT-VERSION-GEN
  205. git-web--browse.sh
  206. git-zlib.c
  207. git-zlib.h
  208. git.c
  209. git.rc
  210. gpg-interface.c
  211. gpg-interface.h
  212. graph.c
  213. graph.h
  214. grep.c
  215. grep.h
  216. hash-ll.h
  217. hash-lookup.c
  218. hash-lookup.h
  219. hash.h
  220. hashmap.c
  221. hashmap.h
  222. help.c
  223. help.h
  224. hex-ll.c
  225. hex-ll.h
  226. hex.c
  227. hex.h
  228. hook.c
  229. hook.h
  230. http-backend.c
  231. http-fetch.c
  232. http-push.c
  233. http-walker.c
  234. http.c
  235. http.h
  236. ident.c
  237. ident.h
  238. imap-send.c
  239. INSTALL
  240. iterator.h
  241. json-writer.c
  242. json-writer.h
  243. khash.h
  244. kwset.c
  245. kwset.h
  246. levenshtein.c
  247. levenshtein.h
  248. LGPL-2.1
  249. line-log.c
  250. line-log.h
  251. line-range.c
  252. line-range.h
  253. linear-assignment.c
  254. linear-assignment.h
  255. list-objects-filter-options.c
  256. list-objects-filter-options.h
  257. list-objects-filter.c
  258. list-objects-filter.h
  259. list-objects.c
  260. list-objects.h
  261. list.h
  262. lockfile.c
  263. lockfile.h
  264. log-tree.c
  265. log-tree.h
  266. loose.c
  267. loose.h
  268. ls-refs.c
  269. ls-refs.h
  270. mailinfo.c
  271. mailinfo.h
  272. mailmap.c
  273. mailmap.h
  274. Makefile
  275. match-trees.c
  276. match-trees.h
  277. mem-pool.c
  278. mem-pool.h
  279. merge-blobs.c
  280. merge-blobs.h
  281. merge-ll.c
  282. merge-ll.h
  283. merge-ort-wrappers.c
  284. merge-ort-wrappers.h
  285. merge-ort.c
  286. merge-ort.h
  287. merge-recursive.c
  288. merge-recursive.h
  289. merge.c
  290. merge.h
  291. mergesort.h
  292. midx.c
  293. midx.h
  294. name-hash.c
  295. name-hash.h
  296. notes-cache.c
  297. notes-cache.h
  298. notes-merge.c
  299. notes-merge.h
  300. notes-utils.c
  301. notes-utils.h
  302. notes.c
  303. notes.h
  304. object-file-convert.c
  305. object-file-convert.h
  306. object-file.c
  307. object-file.h
  308. object-name.c
  309. object-name.h
  310. object-store-ll.h
  311. object-store.h
  312. object.c
  313. object.h
  314. oid-array.c
  315. oid-array.h
  316. oidmap.c
  317. oidmap.h
  318. oidset.c
  319. oidset.h
  320. oidtree.c
  321. oidtree.h
  322. pack-bitmap-write.c
  323. pack-bitmap.c
  324. pack-bitmap.h
  325. pack-check.c
  326. pack-mtimes.c
  327. pack-mtimes.h
  328. pack-objects.c
  329. pack-objects.h
  330. pack-revindex.c
  331. pack-revindex.h
  332. pack-write.c
  333. pack.h
  334. packfile.c
  335. packfile.h
  336. pager.c
  337. pager.h
  338. parallel-checkout.c
  339. parallel-checkout.h
  340. parse-options-cb.c
  341. parse-options.c
  342. parse-options.h
  343. parse.c
  344. parse.h
  345. patch-delta.c
  346. patch-ids.c
  347. patch-ids.h
  348. path.c
  349. path.h
  350. pathspec.c
  351. pathspec.h
  352. pkt-line.c
  353. pkt-line.h
  354. preload-index.c
  355. preload-index.h
  356. pretty.c
  357. pretty.h
  358. prio-queue.c
  359. prio-queue.h
  360. progress.c
  361. progress.h
  362. promisor-remote.c
  363. promisor-remote.h
  364. prompt.c
  365. prompt.h
  366. protocol-caps.c
  367. protocol-caps.h
  368. protocol.c
  369. protocol.h
  370. prune-packed.c
  371. prune-packed.h
  372. quote.c
  373. quote.h
  374. range-diff.c
  375. range-diff.h
  376. reachable.c
  377. reachable.h
  378. read-cache-ll.h
  379. read-cache.c
  380. read-cache.h
  381. README.md
  382. rebase-interactive.c
  383. rebase-interactive.h
  384. rebase.c
  385. rebase.h
  386. ref-filter.c
  387. ref-filter.h
  388. reflog-walk.c
  389. reflog-walk.h
  390. reflog.c
  391. reflog.h
  392. refs.c
  393. refs.h
  394. refspec.c
  395. refspec.h
  396. remote-curl.c
  397. remote.c
  398. remote.h
  399. replace-object.c
  400. replace-object.h
  401. repo-settings.c
  402. repository.c
  403. repository.h
  404. rerere.c
  405. rerere.h
  406. reset.c
  407. reset.h
  408. resolve-undo.c
  409. resolve-undo.h
  410. revision.c
  411. revision.h
  412. run-command.c
  413. run-command.h
  414. sane-ctype.h
  415. scalar.c
  416. SECURITY.md
  417. send-pack.c
  418. send-pack.h
  419. sequencer.c
  420. sequencer.h
  421. serve.c
  422. serve.h
  423. server-info.c
  424. server-info.h
  425. setup.c
  426. setup.h
  427. sh-i18n--envsubst.c
  428. sha1dc_git.c
  429. sha1dc_git.h
  430. shallow.c
  431. shallow.h
  432. shared.mak
  433. shell.c
  434. shortlog.h
  435. sideband.c
  436. sideband.h
  437. sigchain.c
  438. sigchain.h
  439. simple-ipc.h
  440. sparse-index.c
  441. sparse-index.h
  442. split-index.c
  443. split-index.h
  444. stable-qsort.c
  445. statinfo.c
  446. statinfo.h
  447. strbuf.c
  448. strbuf.h
  449. streaming.c
  450. streaming.h
  451. string-list.c
  452. string-list.h
  453. strmap.c
  454. strmap.h
  455. strvec.c
  456. strvec.h
  457. sub-process.c
  458. sub-process.h
  459. submodule-config.c
  460. submodule-config.h
  461. submodule.c
  462. submodule.h
  463. symlinks.c
  464. symlinks.h
  465. tag.c
  466. tag.h
  467. tar.h
  468. tempfile.c
  469. tempfile.h
  470. thread-utils.c
  471. thread-utils.h
  472. tmp-objdir.c
  473. tmp-objdir.h
  474. trace.c
  475. trace.h
  476. trace2.c
  477. trace2.h
  478. trailer.c
  479. trailer.h
  480. transport-helper.c
  481. transport-internal.h
  482. transport.c
  483. transport.h
  484. tree-diff.c
  485. tree-walk.c
  486. tree-walk.h
  487. tree.c
  488. tree.h
  489. unicode-width.h
  490. unimplemented.sh
  491. unix-socket.c
  492. unix-socket.h
  493. unix-stream-server.c
  494. unix-stream-server.h
  495. unpack-trees.c
  496. unpack-trees.h
  497. upload-pack.c
  498. upload-pack.h
  499. url.c
  500. url.h
  501. urlmatch.c
  502. urlmatch.h
  503. usage.c
  504. userdiff.c
  505. userdiff.h
  506. utf8.c
  507. utf8.h
  508. varint.c
  509. varint.h
  510. version.c
  511. version.h
  512. versioncmp.c
  513. versioncmp.h
  514. walker.c
  515. walker.h
  516. wildmatch.c
  517. wildmatch.h
  518. worktree.c
  519. worktree.h
  520. wrap-for-bin.sh
  521. wrapper.c
  522. wrapper.h
  523. write-or-die.c
  524. write-or-die.h
  525. ws.c
  526. ws.h
  527. wt-status.c
  528. wt-status.h
  529. xdiff-interface.c
  530. xdiff-interface.h
README.md

Build status

Git - fast, scalable, distributed revision control system

Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals.

Git is an Open Source project covered by the GNU General Public License version 2 (some parts of it are under different licenses, compatible with the GPLv2). It was originally written by Linus Torvalds with help of a group of hackers around the net.

Please read the file INSTALL for installation instructions.

Many Git online resources are accessible from https://git-scm.com/ including full documentation and Git related tools.

See Documentation/gittutorial.txt to get started, then see Documentation/giteveryday.txt for a useful minimum set of commands, and Documentation/git-<commandname>.txt for documentation of each command. If git has been correctly installed, then the tutorial can also be read with man gittutorial or git help tutorial, and the documentation of each command with man git-<commandname> or git help <commandname>.

CVS users may also want to read Documentation/gitcvs-migration.txt (man gitcvs-migration or git help cvs-migration if git is installed).

The user discussion and development of Git take place on the Git mailing list -- everyone is welcome to post bug reports, feature requests, comments and patches to git@vger.kernel.org (read Documentation/SubmittingPatches for instructions on patch submission and Documentation/CodingGuidelines).

Those wishing to help with error message, usage and informational message string translations (localization l10) should see po/README.md (a po file is a Portable Object file that holds the translations).

To subscribe to the list, send an email to git+subscribe@vger.kernel.org (see https://subspace.kernel.org/subscribing.html for details). The mailing list archives are available at https://lore.kernel.org/git/, https://marc.info/?l=git and other archival sites.

Issues which are security relevant should be disclosed privately to the Git Security mailing list git-security@googlegroups.com.

The maintainer frequently sends the “What's cooking” reports that list the current status of various development topics to the mailing list. The discussion following them give a good reference for project status, development direction and remaining tasks.

The name “git” was given by Linus Torvalds when he wrote the very first version. He described the tool as “the stupid content tracker” and the name as (depending on your mood):

  • random three-letter combination that is pronounceable, and not actually used by any common UNIX command. The fact that it is a mispronunciation of “get” may or may not be relevant.
  • stupid. contemptible and despicable. simple. Take your pick from the dictionary of slang.
  • “global information tracker”: you're in a good mood, and it actually works for you. Angels sing, and a light suddenly fills the room.
  • “goddamn idiotic truckload of sh*t”: when it breaks