kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

reftable/block: merge `block_iter_seek()` and `block_reader_seek()` 

The function `block_iter_seek()` is merely a simple wrapper around
`block_reader_seek()`. Merge those two functions into a new function
`block_iter_seek_key()` that more clearly says what it is actually
doing.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Patrick Steinhardt 2024-04-08 14:16:31 +02:00 committed by Junio C Hamano
parent 3122d44025
commit 42c7bdc36d
4 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
reftable/block.c
View File

@ -373,18 +373,13 @@ int block_reader_first_key(struct block_reader *br, struct strbuf *key)
return 0; return 0;
} }


int block_iter_seek(struct block_iter *it, struct strbuf *want)
{
return block_reader_seek(it->br, it, want);
}

void block_iter_close(struct block_iter *it) void block_iter_close(struct block_iter *it)
{ {
strbuf_release(&it->last_key); strbuf_release(&it->last_key);
strbuf_release(&it->scratch); strbuf_release(&it->scratch);
} }


int block_reader_seek(struct block_reader *br, struct block_iter *it, int block_iter_seek_key(struct block_iter *it, struct block_reader *br,
struct strbuf *want) struct strbuf *want)
{ {
struct restart_needle_less_args args = { struct restart_needle_less_args args = {

5
reftable/block.h
View File

@ -101,7 +101,7 @@ int block_reader_init(struct block_reader *br, struct reftable_block *bl,
void block_iter_seek_start(struct block_iter *it, struct block_reader *br); void block_iter_seek_start(struct block_iter *it, struct block_reader *br);


/* Position `it` to the `want` key in the block */ /* Position `it` to the `want` key in the block */
int block_reader_seek(struct block_reader *br, struct block_iter *it, int block_iter_seek_key(struct block_iter *it, struct block_reader *br,
struct strbuf *want); struct strbuf *want);


/* Returns the block type (eg. 'r' for refs) */ /* Returns the block type (eg. 'r' for refs) */
@ -115,9 +115,6 @@ void block_iter_copy_from(struct block_iter *dest, struct block_iter *src);
/* return < 0 for error, 0 for OK, > 0 for EOF. */ /* return < 0 for error, 0 for OK, > 0 for EOF. */
int block_iter_next(struct block_iter *it, struct reftable_record *rec); int block_iter_next(struct block_iter *it, struct reftable_record *rec);


/* Seek to `want` with in the block pointed to by `it` */
int block_iter_seek(struct block_iter *it, struct strbuf *want);

/* deallocate memory for `it`. The block reader and its block is left intact. */ /* deallocate memory for `it`. The block reader and its block is left intact. */
void block_iter_close(struct block_iter *it); void block_iter_close(struct block_iter *it);



4
reftable/block_test.c
View File

@ -89,7 +89,7 @@ static void test_block_read_write(void)
strbuf_reset(&want); strbuf_reset(&want);
strbuf_addstr(&want, names[i]); strbuf_addstr(&want, names[i]);


n = block_reader_seek(&br, &it, &want); n = block_iter_seek_key(&it, &br, &want);
EXPECT(n == 0); EXPECT(n == 0);


n = block_iter_next(&it, &rec); n = block_iter_next(&it, &rec);
@ -98,7 +98,7 @@ static void test_block_read_write(void)
EXPECT_STREQ(names[i], rec.u.ref.refname); EXPECT_STREQ(names[i], rec.u.ref.refname);


want.len--; want.len--;
n = block_reader_seek(&br, &it, &want); n = block_iter_seek_key(&it, &br, &want);
EXPECT(n == 0); EXPECT(n == 0);


n = block_iter_next(&it, &rec); n = block_iter_next(&it, &rec);

4
reftable/reader.c
View File

@ -483,7 +483,7 @@ static int reader_seek_linear(struct table_iter *ti,
table_iter_copy_from(ti, &next); table_iter_copy_from(ti, &next);
} }


err = block_iter_seek(&ti->bi, &want_key); err = block_iter_seek_key(&ti->bi, ti->bi.br, &want_key);
if (err < 0) if (err < 0)
goto done; goto done;
err = 0; err = 0;
@ -558,7 +558,7 @@ static int reader_seek_indexed(struct reftable_reader *r,
if (err != 0) if (err != 0)
goto done; goto done;


err = block_iter_seek(&next.bi, &want_index.u.idx.last_key); err = block_iter_seek_key(&next.bi, next.bi.br, &want_index.u.idx.last_key);
if (err < 0) if (err < 0)
goto done; goto done;