From: "Justin Tobler via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Patrick Steinhardt <ps@pks.im>,
Karthik Nayak <karthik.188@gmail.com>,
Justin Tobler <jltobler@gmail.com>
Subject: [PATCH v4 0/2] reftable/stack: use geometric table compaction
Date: Wed, 03 Apr 2024 00:20:34 +0000 [thread overview]
Message-ID: <pull.1683.v4.git.1712103636.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1683.v3.git.1711685809.gitgitgadget@gmail.com>
Hello again,
This is the fourth version my patch series that refactors the reftable
compaction strategy to instead follow a geometric sequence. Changes compared
to v3:
* Changed env name from GIT_TEST_REFTABLE_NO_AUTOCOMPACTION to
GIT_TEST_REFTABLE_AUTOCOMPACTION and set the default to false. This
should hopefully be a bit more intuitive since it avoids the double
negative.
* Updated the corresponding env var test in t0610-reftable-basics.sh to
assert on the number of tables added and be overall less fragile.
* Folded lines that were too long.
* Updated some comments in stack.c to more accurately explain that table
segment end is exclusive.
* Dropped reftable/stack: make segment end inclusive commit to keep segment
end exclusive and better follow expectations.
Thanks for taking a look!
-Justin
Justin Tobler (2):
reftable/stack: add env to disable autocompaction
reftable/stack: use geometric table compaction
reftable/stack.c | 126 +++++++++++++++++++------------------
reftable/stack.h | 3 -
reftable/stack_test.c | 66 ++++---------------
reftable/system.h | 1 +
t/t0610-reftable-basics.sh | 65 +++++++++++++++----
5 files changed, 132 insertions(+), 129 deletions(-)
base-commit: c75fd8d8150afdf836b63a8e0534d9b9e3e111ba
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1683%2Fjltobler%2Fjt%2Freftable-geometric-compaction-v4
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1683/jltobler/jt/reftable-geometric-compaction-v4
Pull-Request: https://github.com/gitgitgadget/git/pull/1683
Range-diff vs v3:
1: 2fdd8ea1133 ! 1: 2a0421e5f20 reftable/stack: add env to disable autocompaction
@@ Commit message
In future tests it will be neccesary to create repositories with a set
number of tables. To make this easier, introduce the
- `GIT_TEST_REFTABLE_NO_AUTOCOMPACTION` environment variable that, when
- set, disables autocompaction of reftables.
+ `GIT_TEST_REFTABLE_AUTOCOMPACTION` environment variable that, when set
+ to false, disables autocompaction of reftables.
Signed-off-by: Justin Tobler <jltobler@gmail.com>
@@ reftable/stack.c: int reftable_addition_commit(struct reftable_addition *add)
goto done;
- if (!add->stack->disable_auto_compact)
-+ if (!add->stack->disable_auto_compact && !git_env_bool("GIT_TEST_REFTABLE_NO_AUTOCOMPACTION", 0))
++ if (!add->stack->disable_auto_compact &&
++ git_env_bool("GIT_TEST_REFTABLE_AUTOCOMPACTION", 1))
err = reftable_stack_auto_compact(add->stack);
done:
@@ t/t0610-reftable-basics.sh: test_expect_success 'ref transaction: writes cause a
test_line_count = 1 repo/.git/reftable/tables.list
'
-+test_expect_success 'ref transaction: environment variable disables auto-compaction' '
++test_expect_success 'ref transaction: env var disables compaction' '
+ test_when_finished "rm -rf repo" &&
+
+ git init repo &&
+ test_commit -C repo A &&
-+ for i in $(test_seq 20)
++
++ start=$(wc -l <repo/.git/reftable/tables.list) &&
++ iterations=5 &&
++ expected=$((start + iterations)) &&
++
++ for i in $(test_seq $iterations)
+ do
-+ GIT_TEST_REFTABLE_NO_AUTOCOMPACTION=true git -C repo update-ref branch-$i HEAD || return 1
++ GIT_TEST_REFTABLE_AUTOCOMPACTION=false \
++ git -C repo update-ref branch-$i HEAD || return 1
+ done &&
-+ test_line_count = 23 repo/.git/reftable/tables.list &&
++ test_line_count = $expected repo/.git/reftable/tables.list &&
+
+ git -C repo update-ref foo HEAD &&
-+ test_line_count = 1 repo/.git/reftable/tables.list
++ test_line_count -lt $expected repo/.git/reftable/tables.list
+'
+
check_fsync_events () {
2: 7e62c2286ae ! 2: e0f4d0dbcc1 reftable/stack: use geometric table compaction
@@ reftable/stack.c: static int segment_size(struct segment *s)
- if (fastlog2(min_seg.bytes) < fastlog2(sizes[prev]))
+ /*
+ * Find the ending table of the compaction segment needed to restore the
-+ * geometric sequence.
++ * geometric sequence. Note that the segment end is exclusive.
+ *
+ * To do so, we iterate backwards starting from the most recent table
+ * until a valid segment end is found. If the preceding table is smaller
+ * than the current table multiplied by the geometric factor (2), the
-+ * current table is set as the compaction segment end.
++ * compaction segment end has been identified.
+ *
+ * Tables after the ending point are not added to the byte count because
+ * they are already valid members of the geometric sequence. Due to the
@@ reftable/stack.c: static int segment_size(struct segment *s)
+ * Example table size sequence requiring no compaction:
+ * 64, 32, 16, 8, 4, 2, 1
+ *
-+ * Example compaction segment end set to table with size 3:
++ * Example table size sequence where compaction segment end is set to
++ * the last table. Since the segment end is exclusive, the last table is
++ * excluded during subsequent compaction and the table with size 3 is
++ * the final table included:
+ * 64, 32, 16, 8, 4, 3, 1
+ */
+ for (i = n - 1; i > 0; i--) {
@@ reftable/stack_test.c: static void test_empty_add(void)
+ int l = 0;
+ if (sz == 0)
+ return 0;
-+ for (; sz; sz /= 2) {
++ for (; sz; sz /= 2)
+ l++;
-+ }
+ return l - 1;
+}
+
@@ t/t0610-reftable-basics.sh: test_expect_success 'ref transaction: writes cause a
test_commit -C repo --no-tag B &&
test_line_count = 1 repo/.git/reftable/tables.list
-@@ t/t0610-reftable-basics.sh: test_expect_success 'ref transaction: environment variable disables auto-compact
- do
- GIT_TEST_REFTABLE_NO_AUTOCOMPACTION=true git -C repo update-ref branch-$i HEAD || return 1
- done &&
-- test_line_count = 23 repo/.git/reftable/tables.list &&
-+ test_line_count = 22 repo/.git/reftable/tables.list &&
-
- git -C repo update-ref foo HEAD &&
- test_line_count = 1 repo/.git/reftable/tables.list
+@@ t/t0610-reftable-basics.sh: test_expect_success 'ref transaction: env var disables compaction' '
+ test_line_count -lt $expected repo/.git/reftable/tables.list
'
+test_expect_success 'ref transaction: alternating table sizes are compacted' '
+ test_when_finished "rm -rf repo" &&
++
+ git init repo &&
+ test_commit -C repo A &&
-+ for i in $(test_seq 20)
++ for i in $(test_seq 5)
+ do
+ git -C repo branch -f foo &&
+ git -C repo branch -d foo || return 1
@@ t/t0610-reftable-basics.sh: test_expect_success 'worktree: pack-refs in main rep
test_when_finished "rm -rf repo worktree" &&
git init repo &&
test_commit -C repo A &&
-- git -C repo worktree add ../worktree &&
-+ GIT_TEST_REFTABLE_NO_AUTOCOMPACTION=true git -C repo worktree add ../worktree &&
-+ GIT_TEST_REFTABLE_NO_AUTOCOMPACTION=true git -C worktree update-ref refs/worktree/per-worktree HEAD &&
++
++ GIT_TEST_REFTABLE_AUTOCOMPACTION=false \
+ git -C repo worktree add ../worktree &&
++ GIT_TEST_REFTABLE_AUTOCOMPACTION=false \
++ git -C worktree update-ref refs/worktree/per-worktree HEAD &&
- test_line_count = 3 repo/.git/worktrees/worktree/reftable/tables.list &&
- test_line_count = 4 repo/.git/reftable/tables.list &&
@@ t/t0610-reftable-basics.sh: test_expect_success 'worktree: pack-refs in worktree
test_when_finished "rm -rf repo worktree" &&
git init repo &&
test_commit -C repo A &&
-- git -C repo worktree add ../worktree &&
-+ GIT_TEST_REFTABLE_NO_AUTOCOMPACTION=true git -C repo worktree add ../worktree &&
-+ GIT_TEST_REFTABLE_NO_AUTOCOMPACTION=true git -C worktree update-ref refs/worktree/per-worktree HEAD &&
++
++ GIT_TEST_REFTABLE_AUTOCOMPACTION=false \
+ git -C repo worktree add ../worktree &&
++ GIT_TEST_REFTABLE_AUTOCOMPACTION=false \
++ git -C worktree update-ref refs/worktree/per-worktree HEAD &&
- test_line_count = 3 repo/.git/worktrees/worktree/reftable/tables.list &&
- test_line_count = 4 repo/.git/reftable/tables.list &&
@@ t/t0610-reftable-basics.sh: test_expect_success 'worktree: pack-refs in worktree
'
test_expect_success 'worktree: creating shared ref updates main stack' '
- test_when_finished "rm -rf repo worktree" &&
- git init repo &&
- test_commit -C repo A &&
-+ test_commit -C repo B &&
-
- git -C repo worktree add ../worktree &&
- git -C repo pack-refs &&
@@ t/t0610-reftable-basics.sh: test_expect_success 'worktree: creating shared ref updates main stack' '
test_line_count = 1 repo/.git/worktrees/worktree/reftable/tables.list &&
test_line_count = 1 repo/.git/reftable/tables.list &&
-- git -C worktree update-ref refs/heads/shared HEAD &&
-+ GIT_TEST_REFTABLE_NO_AUTOCOMPACTION=true git -C worktree update-ref refs/heads/shared HEAD &&
++ GIT_TEST_REFTABLE_AUTOCOMPACTION=false \
+ git -C worktree update-ref refs/heads/shared HEAD &&
test_line_count = 1 repo/.git/worktrees/worktree/reftable/tables.list &&
test_line_count = 2 repo/.git/reftable/tables.list
- '
3: 9a33914c852 < -: ----------- reftable/stack: make segment end inclusive
--
gitgitgadget
next prev parent reply other threads:[~2024-04-03 0:20 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-05 20:03 [PATCH] reftable/stack: use geometric table compaction Justin Tobler via GitGitGadget
2024-03-06 12:30 ` Patrick Steinhardt
2024-03-06 12:37 ` Patrick Steinhardt
2024-03-21 22:48 ` Justin Tobler
2024-03-21 22:40 ` [PATCH v2 0/3] " Justin Tobler via GitGitGadget
2024-03-21 22:40 ` [PATCH v2 1/3] reftable/stack: add env to disable autocompaction Justin Tobler via GitGitGadget
2024-03-22 1:25 ` Patrick Steinhardt
2024-03-21 22:40 ` [PATCH v2 2/3] reftable/stack: use geometric table compaction Justin Tobler via GitGitGadget
2024-03-22 1:25 ` Patrick Steinhardt
2024-03-27 13:24 ` Karthik Nayak
2024-03-21 22:40 ` [PATCH v2 3/3] reftable/segment: make segment end inclusive Justin Tobler via GitGitGadget
2024-03-22 1:25 ` [PATCH v2 0/3] reftable/stack: use geometric table compaction Patrick Steinhardt
2024-04-03 10:13 ` Han-Wen Nienhuys
2024-04-03 10:18 ` Patrick Steinhardt
2024-04-03 15:14 ` Justin Tobler
2024-04-03 16:40 ` Junio C Hamano
2024-03-29 4:16 ` [PATCH v3 " Justin Tobler via GitGitGadget
2024-03-29 4:16 ` [PATCH v3 1/3] reftable/stack: add env to disable autocompaction Justin Tobler via GitGitGadget
2024-03-29 18:25 ` Junio C Hamano
2024-03-29 21:56 ` Junio C Hamano
2024-04-02 7:23 ` Patrick Steinhardt
2024-04-02 17:23 ` Junio C Hamano
2024-03-29 4:16 ` [PATCH v3 2/3] reftable/stack: use geometric table compaction Justin Tobler via GitGitGadget
2024-04-02 7:23 ` Patrick Steinhardt
2024-03-29 4:16 ` [PATCH v3 3/3] reftable/stack: make segment end inclusive Justin Tobler via GitGitGadget
2024-03-29 18:36 ` Junio C Hamano
2024-04-02 7:23 ` Patrick Steinhardt
2024-04-03 0:20 ` Justin Tobler via GitGitGadget [this message]
2024-04-03 0:20 ` [PATCH v4 1/2] reftable/stack: add env to disable autocompaction Justin Tobler via GitGitGadget
2024-04-03 0:20 ` [PATCH v4 2/2] reftable/stack: use geometric table compaction Justin Tobler via GitGitGadget
2024-04-03 4:47 ` [PATCH v4 0/2] " Patrick Steinhardt
2024-04-03 11:12 ` Karthik Nayak
2024-04-03 16:56 ` Junio C Hamano
2024-04-04 18:29 ` [PATCH v5 0/3] " Justin Tobler via GitGitGadget
2024-04-04 18:29 ` [PATCH v5 1/3] reftable/stack: allow disabling of auto-compaction Justin Tobler via GitGitGadget
2024-04-08 6:12 ` Patrick Steinhardt
2024-04-04 18:29 ` [PATCH v5 2/3] reftable/stack: add env to disable autocompaction Justin Tobler via GitGitGadget
2024-04-08 6:12 ` Patrick Steinhardt
2024-04-08 16:18 ` Junio C Hamano
2024-04-04 18:29 ` [PATCH v5 3/3] reftable/stack: use geometric table compaction Justin Tobler via GitGitGadget
2024-04-08 6:12 ` [PATCH v5 0/3] " Patrick Steinhardt
2024-04-08 16:17 ` Justin Tobler
2024-04-08 16:16 ` [PATCH v6 " Justin Tobler via GitGitGadget
2024-04-08 16:16 ` [PATCH v6 1/3] reftable/stack: expose option to disable auto-compaction Justin Tobler via GitGitGadget
2024-04-08 16:16 ` [PATCH v6 2/3] reftable/stack: add env to disable autocompaction Justin Tobler via GitGitGadget
2024-04-08 16:16 ` [PATCH v6 3/3] reftable/stack: use geometric table compaction Justin Tobler via GitGitGadget
2024-04-08 16:20 ` [PATCH v6 0/3] " Patrick Steinhardt
2024-04-08 19:12 ` Junio C Hamano
2024-04-03 19:12 ` [PATCH v2 " Junio C Hamano
2024-04-03 19:30 ` Patrick Steinhardt
2024-04-04 5:34 ` Patrick Steinhardt
2024-04-04 18:28 ` Justin Tobler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1683.v4.git.1712103636.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=jltobler@gmail.com \
--cc=karthik.188@gmail.com \
--cc=ps@pks.im \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).