Fix code style

apache · Jun 1, 2024 · 26ac817 · 26ac817
1 parent f9f1bb4
commit 26ac817
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/server/namespace.cc b/src/server/namespace.cc
@@ -51,7 +51,7 @@ bool Namespace::IsAllowModify() const {
   return config->HasConfigFile() || config->repl_namespace_enabled;
 }
 
-Status Namespace::loadFromDB(std::map<std::string, std::string>* dbTokens) const {
+Status Namespace::loadFromDB(std::map<std::string, std::string>* db_tokens) const {
   std::string value;
   auto s = storage_->Get(rocksdb::ReadOptions(), cf_, kNamespaceDBKey, &value);
   if (!s.ok()) {
@@ -61,7 +61,7 @@ Status Namespace::loadFromDB(std::map<std::string, std::string>* dbTokens) const
 
   jsoncons::json j = jsoncons::json::parse(value);
   for (const auto& iter : j.object_range()) {
-    dbTokens->insert({iter.key(), iter.value().as_string()});
+    db_tokens->insert({iter.key(), iter.value().as_string()});
   }
   return Status::OK();
 }
@@ -71,18 +71,18 @@ Status Namespace::LoadAndRewrite() {
   // Namespace is NOT allowed in the cluster mode, so we don't need to rewrite here.
   if (config->cluster_enabled) return Status::OK();
 
-  std::map<std::string, std::string> dbTokens;
-  auto s = loadFromDB(&dbTokens);
+  std::map<std::string, std::string> db_tokens;
+  auto s = loadFromDB(&db_tokens);
   if (!s.IsOK()) return s;
 
-  if (!dbTokens.empty() && !config->repl_namespace_enabled) {
+  if (!db_tokens.empty() && !config->repl_namespace_enabled) {
     return {Status::NotOK, "cannot switch off repl_namespace_enabled when namespaces exist in db"};
   }
 
   // Load from the configuration file first
   tokens_ = config->load_tokens;
   // Merge the tokens from the database if the token is not in the configuration file
-  for (const auto& iter : dbTokens) {
+  for (const auto& iter : db_tokens) {
     if (tokens_.find(iter.first) == tokens_.end()) {
       tokens_[iter.first] = iter.second;
     }

diff --git a/src/server/namespace.h b/src/server/namespace.h
@@ -48,5 +48,5 @@ class Namespace {
   rocksdb::ColumnFamilyHandle *cf_ = nullptr;
   std::map<std::string, std::string> tokens_;
 
-  Status loadFromDB(std::map<std::string, std::string> *dbTokens) const;
+  Status loadFromDB(std::map<std::string, std::string> *db_tokens) const;
 };