mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reftable/merged: rename reftable_new_merged_table()

Browse Source 
Rename `reftable_new_merged_table()` to `reftable_merged_table_new()`
such that the name matches our coding style.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2024-08-22 08:34:41 +02:00
committed by Junio C Hamano
parent 987762a51a
commit 6631ed3ce7
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
reftable/merged.c
View File

@ -192,7 +192,7 @@ static void iterator_from_merged_iter(struct reftable_iterator *it,
it->ops = &merged_iter_vtable; it->ops = &merged_iter_vtable;
} }
int reftable_new_merged_table(struct reftable_merged_table **dest, int reftable_merged_table_new(struct reftable_merged_table **dest,
struct reftable_table *stack, size_t n, struct reftable_table *stack, size_t n,
uint32_t hash_id) uint32_t hash_id)
{ {

9
reftable/reftable-merged.h
View File

@ -29,10 +29,11 @@ struct reftable_merged_table;
/* A generic reftable; see below. */ /* A generic reftable; see below. */
struct reftable_table; struct reftable_table;
/* reftable_new_merged_table creates a new merged table. It takes ownership of /*
the stack array. * reftable_merged_table_new creates a new merged table. It takes ownership of
*/ * the stack array.
int reftable_new_merged_table(struct reftable_merged_table **dest, */
int reftable_merged_table_new(struct reftable_merged_table **dest,
struct reftable_table *stack, size_t n, struct reftable_table *stack, size_t n,
uint32_t hash_id); uint32_t hash_id);

4
reftable/stack.c
View File

@ -272,7 +272,7 @@ static int reftable_stack_reload_once(struct reftable_stack *st,
} }
/* success! */ /* success! */
err = reftable_new_merged_table(&new_merged, new_tables, err = reftable_merged_table_new(&new_merged, new_tables,
new_readers_len, st->opts.hash_id); new_readers_len, st->opts.hash_id);
if (err < 0) if (err < 0)
goto done; goto done;
@ -924,7 +924,7 @@ static int stack_write_compact(struct reftable_stack *st,
reftable_writer_set_limits(wr, st->readers[first]->min_update_index, reftable_writer_set_limits(wr, st->readers[first]->min_update_index,
st->readers[last]->max_update_index); st->readers[last]->max_update_index);
err = reftable_new_merged_table(&mt, subtabs, subtabs_len, err = reftable_merged_table_new(&mt, subtabs, subtabs_len,
st->opts.hash_id); st->opts.hash_id);
if (err < 0) { if (err < 0) {
reftable_free(subtabs); reftable_free(subtabs);

8
t/unit-tests/t-reftable-merged.c
View File

@ -111,7 +111,7 @@ merged_table_from_records(struct reftable_ref_record **refs,
reftable_table_from_reader(&tabs[i], (*readers)[i]); reftable_table_from_reader(&tabs[i], (*readers)[i]);
} }
err = reftable_new_merged_table(&mt, tabs, n, GIT_SHA1_FORMAT_ID); err = reftable_merged_table_new(&mt, tabs, n, GIT_SHA1_FORMAT_ID);
check(!err); check(!err);
return mt; return mt;
} }
@ -289,7 +289,7 @@ merged_table_from_log_records(struct reftable_log_record **logs,
reftable_table_from_reader(&tabs[i], (*readers)[i]); reftable_table_from_reader(&tabs[i], (*readers)[i]);
} }
err = reftable_new_merged_table(&mt, tabs, n, GIT_SHA1_FORMAT_ID); err = reftable_merged_table_new(&mt, tabs, n, GIT_SHA1_FORMAT_ID);
check(!err); check(!err);
return mt; return mt;
} }
@ -441,9 +441,9 @@ static void t_default_write_opts(void)
check_int(hash_id, ==, GIT_SHA1_FORMAT_ID); check_int(hash_id, ==, GIT_SHA1_FORMAT_ID);
reftable_table_from_reader(&tab[0], rd); reftable_table_from_reader(&tab[0], rd);
err = reftable_new_merged_table(&merged, tab, 1, GIT_SHA256_FORMAT_ID); err = reftable_merged_table_new(&merged, tab, 1, GIT_SHA256_FORMAT_ID);
check_int(err, ==, REFTABLE_FORMAT_ERROR); check_int(err, ==, REFTABLE_FORMAT_ERROR);
err = reftable_new_merged_table(&merged, tab, 1, GIT_SHA1_FORMAT_ID); err = reftable_merged_table_new(&merged, tab, 1, GIT_SHA1_FORMAT_ID);
check(!err); check(!err);
reftable_reader_free(rd); reftable_reader_free(rd);