andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix unused member compile error

Browse Source 
Summary: Pull Request resolved: https://github.com/facebook/rocksdb/pull/4793

Differential Revision: D13509363

Pulled By: abhimadan

fbshipit-source-id: 530b4765e3335d6ecd016bfaa89645f8aa98c61f
This commit is contained in:
Abhishek Madan 2018-12-18 14:10:31 -08:00 committed by Facebook Github Bot
parent 68d949b3e3
commit c15df15f07
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
db/range_del_aggregator.cc
View File

@ -154,17 +154,14 @@ TruncatedRangeDelIterator::SplitBySnapshot(
} }
ForwardRangeDelIterator::ForwardRangeDelIterator( ForwardRangeDelIterator::ForwardRangeDelIterator(
const InternalKeyComparator* icmp, const InternalKeyComparator* icmp)
const std::vector<std::unique_ptr<TruncatedRangeDelIterator>>* iters)
: icmp_(icmp), : icmp_(icmp),
iters_(iters),
unused_idx_(0), unused_idx_(0),
active_seqnums_(SeqMaxComparator()), active_seqnums_(SeqMaxComparator()),
active_iters_(EndKeyMinComparator(icmp)), active_iters_(EndKeyMinComparator(icmp)),
inactive_iters_(StartKeyMinComparator(icmp)) {} inactive_iters_(StartKeyMinComparator(icmp)) {}
bool ForwardRangeDelIterator::ShouldDelete(const ParsedInternalKey& parsed) { bool ForwardRangeDelIterator::ShouldDelete(const ParsedInternalKey& parsed) {
assert(iters_ != nullptr);
// Move active iterators that end before parsed. // Move active iterators that end before parsed.
while (!active_iters_.empty() && while (!active_iters_.empty() &&
icmp_->Compare((*active_iters_.top())->end_key(), parsed) <= 0) { icmp_->Compare((*active_iters_.top())->end_key(), parsed) <= 0) {
@ -200,17 +197,14 @@ void ForwardRangeDelIterator::Invalidate() {
} }
ReverseRangeDelIterator::ReverseRangeDelIterator( ReverseRangeDelIterator::ReverseRangeDelIterator(
const InternalKeyComparator* icmp, const InternalKeyComparator* icmp)
const std::vector<std::unique_ptr<TruncatedRangeDelIterator>>* iters)
: icmp_(icmp), : icmp_(icmp),
iters_(iters),
unused_idx_(0), unused_idx_(0),
active_seqnums_(SeqMaxComparator()), active_seqnums_(SeqMaxComparator()),
active_iters_(StartKeyMaxComparator(icmp)), active_iters_(StartKeyMaxComparator(icmp)),
inactive_iters_(EndKeyMaxComparator(icmp)) {} inactive_iters_(EndKeyMaxComparator(icmp)) {}
bool ReverseRangeDelIterator::ShouldDelete(const ParsedInternalKey& parsed) { bool ReverseRangeDelIterator::ShouldDelete(const ParsedInternalKey& parsed) {
assert(iters_ != nullptr);
// Move active iterators that start after parsed. // Move active iterators that start after parsed.
while (!active_iters_.empty() && while (!active_iters_.empty() &&
icmp_->Compare(parsed, (*active_iters_.top())->start_key()) < 0) { icmp_->Compare(parsed, (*active_iters_.top())->start_key()) < 0) {

14
db/range_del_aggregator.h
View File

@ -110,9 +110,7 @@ struct StartKeyMinComparator {
class ForwardRangeDelIterator { class ForwardRangeDelIterator {
public: public:
ForwardRangeDelIterator( explicit ForwardRangeDelIterator(const InternalKeyComparator* icmp);
const InternalKeyComparator* icmp,
const std::vector<std::unique_ptr<TruncatedRangeDelIterator>>* iters);
bool ShouldDelete(const ParsedInternalKey& parsed); bool ShouldDelete(const ParsedInternalKey& parsed);
void Invalidate(); void Invalidate();
@ -181,7 +179,6 @@ class ForwardRangeDelIterator {
} }
const InternalKeyComparator* icmp_; const InternalKeyComparator* icmp_;
const std::vector<std::unique_ptr<TruncatedRangeDelIterator>>* iters_;
size_t unused_idx_; size_t unused_idx_;
ActiveSeqSet active_seqnums_; ActiveSeqSet active_seqnums_;
BinaryHeap<ActiveSeqSet::const_iterator, EndKeyMinComparator> active_iters_; BinaryHeap<ActiveSeqSet::const_iterator, EndKeyMinComparator> active_iters_;
@ -190,9 +187,7 @@ class ForwardRangeDelIterator {
class ReverseRangeDelIterator { class ReverseRangeDelIterator {
public: public:
ReverseRangeDelIterator( explicit ReverseRangeDelIterator(const InternalKeyComparator* icmp);
const InternalKeyComparator* icmp,
const std::vector<std::unique_ptr<TruncatedRangeDelIterator>>* iters);
bool ShouldDelete(const ParsedInternalKey& parsed); bool ShouldDelete(const ParsedInternalKey& parsed);
void Invalidate(); void Invalidate();
@ -268,7 +263,6 @@ class ReverseRangeDelIterator {
} }
const InternalKeyComparator* icmp_; const InternalKeyComparator* icmp_;
const std::vector<std::unique_ptr<TruncatedRangeDelIterator>>* iters_;
size_t unused_idx_; size_t unused_idx_;
ActiveSeqSet active_seqnums_; ActiveSeqSet active_seqnums_;
BinaryHeap<ActiveSeqSet::const_iterator, StartKeyMaxComparator> active_iters_; BinaryHeap<ActiveSeqSet::const_iterator, StartKeyMaxComparator> active_iters_;
@ -311,8 +305,8 @@ class RangeDelAggregator {
StripeRep(const InternalKeyComparator* icmp, SequenceNumber upper_bound, StripeRep(const InternalKeyComparator* icmp, SequenceNumber upper_bound,
SequenceNumber lower_bound) SequenceNumber lower_bound)
: icmp_(icmp), : icmp_(icmp),
forward_iter_(icmp, &iters_), forward_iter_(icmp),
reverse_iter_(icmp, &iters_), reverse_iter_(icmp),
upper_bound_(upper_bound), upper_bound_(upper_bound),
lower_bound_(lower_bound) {} lower_bound_(lower_bound) {}