LevelIterator handle hint_within_lower_bound by itself

Signed-off-by: Yi Wu <yiwu@pingcap.com>

db/table_cache.cc

@@ -189,8 +189,7 @@ InternalIterator* TableCache::NewIterator(
     TableReader** table_reader_ptr, HistogramImpl* file_read_hist,
     bool for_compaction, Arena* arena, bool skip_filters, int level,
     const InternalKey* smallest_compaction_key,
-    const InternalKey* largest_compaction_key, bool hint_within_lower_bound,
-    bool hint_within_upper_bound) {
+    const InternalKey* largest_compaction_key, bool hint_within_upper_bound) {
   PERF_TIMER_GUARD(new_table_iterator_nanos);
 
   Status s;
@@ -247,9 +246,9 @@ InternalIterator* TableCache::NewIterator(
         !options.table_filter(*table_reader->GetTableProperties())) {
       result = NewEmptyInternalIterator<Slice>(arena);
     } else {
-      result = table_reader->NewIterator(
-          options, prefix_extractor, arena, skip_filters, for_compaction,
-          hint_within_lower_bound, hint_within_upper_bound);
+      result = table_reader->NewIterator(options, prefix_extractor, arena,
+                                         skip_filters, for_compaction,
+                                         hint_within_upper_bound);
     }
     if (create_new_table_reader) {
       assert(handle == nullptr);

db/table_cache.h

@@ -63,7 +63,6 @@ class TableCache {
       Arena* arena = nullptr, bool skip_filters = false, int level = -1,
       const InternalKey* smallest_compaction_key = nullptr,
       const InternalKey* largest_compaction_key = nullptr,
-      bool hint_within_lower_bound = false,
       bool hint_within_upper_bound = false);
 
   // If a seek to internal key "k" in specified file finds an entry,

db/version_set.cc

@@ -520,7 +520,7 @@ class LevelIterator final : public InternalIterator {
 
   bool HintWithinLowerBound() override {
     assert(Valid());
-    return file_iter_.HintWithinLowerBound();
+    return hint_within_lower_bound_;
   }
 
   bool HintWithinUpperBound() override {
@@ -580,7 +580,7 @@ class LevelIterator final : public InternalIterator {
       smallest_compaction_key = (*compaction_boundaries_)[file_index_].smallest;
       largest_compaction_key = (*compaction_boundaries_)[file_index_].largest;
     }
-    bool hint_within_lower_bound =
+    hint_within_lower_bound_ =
         read_options_.iterate_lower_bound != nullptr &&
         user_comparator_.Compare(ExtractUserKey(file_smallest_key(file_index_)),
                                  *read_options_.iterate_lower_bound) >= 0;
@@ -594,7 +594,7 @@ class LevelIterator final : public InternalIterator {
         nullptr /* don't need reference to table */, file_read_hist_,
         for_compaction_, nullptr /* arena */, skip_filters_, level_,
         smallest_compaction_key, largest_compaction_key,
-        hint_within_lower_bound, hint_within_upper_bound);
+        hint_within_upper_bound);
   }
 
   TableCache* table_cache_;
@@ -610,6 +610,7 @@ class LevelIterator final : public InternalIterator {
   bool should_sample_;
   bool for_compaction_;
   bool skip_filters_;
+  bool hint_within_lower_bound_ = false;
   size_t file_index_;
   int level_;
   RangeDelAggregator* range_del_agg_;

table/block_based_table_reader.cc

@@ -2565,7 +2565,7 @@ void BlockBasedTableIterator<TBlockIter, TValue>::CheckOutOfBound() {
 InternalIterator* BlockBasedTable::NewIterator(
     const ReadOptions& read_options, const SliceTransform* prefix_extractor,
     Arena* arena, bool skip_filters, bool for_compaction,
-    bool hint_within_lower_bound, bool hint_within_upper_bound) {
+    bool hint_within_upper_bound) {
   bool need_upper_bound_check =
       PrefixExtractorChanged(rep_->table_properties.get(), prefix_extractor);
   const bool kIsNotIndex = false;
@@ -2580,7 +2580,7 @@ InternalIterator* BlockBasedTable::NewIterator(
             prefix_extractor != nullptr,
         need_upper_bound_check, prefix_extractor, kIsNotIndex,
         true /*key_includes_seq*/, true /*index_key_is_full*/, for_compaction,
-        hint_within_lower_bound, hint_within_upper_bound);
+        hint_within_upper_bound);
   } else {
     auto* mem =
         arena->AllocateAligned(sizeof(BlockBasedTableIterator<DataBlockIter>));
@@ -2591,7 +2591,7 @@ InternalIterator* BlockBasedTable::NewIterator(
             prefix_extractor != nullptr,
         need_upper_bound_check, prefix_extractor, kIsNotIndex,
         true /*key_includes_seq*/, true /*index_key_is_full*/, for_compaction,
-        hint_within_lower_bound, hint_within_upper_bound);
+        hint_within_upper_bound);
   }
 }
 

table/block_based_table_reader.h

@@ -112,7 +112,6 @@ class BlockBasedTable : public TableReader {
                                 Arena* arena = nullptr,
                                 bool skip_filters = false,
                                 bool for_compaction = false,
-                                bool within_lower_bound = false,
                                 bool within_upper_bound = false) override;
 
   FragmentedRangeTombstoneIterator* NewRangeTombstoneIterator(
@@ -580,7 +579,6 @@ class BlockBasedTableIterator : public InternalIteratorBase<TValue> {
                           bool key_includes_seq = true,
                           bool index_key_is_full = true,
                           bool for_compaction = false,
-                          bool hint_within_lower_bound = false,
                           bool hint_within_upper_bound = false)
       : table_(table),
         read_options_(read_options),
@@ -596,7 +594,6 @@ class BlockBasedTableIterator : public InternalIteratorBase<TValue> {
         key_includes_seq_(key_includes_seq),
         index_key_is_full_(index_key_is_full),
         for_compaction_(for_compaction),
-        hint_within_lower_bound_(hint_within_lower_bound),
         hint_within_upper_bound_(hint_within_upper_bound) {}
 
   ~BlockBasedTableIterator() { delete index_iter_; }
@@ -638,14 +635,6 @@ class BlockBasedTableIterator : public InternalIteratorBase<TValue> {
   // Whether iterator invalidated for being out of bound.
   bool IsOutOfBound() override { return is_out_of_bound_; }
 
-  bool HintWithinLowerBound() override {
-    assert(Valid());
-    assert(read_options_.iterate_lower_bound != nullptr);
-    // Potentially we can use index key for the previous block as lower bound
-    // of current block, and check if we are wihtin iterate_lower_bound.
-    return hint_within_lower_bound_;
-  }
-
   bool HintWithinUpperBound() override {
     assert(Valid());
     assert(read_options_.iterate_upper_bound != nullptr);
@@ -725,7 +714,6 @@ class BlockBasedTableIterator : public InternalIteratorBase<TValue> {
   bool index_key_is_full_;
   // If this iterator is created for compaction
   bool for_compaction_;
-  const bool hint_within_lower_bound_;
   const bool hint_within_upper_bound_;
   BlockHandle prev_index_value_;
 

table/cuckoo_table_reader.cc

@@ -378,7 +378,7 @@ InternalIterator* CuckooTableReader::NewIterator(
     const ReadOptions& /*read_options*/,
     const SliceTransform* /* prefix_extractor */, Arena* arena,
     bool /*skip_filters*/, bool /*for_compaction*/,
-    bool /*hint_within_lower_bound*/, bool /*hint_within_upper_bound*/) {
+    bool /*hint_within_upper_bound*/) {
   if (!status().ok()) {
     return NewErrorInternalIterator<Slice>(
         Status::Corruption("CuckooTableReader status is not okay."), arena);

table/cuckoo_table_reader.h

@@ -50,7 +50,6 @@ class CuckooTableReader: public TableReader {
                                 Arena* arena = nullptr,
                                 bool skip_filters = false,
                                 bool for_compaction = false,
-                                bool hint_within_lower_bound = false,
                                 bool hint_within_upper_bound = false) override;
   void Prepare(const Slice& target) override;
 

table/mock_table.cc

@@ -29,7 +29,7 @@ stl_wrappers::KVMap MakeMockFile(
 InternalIterator* MockTableReader::NewIterator(
     const ReadOptions&, const SliceTransform* /* prefix_extractor */,
     Arena* /*arena*/, bool /*skip_filters*/, bool /*for_compaction*/,
-    bool /*hint_within_lower_bound*/, bool /*hint_within_upper_bound*/) {
+    bool /*hint_within_upper_bound*/) {
   return new MockTableIterator(table_);
 }
 

table/mock_table.h

@@ -43,7 +43,6 @@ class MockTableReader : public TableReader {
                                 Arena* arena = nullptr,
                                 bool skip_filters = false,
                                 bool for_compaction = false,
-                                bool hint_within_lower_bound = false,
                                 bool hint_within_upper_bound = false) override;
 
   Status Get(const ReadOptions& readOptions, const Slice& key,

table/plain_table_reader.cc

@@ -196,7 +196,7 @@ void PlainTableReader::SetupForCompaction() {
 InternalIterator* PlainTableReader::NewIterator(
     const ReadOptions& options, const SliceTransform* /* prefix_extractor */,
     Arena* arena, bool /*skip_filters*/, bool /*for_compaction*/,
-    bool /*hint_within_lower_bound*/, bool /*hint_within_upper_bound*/) {
+    bool /*hint_within_upper_bound*/) {
   bool use_prefix_seek = !IsTotalOrderMode() && !options.total_order_seek;
   if (arena == nullptr) {
     return new PlainTableIterator(this, use_prefix_seek);

table/plain_table_reader.h

@@ -80,7 +80,6 @@ class PlainTableReader: public TableReader {
                                 Arena* arena = nullptr,
                                 bool skip_filters = false,
                                 bool for_compaction = false,
-                                bool hint_within_lower_bound = false,
                                 bool hint_within_upper_bound = false) override;
 
   void Prepare(const Slice& target) override;

table/table_reader.h

@@ -46,8 +46,7 @@ class TableReader {
   virtual InternalIterator* NewIterator(
       const ReadOptions&, const SliceTransform* prefix_extractor,
       Arena* arena = nullptr, bool skip_filters = false,
-      bool for_compaction = false, bool hint_within_lower_bound = false,
-      bool hint_within_upper_bound = false) = 0;
+      bool for_compaction = false, bool hint_within_upper_bound = false) = 0;
 
   virtual FragmentedRangeTombstoneIterator* NewRangeTombstoneIterator(
       const ReadOptions& /*read_options*/) {