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

diff --cc Makefile
index deb175a04087825bc5ff93221d38c4cfb9e2ce31,41dfa0bad2cc8a38a5516ae9ca31ebcd680072be..b72725d2b05ae132a09f045c14e5f1679b986896
--- 1/Makefile
--- 2/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/iter.c
Simple merge

diff --cc reftable/record.c
index 2ec0c6d346af352d10598ad16d079b24b3eaac2e,e26bd4bc8d989335f612cd82f0bff11a29bb9d10..6b5a075b921062caee58f63262e20399b2678b7e
--- 1/reftable/record.c
--- 2/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 afe0103ad44ddfd2ab8ba0a2a809cee219402903,d005a8bb9e1589fff2fb8f8195abab0ce27520b8..8d44ddc151d2203eef95772abeafc2a12b5d17a9
--- 1/reftable/reftable-tests.h
--- 2/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

diff --cc reftable/stack_test.c
Simple merge

diff --cc t/helper/test-reftable.c
Simple merge

diff --cc t/unit-tests/t-reftable-merged.c
Simple merge