summaryrefslogtreecommitdiff
path: root/reftable/reader.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-02-08 16:22:07 -0800
committerJunio C Hamano <gitster@pobox.com>2024-02-08 16:22:07 -0800
commit546f8d2dcddd4d92dbef2e2fe7c848ac4830cf84 (patch)
treee86c09decab6583a94d6fd1c85e7a115828f4411 /reftable/reader.c
parentb471ea3a0d9bfac19b91f7d50240d4bb863f252f (diff)
parentc0cadb0576d4920915eb3bd38a7d1abfcbd25f98 (diff)
downloadgit-546f8d2dcddd4d92dbef2e2fe7c848ac4830cf84.tar.xz
Merge branch 'ps/reftable-fixes' into maint-2.43
Bunch of small fix-ups to the reftable code. * ps/reftable-fixes: reftable/block: reuse buffer to compute record keys reftable/block: introduce macro to initialize `struct block_iter` reftable/merged: reuse buffer to compute record keys reftable/stack: fix use of unseeded randomness reftable/stack: fix stale lock when dying reftable/stack: reuse buffers when reloading stack reftable/stack: perform auto-compaction with transactional interface reftable/stack: verify that `reftable_stack_add()` uses auto-compaction reftable: handle interrupted writes reftable: handle interrupted reads reftable: wrap EXPECT macros in do/while
Diffstat (limited to 'reftable/reader.c')
-rw-r--r--reftable/reader.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/reftable/reader.c b/reftable/reader.c
index b4db23ce18..9de64f50b4 100644
--- a/reftable/reader.c
+++ b/reftable/reader.c
@@ -224,10 +224,9 @@ struct table_iter {
struct block_iter bi;
int is_finished;
};
-#define TABLE_ITER_INIT \
- { \
- .bi = {.last_key = STRBUF_INIT } \
- }
+#define TABLE_ITER_INIT { \
+ .bi = BLOCK_ITER_INIT \
+}
static void table_iter_copy_from(struct table_iter *dest,
struct table_iter *src)