Fix bugs after the second review

Author: YuCai18

src/pika_server.cc

@@ -509,14 +509,14 @@ void PikaServer::DBSetSmallCompactionDurationThreshold(uint32_t small_compaction
 void PikaServer::UpdateDBBigKeysConfig() {
   std::shared_lock l(dbs_rw_);
   for (const auto& db_item : dbs_) {
-    db_item.second->DBLockShared();
+    db_item.second->DBLock();
     db_item.second->UpdateStorageBigKeysConfig(
       g_pika_conf->bigkeys_log_interval(),
       g_pika_conf->bigkeys_member_threshold(),
       g_pika_conf->bigkeys_key_value_length_threshold(),
       g_pika_conf->bigkeys_show_limit()
     );
-    db_item.second->DBUnlockShared();
+    db_item.second->DBUnlock();
   }
 }
 
@@ -1919,15 +1919,15 @@ void PikaServer::CacheConfigInit(cache::CacheConfig& cache_cfg) {
 void PikaServer::SetLogNetActivities(bool value) { pika_dispatch_thread_->SetLogNetActivities(value); }
 
 void PikaServer::LogBigKeysInfo() {
-  uint32_t interval_minutes = g_pika_conf->bigkeys_log_interval();
+  uint64_t interval_minutes = g_pika_conf->bigkeys_log_interval();
   if (interval_minutes == 0) {
     return;
   }
 
   thread_local uint64_t last_output_time = 0;
   uint64_t current_time = pstd::NowMicros();
 
-  uint64_t interval_us = static_cast<uint64_t>(interval_minutes) * 60 * 1000000;
+  uint64_t interval_us = interval_minutes * 60 * 1000000;
 
   if (current_time - last_output_time < interval_us) {
     return;

src/storage/src/redis_lists.cc

@@ -73,8 +73,7 @@ Status RedisLists::Open(const StorageOptions& storage_options, const std::string
   column_families.emplace_back(rocksdb::kDefaultColumnFamilyName, meta_cf_ops);
   // Data CF
   column_families.emplace_back("data_cf", data_cf_ops);
-  s = rocksdb::DB::Open(db_ops, db_path, column_families, &handles_, &db_);
-  return s;
+  return rocksdb::DB::Open(db_ops, db_path, column_families, &handles_, &db_);
 }
 
 

src/storage/src/redis_lists.h

@@ -19,6 +19,7 @@ class RedisLists : public Redis {
  public:
   RedisLists(Storage* s, const DataType& type);
   ~RedisLists() override = default;
+  
   // Common commands
   Status Open(const StorageOptions& storage_options, const std::string& db_path) override;
   Status CompactRange(const rocksdb::Slice* begin, const rocksdb::Slice* end,

src/storage/src/redis_sets.cc

@@ -25,8 +25,7 @@ namespace storage {
 RedisSets::RedisSets(Storage* const s, const DataType& type) : Redis(s, type) {
 }
 
-RedisSets::~RedisSets() {
-}
+RedisSets::~RedisSets() = default;
 
 rocksdb::Status RedisSets::Open(const StorageOptions& storage_options, const std::string& db_path) {
   statistics_store_->SetCapacity(storage_options.statistics_max_size);
@@ -71,8 +70,7 @@ rocksdb::Status RedisSets::Open(const StorageOptions& storage_options, const std
   column_families.emplace_back(rocksdb::kDefaultColumnFamilyName, meta_cf_ops);
   // Member CF
   column_families.emplace_back("member_cf", member_cf_ops);
-  s = rocksdb::DB::Open(db_ops, db_path, column_families, &handles_, &db_);
-  return s;
+  return rocksdb::DB::Open(db_ops, db_path, column_families, &handles_, &db_);
 }
 
 rocksdb::Status RedisSets::CompactRange(const rocksdb::Slice* begin, const rocksdb::Slice* end, const ColumnFamilyType& type) {

src/storage/src/redis_streams.cc

@@ -367,11 +367,7 @@ Status RedisStreams::Open(const StorageOptions& storage_options, const std::stri
   column_families.emplace_back(rocksdb::kDefaultColumnFamilyName, meta_cf_ops);
   // Data CF
   column_families.emplace_back("data_cf", data_cf_ops);
-  s = rocksdb::DB::Open(db_ops, db_path, column_families, &handles_, &db_);
-  if (!s.ok()) {
-    return s;
-  }
-  return s;
+  return rocksdb::DB::Open(db_ops, db_path, column_families, &handles_, &db_);
 }
 Status RedisStreams::CompactRange(const rocksdb::Slice* begin, const rocksdb::Slice* end,
                                   const ColumnFamilyType& type) {

src/storage/src/redis_strings.cc

@@ -36,8 +36,7 @@ Status RedisStrings::Open(const StorageOptions& storage_options, const std::stri
   }
   table_ops.filter_policy.reset(rocksdb::NewBloomFilterPolicy(10, true));
   ops.table_factory.reset(rocksdb::NewBlockBasedTableFactory(table_ops));
-  Status s = rocksdb::DB::Open(ops, db_path, &db_);
-  return s;
+  return rocksdb::DB::Open(ops, db_path, &db_);
 }
 
 Status RedisStrings::CompactRange(const rocksdb::Slice* begin, const rocksdb::Slice* end,

src/storage/src/redis_zsets.cc

@@ -83,11 +83,9 @@ Status RedisZSets::Open(const StorageOptions& storage_options, const std::string
   column_families.emplace_back(rocksdb::kDefaultColumnFamilyName, meta_cf_ops);
   column_families.emplace_back("data_cf", data_cf_ops);
   column_families.emplace_back("score_cf", score_cf_ops);
-  s = rocksdb::DB::Open(db_ops, db_path, column_families, &handles_, &db_);
-  return s;
+  return rocksdb::DB::Open(db_ops, db_path, column_families, &handles_, &db_);
 }
 
-
 Status RedisZSets::CompactRange(const rocksdb::Slice* begin, const rocksdb::Slice* end, const ColumnFamilyType& type) {
   if (type == kMeta || type == kMetaAndData) {
     db_->CompactRange(default_compact_range_options_, handles_[0], begin, end);