fix: Use inline variable (OpenAtomFoundation#1407)

bigdaronlee163 · Apr 29, 2023 · 9905576 · 9905576
1 parent 84f6cfc
commit 9905576
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/src/storage/include/storage/backupable.h b/src/storage/include/storage/backupable.h
@@ -14,8 +14,8 @@
 
 namespace storage {
 
-const std::string DEFAULT_BK_PATH = "dump";  // Default backup root dir
-const std::string DEFAULT_RS_PATH = "db";    // Default restore root dir
+inline const std::string DEFAULT_BK_PATH = "dump";  // Default backup root dir
+inline const std::string DEFAULT_RS_PATH = "db";    // Default restore root dir
 
 // Arguments which will used by BackupSave Thread
 // p_engine for BackupEngine handler

diff --git a/src/storage/include/storage/storage.h b/src/storage/include/storage/storage.h
@@ -25,22 +25,22 @@
 
 namespace storage {
 
-const double ZSET_SCORE_MAX = std::numeric_limits<double>::max();
-const double ZSET_SCORE_MIN = std::numeric_limits<double>::lowest();
-
-const std::string PROPERTY_TYPE_ROCKSDB_MEMTABLE = "rocksdb.cur-size-all-mem-tables";
-const std::string PROPERTY_TYPE_ROCKSDB_TABLE_READER = "rocksdb.estimate-table-readers-mem";
-const std::string PROPERTY_TYPE_ROCKSDB_BACKGROUND_ERRORS = "rocksdb.background-errors";
-
-const std::string ALL_DB = "all";
-const std::string STRINGS_DB = "strings";
-const std::string HASHES_DB = "hashes";
-const std::string LISTS_DB = "lists";
-const std::string ZSETS_DB = "zsets";
-const std::string SETS_DB = "sets";
-
-const size_t BATCH_DELETE_LIMIT = 100;
-const size_t COMPACT_THRESHOLD_COUNT = 2000;
+inline constexpr double ZSET_SCORE_MAX = std::numeric_limits<double>::max();
+inline constexpr double ZSET_SCORE_MIN = std::numeric_limits<double>::lowest();
+
+inline const std::string PROPERTY_TYPE_ROCKSDB_MEMTABLE = "rocksdb.cur-size-all-mem-tables";
+inline const std::string PROPERTY_TYPE_ROCKSDB_TABLE_READER = "rocksdb.estimate-table-readers-mem";
+inline const std::string PROPERTY_TYPE_ROCKSDB_BACKGROUND_ERRORS = "rocksdb.background-errors";
+
+inline const std::string ALL_DB = "all";
+inline const std::string STRINGS_DB = "strings";
+inline const std::string HASHES_DB = "hashes";
+inline const std::string LISTS_DB = "lists";
+inline const std::string ZSETS_DB = "zsets";
+inline const std::string SETS_DB = "sets";
+
+inline constexpr size_t BATCH_DELETE_LIMIT = 100;
+inline constexpr size_t COMPACT_THRESHOLD_COUNT = 2000;
 
 using Options = rocksdb::Options;
 using BlockBasedTableOptions = rocksdb::BlockBasedTableOptions;