aboutsummaryrefslogtreecommitdiffstats
path: root/reftable/merged.h
diff options
context:
space:
mode:
Diffstat (limited to 'reftable/merged.h')
-rw-r--r--reftable/merged.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/reftable/merged.h b/reftable/merged.h
index 2efe571da6..0b7d939e92 100644
--- a/reftable/merged.h
+++ b/reftable/merged.h
@@ -10,11 +10,12 @@ https://developers.google.com/open-source/licenses/bsd
#define MERGED_H
#include "system.h"
+#include "reftable-basics.h"
struct reftable_merged_table {
- struct reftable_table *stack;
- size_t stack_len;
- uint32_t hash_id;
+ struct reftable_reader **readers;
+ size_t readers_len;
+ enum reftable_hash hash_id;
/* If unset, produce deletions. This is useful for compaction. For the
* full stack, deletions should be produced. */
@@ -26,8 +27,8 @@ struct reftable_merged_table {
struct reftable_iterator;
-void merged_table_init_iter(struct reftable_merged_table *mt,
- struct reftable_iterator *it,
- uint8_t typ);
+int merged_table_init_iter(struct reftable_merged_table *mt,
+ struct reftable_iterator *it,
+ uint8_t typ);
#endif