Skip to content

Commit f975a3a

Browse files
committed
Merge branch 'ps/reftable-drop-generic' into ps/reftable-concurrent-compaction
* ps/reftable-drop-generic: (24 commits) 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 reftable/stack: handle locked tables during auto-compaction reftable/stack: fix corruption on concurrent compaction reftable/stack: use lock_file when adding table to "tables.list" reftable/stack: do not die when fsyncing lock file files reftable/stack: simplify tracking of table locks ...
2 parents 25673b1 + 6014639 commit f975a3a

23 files changed

+721
-887
lines changed

Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2674,13 +2674,11 @@ REFTABLE_OBJS += reftable/merged.o
26742674
REFTABLE_OBJS += reftable/pq.o
26752675
REFTABLE_OBJS += reftable/reader.o
26762676
REFTABLE_OBJS += reftable/record.o
2677-
REFTABLE_OBJS += reftable/generic.o
26782677
REFTABLE_OBJS += reftable/stack.o
26792678
REFTABLE_OBJS += reftable/tree.o
26802679
REFTABLE_OBJS += reftable/writer.o
26812680

26822681
REFTABLE_TEST_OBJS += reftable/block_test.o
2683-
REFTABLE_TEST_OBJS += reftable/dump.o
26842682
REFTABLE_TEST_OBJS += reftable/pq_test.o
26852683
REFTABLE_TEST_OBJS += reftable/readwrite_test.o
26862684
REFTABLE_TEST_OBJS += reftable/stack_test.o

reftable/dump.c

Lines changed: 0 additions & 111 deletions
This file was deleted.

reftable/generic.c

Lines changed: 0 additions & 229 deletions
This file was deleted.

reftable/generic.h

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)