CR Updates

speedb-io · Sep 23, 2023 · 4c3c246 · 4c3c246
1 parent b8073ac
commit 4c3c246
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/db/column_family.cc b/db/column_family.cc
@@ -1665,14 +1665,14 @@ VersionStorageInfo* ColumnFamilyData::TEST_GetCurrentStorageInfo() {
   return current_->storage_info();
 }
 
-int ColumnFamilyData::IsLastLevelWithData(int level) const {
+bool ColumnFamilyData::IsLastLevelWithData(int level) const {
   auto* vstorage = current_->storage_info();
   assert(vstorage);
 
   int last_level_with_data = vstorage->num_non_empty_levels() - 1;
 
   auto is_last_level_with_data = false;
-  if ((level > 0) and (level == last_level_with_data)) {
+  if ((level > 0) && (level == last_level_with_data)) {
     is_last_level_with_data = true;
   }
 

diff --git a/db/column_family.h b/db/column_family.h
@@ -481,7 +481,7 @@ class ColumnFamilyData {
   WriteStallCondition RecalculateWriteStallConditions(
       const MutableCFOptions& mutable_cf_options);
 
-  int IsLastLevelWithData(int level) const;
+  bool IsLastLevelWithData(int level) const;
 
   // REQUIREMENT: db mutex must be held
   double TEST_CalculateWriteDelayDivider(

diff --git a/db/table_cache.cc b/db/table_cache.cc
@@ -69,7 +69,7 @@ TableCache::TableCache(const ImmutableOptions& ioptions,
                        BlockCacheTracer* const block_cache_tracer,
                        const std::shared_ptr<IOTracer>& io_tracer,
                        const std::string& db_session_id,
-                       IsLastLevelWithDataFunc is_last_leve_with_data_func)
+                       IsLastLevelWithDataFunc is_last_level_with_data_func)
     : ioptions_(ioptions),
       file_options_(*file_options),
       cache_(cache),
@@ -78,7 +78,7 @@ TableCache::TableCache(const ImmutableOptions& ioptions,
       loader_mutex_(kLoadConcurency, kGetSliceNPHash64UnseededFnPtr),
       io_tracer_(io_tracer),
       db_session_id_(db_session_id),
-      is_last_leve_with_data_func_(is_last_leve_with_data_func) {
+      is_last_level_with_data_func_(is_last_level_with_data_func) {
   if (ioptions_.row_cache) {
     // If the same cache is shared by multiple instances, we need to
     // disambiguate its entries.
@@ -141,8 +141,8 @@ Status TableCache::GetTableReader(
     }
 
     auto is_last_level_with_data = is_bottom;
-    if (is_last_leve_with_data_func_) {
-      is_last_level_with_data = is_last_leve_with_data_func_(level);
+    if (is_last_level_with_data_func_) {
+      is_last_level_with_data = is_last_level_with_data_func_(level);
     }
 
     TableReaderOptions table_reader_options(

diff --git a/db/table_cache.h b/db/table_cache.h
@@ -59,7 +59,7 @@ class TableCache {
              BlockCacheTracer* const block_cache_tracer,
              const std::shared_ptr<IOTracer>& io_tracer,
              const std::string& db_session_id,
-             IsLastLevelWithDataFunc is_last_leve_with_data_func = nullptr);
+             IsLastLevelWithDataFunc is_last_level_with_data_func = nullptr);
   ~TableCache();
 
   // Cache interface for table cache
@@ -278,7 +278,7 @@ class TableCache {
   std::shared_ptr<IOTracer> io_tracer_;
   std::string db_session_id_;
   Cache::ItemOwnerId cache_owner_id_ = Cache::kUnknownItemOwnerId;
-  IsLastLevelWithDataFunc is_last_leve_with_data_func_;
+  IsLastLevelWithDataFunc is_last_level_with_data_func_;
 };
 
 }  // namespace ROCKSDB_NAMESPACE