diff mbox series

[v2,10/11] t-reftable-block: add tests for obj blocks

Message ID 20240816175414.5169-11-chandrapratap3519@gmail.com (mailing list archive)
State Superseded
Headers show
Series t: port reftable/block_test.c to the unit testing framework | expand

Commit Message

Chandra Pratap Aug. 16, 2024, 5:25 p.m. UTC 
In the current testing setup, block operations are left unexercised
for obj blocks. Add a test that exercises these operations for obj
blocks.

Mentored-by: Patrick Steinhardt <ps@pks.im>
Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Chandra Pratap <chandrapratap3519@gmail.com>
---
 t/unit-tests/t-reftable-block.c | 82 +++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)

Comments

Chandra Pratap Aug. 16, 2024, 6:11 p.m. UTC | #1 
On Fri, 16 Aug 2024 at 23:25, Chandra Pratap
<chandrapratap3519@gmail.com> wrote:
>
> In the current testing setup, block operations are left unexercised
> for obj blocks. Add a test that exercises these operations for obj
> blocks.
>
> Mentored-by: Patrick Steinhardt <ps@pks.im>
> Mentored-by: Christian Couder <chriscool@tuxfamily.org>
> Signed-off-by: Chandra Pratap <chandrapratap3519@gmail.com>
> ---
>  t/unit-tests/t-reftable-block.c | 82 +++++++++++++++++++++++++++++++++
>  1 file changed, 82 insertions(+)
>
> diff --git a/t/unit-tests/t-reftable-block.c b/t/unit-tests/t-reftable-block.c
> index 1256c7df6a..7671a40969 100644
> --- a/t/unit-tests/t-reftable-block.c
> +++ b/t/unit-tests/t-reftable-block.c
> @@ -190,9 +190,91 @@ static void t_log_block_read_write(void)
>                 reftable_record_release(&recs[i]);
>  }
>
> +static void t_obj_block_read_write(void)
> +{
> +       const int header_off = 21;
> +       struct reftable_record recs[30];
> +       const size_t N = ARRAY_SIZE(recs);
> +       const size_t block_size = 1024;
> +       struct reftable_block block = { 0 };
> +       struct block_writer bw = {
> +               .last_key = STRBUF_INIT,
> +       };
> +       struct reftable_record rec = {
> +               .type = BLOCK_TYPE_OBJ,
> +       };
> +       size_t i = 0;
> +       int ret;
> +       struct block_reader br = { 0 };
> +       struct block_iter it = BLOCK_ITER_INIT;
> +       struct strbuf want = STRBUF_INIT;
> +
> +       REFTABLE_CALLOC_ARRAY(block.data, block_size);
> +       block.len = block_size;
> +       block.source = malloc_block_source();
> +       block_writer_init(&bw, BLOCK_TYPE_OBJ, block.data, block_size,
> +                         header_off, hash_size(GIT_SHA1_FORMAT_ID));
> +
> +       for (i = 0; i < N; i++) {
> +               uint8_t bytes[] = { i, i + 1, i + 2, i + 3, i + 5 }, *allocated;
> +               allocated = reftable_malloc(ARRAY_SIZE(bytes));
> +               DUP_ARRAY(allocated, bytes, ARRAY_SIZE(bytes));

The second line of this loop is redundant and causes a memory leak
in the GitHub CI. I'll fix this in the next iteration.

---snip---
diff mbox series

Patch

diff --git a/t/unit-tests/t-reftable-block.c b/t/unit-tests/t-reftable-block.c
index 1256c7df6a..7671a40969 100644
--- a/t/unit-tests/t-reftable-block.c
+++ b/t/unit-tests/t-reftable-block.c
@@ -190,9 +190,91 @@  static void t_log_block_read_write(void)
 		reftable_record_release(&recs[i]);
 }
 
+static void t_obj_block_read_write(void)
+{
+	const int header_off = 21;
+	struct reftable_record recs[30];
+	const size_t N = ARRAY_SIZE(recs);
+	const size_t block_size = 1024;
+	struct reftable_block block = { 0 };
+	struct block_writer bw = {
+		.last_key = STRBUF_INIT,
+	};
+	struct reftable_record rec = {
+		.type = BLOCK_TYPE_OBJ,
+	};
+	size_t i = 0;
+	int ret;
+	struct block_reader br = { 0 };
+	struct block_iter it = BLOCK_ITER_INIT;
+	struct strbuf want = STRBUF_INIT;
+
+	REFTABLE_CALLOC_ARRAY(block.data, block_size);
+	block.len = block_size;
+	block.source = malloc_block_source();
+	block_writer_init(&bw, BLOCK_TYPE_OBJ, block.data, block_size,
+			  header_off, hash_size(GIT_SHA1_FORMAT_ID));
+
+	for (i = 0; i < N; i++) {
+		uint8_t bytes[] = { i, i + 1, i + 2, i + 3, i + 5 }, *allocated;
+		allocated = reftable_malloc(ARRAY_SIZE(bytes));
+		DUP_ARRAY(allocated, bytes, ARRAY_SIZE(bytes));
+
+		rec.u.obj.hash_prefix = allocated;
+		rec.u.obj.hash_prefix_len = 5;
+
+		recs[i] = rec;
+		ret = block_writer_add(&bw, &rec);
+		rec.u.obj.hash_prefix = NULL;
+		rec.u.obj.hash_prefix_len = 0;
+		check_int(ret, ==, 0);
+	}
+
+	ret = block_writer_finish(&bw);
+	check_int(ret, >, 0);
+
+	block_writer_release(&bw);
+
+	block_reader_init(&br, &block, header_off, block_size, GIT_SHA1_RAWSZ);
+
+	block_iter_seek_start(&it, &br);
+
+	for (i = 0; ; i++) {
+		ret = block_iter_next(&it, &rec);
+		check_int(ret, >=, 0);
+		if (ret > 0) {
+			check_int(i, ==, N);
+			break;
+		}
+		check(reftable_record_equal(&recs[i], &rec, GIT_SHA1_RAWSZ));
+	}
+
+	for (i = 0; i < N; i++) {
+		block_iter_reset(&it);
+		reftable_record_key(&recs[i], &want);
+
+		ret = block_iter_seek_key(&it, &br, &want);
+		check_int(ret, ==, 0);
+
+		ret = block_iter_next(&it, &rec);
+		check_int(ret, ==, 0);
+
+		check(reftable_record_equal(&recs[i], &rec, GIT_SHA1_RAWSZ));
+	}
+
+	block_reader_release(&br);
+	block_iter_close(&it);
+	reftable_record_release(&rec);
+	reftable_block_done(&br.block);
+	strbuf_release(&want);
+	for (i = 0; i < N; i++)
+		reftable_record_release(&recs[i]);
+}
+
 int cmd_main(int argc, const char *argv[])
 {
 	TEST(t_log_block_read_write(), "read-write operations on log blocks work");
+	TEST(t_obj_block_read_write(), "read-write operations on obj blocks work");
 	TEST(t_ref_block_read_write(), "read-write operations on ref blocks work");
 
 	return test_done();