Skip to content

Commit 8e27ee9

Browse files
pks-tgitster
authored andcommitted
reftable/stack: don't perform auto-compaction with less than two tables
In order to compact tables we need at least two tables. Bail out early from `reftable_stack_auto_compact()` in case we have less than two tables. In the original, `stack_table_sizes_for_compaction()` yields an array that has the same length as the number of tables. This array is then passed on to `suggest_compaction_segment()`, which returns an empty segment in case we have less than two tables. The segment is then passed to `segment_size()`, which will return `0` because both start and end of the segment are `0`. And because we only call `stack_compact_range()` in case we have a positive segment size we don't perform auto-compaction at all. Consequently, this change does not result in a user-visible change in behaviour when called with a single table. But when called with no tables this protects us against a potential out-of-memory error: `stack_table_sizes_for_compaction()` would try to allocate a zero-byte object when there aren't any tables, and that may lead to a `NULL` pointer on some platforms like NonStop which causes us to bail out with an out-of-memory error. Signed-off-by: Patrick Steinhardt <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 2179b5c commit 8e27ee9

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

reftable/stack.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1552,6 +1552,9 @@ int reftable_stack_auto_compact(struct reftable_stack *st)
15521552
struct segment seg;
15531553
uint64_t *sizes;
15541554

1555+
if (st->merged->readers_len < 2)
1556+
return 0;
1557+
15551558
sizes = stack_table_sizes_for_compaction(st);
15561559
if (!sizes)
15571560
return REFTABLE_OUT_OF_MEMORY_ERROR;

0 commit comments

Comments
 (0)