[PATCH v2 0/7] reftable: avoid reading and writing empty keys
- From
Han-Wen Nienhuys via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Feb 17, 2022, 13:55 UTC
- Message-ID
- <pull.1185.v2.git.git.1645106124.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.1185.git.git.1642010868.gitgitgadget@gmail.com>
this series makes sure that the object record does not have to consider empty keys (and therefore, a NULL memcpy destination)
while we're at it add some more tests, and fix a naming mistake.
Han-Wen Nienhuys (7): Documentation: object_id_len goes up to 31 reftable: reject 0 object_id_len reftable: add a test that verifies that writing empty keys fails reftable: avoid writing empty keys at the block layer reftable: ensure that obj_id_len is >= 2 on writing reftable: add test for length of disambiguating prefix reftable: rename writer_stats to reftable_writer_stats
Documentation/technical/reftable.txt | 2 +- reftable/block.c | 27 ++++--- reftable/block_test.c | 5 ++ reftable/reader.c | 5 ++ reftable/readwrite_test.c | 105 ++++++++++++++++++++++++++- reftable/reftable-writer.h | 2 +- reftable/writer.c | 9 ++- 7 files changed, 136 insertions(+), 19 deletions(-)
base-commit: 45fe28c951c3e70666ee4ef8379772851a8e4d32 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1185%2Fhanwen%2Fobj-id-len-v2 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1185/hanwen/obj-id-len-v2 Pull-Request: https://github.com/git/git/pull/1185
Range-diff vs v1:
1: 2d2e1177ff7 = 1: 80d29e8f269 Documentation: object_id_len goes up to 31
2: 747c9e9a4c8 = 2: 4c1a19fc4ae reftable: reject 0 object_id_len
3: 4eefedb0d07 = 3: 600b115f8b1 reftable: add a test that verifies that writing empty keys fails
4: e4c1cc58265 ! 4: ba036ee8543 reftable: avoid writing empty keys at the block layer
@@ reftable/block.c: int block_reader_first_key(struct block_reader *br, struct str
## reftable/block_test.c ##
@@ reftable/block_test.c: static void test_block_read_write(void)
+ block_writer_init(&bw, BLOCK_TYPE_REF, block.data, block_size,
header_off, hash_size(GIT_SHA1_FORMAT_ID));
- reftable_record_from_ref(&rec, &ref);
-+ ref.refname = "";
-+ ref.value_type = REFTABLE_REF_DELETION;
++ rec.u.ref.refname = "";
++ rec.u.ref.value_type = REFTABLE_REF_DELETION;
+ n = block_writer_add(&bw, &rec);
+ EXPECT(n == REFTABLE_API_ERROR);
+
5: 3a72aba447c = 5: 2bd3d44ba57 reftable: ensure that obj_id_len is >= 2 on writing
6: a5dfa048884 = 6: 82d36ee0e0d reftable: add test for length of disambiguating prefix
7: 37aa7744c84 ! 7: c6ffdb3471c reftable: rename writer_stats to reftable_writer_stats
@@ reftable/readwrite_test.c: static void test_log_write_read(void)
n = reftable_writer_close(w);
EXPECT(n == 0);
+- stats = writer_stats(w);
++ stats = reftable_writer_stats(w);
+ EXPECT(stats->log_stats.blocks > 0);
+ reftable_writer_free(w);
+ w = NULL;
+@@ reftable/readwrite_test.c: static void test_log_zlib_corruption(void)
+ n = reftable_writer_close(w);
+ EXPECT(n == 0);
+
- stats = writer_stats(w);
+ stats = reftable_writer_stats(w);
EXPECT(stats->log_stats.blocks > 0);-- gitgitgadget