[PATCH 9/9] reftable/writer: reset `last_key` instead of releasing it
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Apr 2, 2024, 17:30 UTC
- Message-ID
- <6950ae4ea758a92ba87f73d5ce66c5dfb896234c.1712078736.git.ps@pks.im>
- In-Reply-To
- <cover.1712078736.git.ps@pks.im>
The reftable writer tracks the last key that it has written so that it can properly compute the compressed prefix for the next record it is about to write. This last key must be reset whenever we move on to write the next block, which is done in `writer_reinit_block_writer()`. We do this by calling `strbuf_release()` though, which needlessly deallocates the underlying buffer.
Convert the code to use `strbuf_reset()` instead, which saves one allocation per block we're about to write. This requires us to also amend `reftable_writer_free()` to release the buffer's memory now as we previously seemingly relied on `writer_reinit_block_writer()` to release the memory for us. Releasing memory here is the right thing to do anyway.
While at it, convert a callsite where we truncate the buffer by setting its length to zero to instead use `strbuf_reset()`, too.
Signed-off-by: Patrick Steinhardt <ps@pks.im> --- reftable/writer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/reftable/writer.c b/reftable/writer.c index 51e663bb19..4b3a4e3f3c 100644 --- a/reftable/writer.c +++ b/reftable/writer.c @@ -109,7 +109,7 @@ static void writer_reinit_block_writer(struct reftable_writer *w, uint8_t typ) block_start = header_size(writer_version(w)); } - strbuf_release(&w->last_key); + strbuf_reset(&w->last_key); block_writer_init(&w->block_writer_data, typ, w->block, w->opts.block_size, block_start, hash_size(w->opts.hash_id)); @@ -157,6 +157,7 @@ void reftable_writer_free(struct reftable_writer *w) block_writer_release(w->block_writer); w->block_writer = NULL; } + strbuf_release(&w->last_key); reftable_free(w->block); reftable_free(w); } @@ -472,7 +473,7 @@ static int writer_finish_section(struct reftable_writer *w) bstats->max_index_level = max_level; /* Reinit lastKey, as the next section can start with any key. */ - w->last_key.len = 0; + strbuf_reset(&w->last_key); return 0; }
-- 2.44.GIT