allow no_io for VersionSet::GetTableProperties (tikv#211)

* allow no_io for VersionSet::GetTableProperties Signed-off-by: qupeng <[email protected]> Signed-off-by: tabokie <[email protected]>
tabokie · May 11, 2022 · 809cb4a · 809cb4a
1 parent 21ec181
commit 809cb4a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/db/compaction/compaction.cc b/db/compaction/compaction.cc
@@ -553,7 +553,8 @@ std::unique_ptr<CompactionFilter> Compaction::CreateCompactionFilter(
   for (auto l = inputs_.begin(); l != inputs_.end(); ++l) {
     for (auto f = l->files.begin(); f != l->files.end(); ++f) {
       std::shared_ptr<const TableProperties> tp;
-      Status s = input_version_->GetTableProperties(&tp, *f);
+      Status s =
+          input_version_->GetTableProperties(&tp, *f, nullptr, false /*no_io*/);
       assert(s.ok());
       context.file_numbers.push_back((*f)->fd.GetNumber());
       context.table_properties.push_back(tp);

diff --git a/db/version_set.cc b/db/version_set.cc
@@ -1239,12 +1239,12 @@ void LevelIterator::InitFileIterator(size_t new_file_index) {
 
 Status Version::GetTableProperties(std::shared_ptr<const TableProperties>* tp,
                                    const FileMetaData* file_meta,
-                                   const std::string* fname) const {
+                                   const std::string* fname, bool no_io) const {
   auto table_cache = cfd_->table_cache();
   auto ioptions = cfd_->ioptions();
   Status s = table_cache->GetTableProperties(
       file_options_, cfd_->internal_comparator(), file_meta->fd, tp,
-      mutable_cf_options_.prefix_extractor, true /* no io */);
+      mutable_cf_options_.prefix_extractor, no_io);
   if (s.ok()) {
     return s;
   }

diff --git a/db/version_set.h b/db/version_set.h
@@ -772,7 +772,8 @@ class Version {
   // file-name conversion.
   Status GetTableProperties(std::shared_ptr<const TableProperties>* tp,
                             const FileMetaData* file_meta,
-                            const std::string* fname = nullptr) const;
+                            const std::string* fname = nullptr,
+                            bool no_io = true) const;
 
   // REQUIRES: lock is held
   // On success, *props will be populated with all SSTables' table properties.