From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Apr 2025 21:21:29 +0000 (-0700)
Subject: Merge branch 'ps/reftable-api-revamp'
X-Git-Tag: v2.50.0-rc0~72
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a819a3da85655031a23abae0f75d0910697fb92c;p=thirdparty%2Fgit.git

Merge branch 'ps/reftable-api-revamp'

Overhaul of the reftable API.

* ps/reftable-api-revamp:
  reftable/table: move printing logic into test helper
  reftable/constants: make block types part of the public interface
  reftable/table: introduce iterator for table blocks
  reftable/table: add `reftable_table` to the public interface
  reftable/block: expose a generic iterator over reftable records
  reftable/block: make block iterators reseekable
  reftable/block: store block pointer in the block iterator
  reftable/block: create public interface for reading blocks
  git-zlib: use `struct z_stream_s` instead of typedef
  reftable/block: rename `block_reader` to `reftable_block`
  reftable/block: rename `block` to `block_data`
  reftable/table: move reading block into block reader
  reftable/block: simplify how we track restart points
  reftable/blocksource: consolidate code into a single file
  reftable/reader: rename data structure to "table"
  reftable: fix formatting of the license header
---

a819a3da85655031a23abae0f75d0910697fb92c
diff --cc Makefile
index 39b7c15524,58bd9dc645..8de8307210
--- a/Makefile
+++ b/Makefile
@@@ -1380,7 -1377,9 +1380,7 @@@ UNIT_TEST_PROGRAMS += t-reftable-p
  UNIT_TEST_PROGRAMS += t-reftable-readwrite
  UNIT_TEST_PROGRAMS += t-reftable-record
  UNIT_TEST_PROGRAMS += t-reftable-stack
+ UNIT_TEST_PROGRAMS += t-reftable-table
 -UNIT_TEST_PROGRAMS += t-trailer
 -UNIT_TEST_PROGRAMS += t-urlmatch-normalization
  UNIT_TEST_PROGS = $(patsubst %,$(UNIT_TEST_BIN)/%$X,$(UNIT_TEST_PROGRAMS))
  UNIT_TEST_OBJS += $(UNIT_TEST_DIR)/test-lib.o
  UNIT_TEST_OBJS += $(UNIT_TEST_DIR)/lib-reftable.o
diff --cc t/meson.build
index bfb744e886,ded928d9e6..43c9750b88
--- a/t/meson.build
+++ b/t/meson.build
@@@ -61,7 -59,9 +61,7 @@@ unit_test_programs = 
    'unit-tests/t-reftable-readwrite.c',
    'unit-tests/t-reftable-record.c',
    'unit-tests/t-reftable-stack.c',
+   'unit-tests/t-reftable-table.c',
 -  'unit-tests/t-trailer.c',
 -  'unit-tests/t-urlmatch-normalization.c',
  ]
  
  foreach unit_test_program : unit_test_programs