cache_sst_file_iter: bugfix for pinned_iters_mgr_

topling · Sep 28, 2022 · e80fe1b · e80fe1b
1 parent 9a06200
commit e80fe1b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -97,3 +97,4 @@ fuzz/crash-*
 cmake-build-*
 third-party/folly/
 *_dbg
+*_test
diff --git a/db/version_set.cc b/db/version_set.cc
@@ -1105,6 +1105,9 @@ class LevelIterator final : public InternalIterator {
 
   void SetPinnedItersMgr(PinnedIteratorsManager* pinned_iters_mgr) override {
     pinned_iters_mgr_ = pinned_iters_mgr;
+    if (file_iter_cache_) {
+      return;
+    }
     if (file_iter_.iter()) {
       file_iter_.SetPinnedItersMgr(pinned_iters_mgr);
     }
@@ -1165,12 +1168,12 @@ class LevelIterator final : public InternalIterator {
         /*arena=*/nullptr, skip_filters_, level_,
         /*max_file_size_for_l0_meta_pin=*/0, smallest_compaction_key,
         largest_compaction_key, allow_unprepared_value_);
-      if (pinned_iters_mgr_) {
-        iter->SetPinnedItersMgr(pinned_iters_mgr_);
-      }
       if (file_iter_cache_) {
         file_iter_cache_[file_index_] = iter;
       }
+      else if (pinned_iters_mgr_) {
+        iter->SetPinnedItersMgr(pinned_iters_mgr_);
+      }
     }
     return iter;
   }