diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-09-03 09:15:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-09-03 09:15:03 -0700 |
| commit | 17636cdf3b0bf344a2e3090fd8bf254cf3ec0a2f (patch) | |
| tree | e3171d88382d6a79da84cd6135c4a23d71418d9b /t/unit-tests/t-reftable-block.c | |
| parent | dd903659cd54d4e21ca41b0c1f5d10b66763eb60 (diff) | |
| parent | 85da2a2ab62e24a8b9ff183fe3a451b445632487 (diff) | |
Merge branch 'ps/reftable-concurrent-compaction'
The code path for compacting reftable files saw some bugfixes
against concurrent operation.
* ps/reftable-concurrent-compaction:
reftable/stack: fix segfault when reload with reused readers fails
reftable/stack: reorder swapping in the reloaded stack contents
reftable/reader: keep readers alive during iteration
reftable/reader: introduce refcounting
reftable/stack: fix broken refnames in `write_n_ref_tables()`
reftable/reader: inline `reader_close()`
reftable/reader: inline `init_reader()`
reftable/reader: rename `reftable_new_reader()`
reftable/stack: inline `stack_compact_range_stats()`
reftable/blocksource: drop malloc block source
Diffstat (limited to 't/unit-tests/t-reftable-block.c')
| -rw-r--r-- | t/unit-tests/t-reftable-block.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/t/unit-tests/t-reftable-block.c b/t/unit-tests/t-reftable-block.c index f0124fc3d0..f1a49485e2 100644 --- a/t/unit-tests/t-reftable-block.c +++ b/t/unit-tests/t-reftable-block.c @@ -29,11 +29,11 @@ static void t_ref_block_read_write(void) int ret; struct block_reader br = { 0 }; struct block_iter it = BLOCK_ITER_INIT; - struct strbuf want = STRBUF_INIT; + struct strbuf want = STRBUF_INIT, buf = STRBUF_INIT; REFTABLE_CALLOC_ARRAY(block.data, block_size); block.len = block_size; - block.source = malloc_block_source(); + block_source_from_strbuf(&block.source ,&buf); block_writer_init(&bw, BLOCK_TYPE_REF, block.data, block_size, header_off, hash_size(GIT_SHA1_FORMAT_ID)); @@ -99,6 +99,7 @@ static void t_ref_block_read_write(void) reftable_record_release(&rec); reftable_block_done(&br.block); strbuf_release(&want); + strbuf_release(&buf); for (i = 0; i < N; i++) reftable_record_release(&recs[i]); } |
