From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 29 Aug 2024 18:08:15 +0000 (-0700)
Subject: Merge branch 'ps/reftable-drop-generic'
X-Git-Tag: v2.47.0-rc0~84
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d4d677704d74db389d2f56975794cd85acb8181f;p=thirdparty%2Fgit.git

Merge branch 'ps/reftable-drop-generic'

The code in the reftable library has been cleaned up by discarding
unused "generic" interface.

* ps/reftable-drop-generic:
  reftable: mark unused parameters in empty iterator functions
  reftable/generic: drop interface
  t/helper: refactor to not use `struct reftable_table`
  t/helper: use `hash_to_hex_algop()` to print hashes
  t/helper: inline printing of reftable records
  t/helper: inline `reftable_table_print()`
  t/helper: inline `reftable_stack_print_directory()`
  t/helper: inline `reftable_reader_print_file()`
  t/helper: inline `reftable_dump_main()`
  reftable/dump: drop unused `compact_stack()`
  reftable/generic: move generic iterator code into iterator interface
  reftable/iter: drop double-checking logic
  reftable/stack: open-code reading refs
  reftable/merged: stop using generic tables in the merged table
  reftable/merged: rename `reftable_new_merged_table()`
  reftable/merged: expose functions to initialize iterators
---

d4d677704d74db389d2f56975794cd85acb8181f
diff --cc Makefile
index deb175a040,41dfa0bad2..b72725d2b0
--- a/Makefile
+++ b/Makefile
@@@ -2684,9 -2679,11 +2683,8 @@@ REFTABLE_OBJS += reftable/tree.
  REFTABLE_OBJS += reftable/writer.o
  
  REFTABLE_TEST_OBJS += reftable/block_test.o
- REFTABLE_TEST_OBJS += reftable/dump.o
 -REFTABLE_TEST_OBJS += reftable/pq_test.o
 -REFTABLE_TEST_OBJS += reftable/readwrite_test.o
  REFTABLE_TEST_OBJS += reftable/stack_test.o
  REFTABLE_TEST_OBJS += reftable/test_framework.o
 -REFTABLE_TEST_OBJS += reftable/tree_test.o
  
  TEST_OBJS := $(patsubst %$X,%.o,$(TEST_PROGRAMS)) $(patsubst %,t/helper/%,$(TEST_BUILTINS_OBJS))
  
diff --cc reftable/record.c
index 2ec0c6d346,e26bd4bc8d..6b5a075b92
--- a/reftable/record.c
+++ b/reftable/record.c
@@@ -516,23 -457,8 +457,8 @@@ static void reftable_obj_record_release
  	memset(obj, 0, sizeof(struct reftable_obj_record));
  }
  
- static void reftable_obj_record_print(const void *rec, int hash_size UNUSED)
- {
- 	const struct reftable_obj_record *obj = rec;
- 	char hex[GIT_MAX_HEXSZ + 1] = { 0 };
- 	struct strbuf offset_str = STRBUF_INIT;
- 	int i;
- 
- 	for (i = 0; i < obj->offset_len; i++)
- 		strbuf_addf(&offset_str, "%" PRIu64 " ", obj->offsets[i]);
- 	hex_format(hex, obj->hash_prefix, obj->hash_prefix_len);
- 	printf("prefix %s (len %d), offsets [%s]\n",
- 	       hex, obj->hash_prefix_len, offset_str.buf);
- 	strbuf_release(&offset_str);
- }
- 
  static void reftable_obj_record_copy_from(void *rec, const void *src_rec,
 -					  int hash_size)
 +					  int hash_size UNUSED)
  {
  	struct reftable_obj_record *obj = rec;
  	const struct reftable_obj_record *src =
diff --cc reftable/reftable-tests.h
index afe0103ad4,d005a8bb9e..8d44ddc151
--- a/reftable/reftable-tests.h
+++ b/reftable/reftable-tests.h
@@@ -9,8 -9,12 +9,7 @@@ https://developers.google.com/open-sour
  #ifndef REFTABLE_TESTS_H
  #define REFTABLE_TESTS_H
  
 -int basics_test_main(int argc, const char **argv);
  int block_test_main(int argc, const char **argv);
 -int pq_test_main(int argc, const char **argv);
 -int record_test_main(int argc, const char **argv);
 -int readwrite_test_main(int argc, const char **argv);
  int stack_test_main(int argc, const char **argv);
- int reftable_dump_main(int argc, char *const *argv);
 -int tree_test_main(int argc, const char **argv);
  
  #endif