]> git.ipfire.org Git - thirdparty/git.git/commitdiff
reftable/writer: reset `last_key` instead of releasing it
authorPatrick Steinhardt <ps@pks.im>
Mon, 8 Apr 2024 12:24:30 +0000 (14:24 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Apr 2024 00:01:41 +0000 (17:01 -0700)
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
reftable/writer.c

index 4eeb73644521900e6f0e70b7eb680eb94c6fc5a9..10eccaaa07f568ecc78bcb58adc90429ad5393c7 100644 (file)
@@ -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));
@@ -478,7 +478,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;
 }