31216ee28a
block_iter_reset() restores a block iterator to its state at the time of initialization without freeing any memory while block_iter_close() deallocates the memory for the iterator. In the current testing setup, a block iterator is allocated and deallocated for every iteration of a loop, which hurts performance. Improve upon this by using block_iter_reset() at the start of each iteration instead. This has the added benifit of testing block_iter_reset(), which currently remains untested. Similarly, remove reftable_record_release() for a reftable record that is still in use. Mentored-by: Patrick Steinhardt <ps@pks.im> Mentored-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Chandra Pratap <chandrapratap3519@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
117 lines
2.8 KiB
C
117 lines
2.8 KiB
C
/*
|
|
Copyright 2020 Google LLC
|
|
|
|
Use of this source code is governed by a BSD-style
|
|
license that can be found in the LICENSE file or at
|
|
https://developers.google.com/open-source/licenses/bsd
|
|
*/
|
|
|
|
#include "test-lib.h"
|
|
#include "reftable/block.h"
|
|
#include "reftable/blocksource.h"
|
|
#include "reftable/constants.h"
|
|
#include "reftable/reftable-error.h"
|
|
|
|
static void t_block_read_write(void)
|
|
{
|
|
const int header_off = 21; /* random */
|
|
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_REF,
|
|
};
|
|
size_t i = 0;
|
|
int ret;
|
|
struct block_reader br = { 0 };
|
|
struct block_iter it = BLOCK_ITER_INIT;
|
|
size_t j = 0;
|
|
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_REF, block.data, block_size,
|
|
header_off, hash_size(GIT_SHA1_FORMAT_ID));
|
|
|
|
rec.u.ref.refname = (char *) "";
|
|
rec.u.ref.value_type = REFTABLE_REF_DELETION;
|
|
ret = block_writer_add(&bw, &rec);
|
|
check_int(ret, ==, REFTABLE_API_ERROR);
|
|
|
|
for (i = 0; i < N; i++) {
|
|
char name[100];
|
|
snprintf(name, sizeof(name), "branch%02"PRIuMAX, (uintmax_t)i);
|
|
|
|
rec.u.ref.refname = xstrdup(name);
|
|
rec.u.ref.value_type = REFTABLE_REF_VAL1;
|
|
memset(rec.u.ref.value.val1, i, GIT_SHA1_RAWSZ);
|
|
|
|
recs[i] = rec;
|
|
ret = block_writer_add(&bw, &rec);
|
|
rec.u.ref.refname = NULL;
|
|
rec.u.ref.value_type = REFTABLE_REF_DELETION;
|
|
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);
|
|
|
|
while (1) {
|
|
ret = block_iter_next(&it, &rec);
|
|
check_int(ret, >=, 0);
|
|
if (ret > 0) {
|
|
check_int(i, ==, N);
|
|
break;
|
|
}
|
|
check(reftable_record_equal(&recs[j], &rec, GIT_SHA1_RAWSZ));
|
|
j++;
|
|
}
|
|
|
|
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));
|
|
|
|
want.len--;
|
|
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[10 * (i / 10)], &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_block_read_write(), "read-write operations on blocks work");
|
|
|
|
return test_done();
|
|
}
|