minor fixes

Author: mapleFU

src/server/server.cc

@@ -195,7 +195,7 @@ Status Server::Start() {
         auto now_hours = util::GetTimeStamp<std::chrono::hours>();
         if (now_hours >= config_->compaction_checker_range.start &&
             now_hours <= config_->compaction_checker_range.stop) {
-          auto column_family_list = engine::ColumnFamilyConfigs::ListAllColumnFamily();
+          const auto &column_family_list = engine::ColumnFamilyConfigs::ListAllColumnFamily();
           for (auto &column_family : column_family_list) {
             compaction_checker.PickCompactionFilesForCf(column_family);
           }

src/storage/compaction_checker.cc

@@ -30,7 +30,7 @@ void CompactionChecker::CompactPropagateAndPubSubFiles() {
   rocksdb::CompactRangeOptions compact_opts;
   compact_opts.change_level = true;
   for (const auto &cf :
-       {engine::ColumnFamilyConfigs::PubSubColumnFamily(), engine::ColumnFamilyConfigs::PubSubColumnFamily()}) {
+       {engine::ColumnFamilyConfigs::PubSubColumnFamily(), engine::ColumnFamilyConfigs::PropagateColumnFamily()}) {
     LOG(INFO) << "[compaction checker] Start the compact the column family: " << cf.Name();
     auto cf_handle = storage_->GetCFHandle(cf.Id());
     auto s = storage_->GetDB()->CompactRange(compact_opts, cf_handle, nullptr, nullptr);

src/storage/storage.h

@@ -183,7 +183,7 @@ class ColumnFamilyConfigs {
   }
 
   /// ListAllColumnFamily returns all column families in kvrocks.
-  static std::vector<ColumnFamilyConfig> ListAllColumnFamily() {
+  static const std::vector<ColumnFamilyConfig> &ListAllColumnFamily() {
     // Caution: don't change the order of column family, or the handle will be mismatched
     std::vector<ColumnFamilyConfig> all_cfs = {
         PrimarySubkeyColumnFamily(), MetadataColumnFamily(), SecondarySubkeyColumnFamily(), PubSubColumnFamily(),
@@ -251,8 +251,7 @@ class Storage {
   rocksdb::DB *GetDB();
   bool IsClosing() const { return db_closing_; }
   std::string GetName() const { return config_->db_name; }
-  /// Get kvrocks' ColumnFamily in by name
-  /// If we cannot recognize the name, we will return the default ColumnFamily
+  /// Get the column family handle by the column family id.
   rocksdb::ColumnFamilyHandle *GetCFHandle(ColumnFamilyID id);
   std::vector<rocksdb::ColumnFamilyHandle *> *GetCFHandles() { return &cf_handles_; }
   LockManager *GetLockManager() { return &lock_mgr_; }