diff --git a/db/range_del_aggregator.cc b/db/range_del_aggregator.cc index 10d22fbb68802467c3b3205066e38cd746c5ce35..fdd847a7ac3de5a7a487be1ca70f85ced77de734 100644 --- a/db/range_del_aggregator.cc +++ b/db/range_del_aggregator.cc @@ -536,11 +536,4 @@ bool RangeDelAggregator::IsEmpty() { return true; } -bool RangeDelAggregator::AddFile(uint64_t file_number) { - if (added_files_ == nullptr) { - added_files_.reset(new std::set()); - } - return added_files_->emplace(file_number).second; -} - } // namespace rocksdb diff --git a/db/range_del_aggregator.h b/db/range_del_aggregator.h index 1c1402d29ded54c859bb9f92a4efb1fa817e432d..f050e8917e0bf8a21f4a4516bd5dabec9ecb3ce3 100644 --- a/db/range_del_aggregator.h +++ b/db/range_del_aggregator.h @@ -6,7 +6,6 @@ #pragma once #include -#include #include #include @@ -141,7 +140,6 @@ class RangeDelAggregator { CompactionIterationStats* range_del_out_stats = nullptr, bool bottommost_level = false); bool IsEmpty(); - bool AddFile(uint64_t file_number); private: // Maps tombstone user start key -> tombstone object @@ -182,10 +180,6 @@ class RangeDelAggregator { const InternalKeyComparator& icmp_; // collapse range deletions so they're binary searchable const bool collapse_deletions_; - - // Record files whose tombstones have been added, to avoid duplicate adding. - // Same as rep_, we initializes it lazily. - std::unique_ptr> added_files_; }; } // namespace rocksdb diff --git a/db/table_cache.cc b/db/table_cache.cc index a3c02fa8be48099c89a0c71bacd1022d65bc637c..a4f2b2cebb7681950c73b1ec889a78ab5c0403ac 100644 --- a/db/table_cache.cc +++ b/db/table_cache.cc @@ -247,15 +247,13 @@ InternalIterator* TableCache::NewIterator( } } if (s.ok() && range_del_agg != nullptr && !options.ignore_range_deletions) { - if (range_del_agg->AddFile(fd.GetNumber())) { - std::unique_ptr range_del_iter( - table_reader->NewRangeTombstoneIterator(options)); - if (range_del_iter != nullptr) { - s = range_del_iter->status(); - } - if (s.ok()) { - s = range_del_agg->AddTombstones(std::move(range_del_iter)); - } + std::unique_ptr range_del_iter( + table_reader->NewRangeTombstoneIterator(options)); + if (range_del_iter != nullptr) { + s = range_del_iter->status(); + } + if (s.ok()) { + s = range_del_agg->AddTombstones(std::move(range_del_iter)); } }