diff options
Diffstat (limited to 'reftable/merged.h')
| -rw-r--r-- | reftable/merged.h | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/reftable/merged.h b/reftable/merged.h index 7d9f95d27e..89bd0c4b35 100644 --- a/reftable/merged.h +++ b/reftable/merged.h @@ -9,11 +9,11 @@ https://developers.google.com/open-source/licenses/bsd #ifndef MERGED_H #define MERGED_H -#include "pq.h" +#include "system.h" struct reftable_merged_table { - struct reftable_table *stack; - size_t stack_len; + struct reftable_reader **readers; + size_t readers_len; uint32_t hash_id; /* If unset, produce deletions. This is useful for compaction. For the @@ -24,15 +24,10 @@ struct reftable_merged_table { uint64_t max; }; -struct merged_iter { - struct reftable_iterator *stack; - uint32_t hash_id; - size_t stack_len; - uint8_t typ; - int suppress_deletions; - struct merged_iter_pqueue pq; -}; +struct reftable_iterator; -void merged_table_release(struct reftable_merged_table *mt); +int merged_table_init_iter(struct reftable_merged_table *mt, + struct reftable_iterator *it, + uint8_t typ); #endif |