refactor

PKUHPC · Oct 28, 2024 · 91ffce0 · 91ffce0
1 parent 58bae2e
commit 91ffce0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 21 deletions.
diff --git a/src/CraneCtld/AccountManager.cpp b/src/CraneCtld/AccountManager.cpp
@@ -18,6 +18,7 @@
 
 #include "AccountManager.h"
 
+#include "CtldPublicDefs.h"
 #include "crane/PasswordEntry.h"
 #include "protos/PublicDefs.pb.h"
 #include "range/v3/algorithm/contains.hpp"
@@ -69,7 +70,7 @@ AccountManager::SuccessOrErrCode AccountManager::AddUser(uint32_t uid,
 }
 
 AccountManager::SuccessOrErrCode AccountManager::AddAccount(
-    uint32_t uid, Account&& new_account) {
+    uint32_t uid, const Account& new_account) {
   {
     util::read_lock_guard user_guard(m_rw_user_mutex_);
     util::read_lock_guard account_guard(m_rw_account_mutex_);
@@ -127,7 +128,7 @@ AccountManager::SuccessOrErrCode AccountManager::AddAccount(
       return std::unexpected(CraneErrCode::ERR_ALLOWED_DEFAULT_QOS);
   }
 
-  return AddAccount_(find_account, find_parent, std::move(new_account));
+  return AddAccount_(find_account, find_parent, new_account);
 }
 
 AccountManager::SuccessOrErrCode AccountManager::AddQos(uint32_t uid,
@@ -1748,59 +1749,60 @@ AccountManager::SuccessOrErrCode AccountManager::AddUser_(
 
 AccountManager::SuccessOrErrCode AccountManager::AddAccount_(
     const Account* find_account, const Account* find_parent,
-    Account&& new_account) {
-  const std::string name = new_account.name;
+    const Account& new_account) {
+  Account res_account = new_account;
+  const std::string name = res_account.name;
 
   if (find_parent != nullptr) {
-    if (new_account.allowed_partition.empty()) {
+    if (res_account.allowed_partition.empty()) {
       // Inherit
-      new_account.allowed_partition =
+      res_account.allowed_partition =
           std::list<std::string>{find_parent->allowed_partition};
     }
 
-    if (new_account.allowed_qos_list.empty()) {
+    if (res_account.allowed_qos_list.empty()) {
       // Inherit
-      new_account.allowed_qos_list =
+      res_account.allowed_qos_list =
           std::list<std::string>{find_parent->allowed_qos_list};
     }
   }
 
   mongocxx::client_session::with_transaction_cb callback =
       [&](mongocxx::client_session* session) {
-        if (!new_account.parent_account.empty()) {
+        if (!res_account.parent_account.empty()) {
           // update the parent account's child_account_list
           g_db_client->UpdateEntityOne(MongodbClient::EntityType::ACCOUNT,
-                                       "$addToSet", new_account.parent_account,
+                                       "$addToSet", res_account.parent_account,
                                        "child_accounts", name);
         }
 
         if (find_account) {
           // There is a same account but was deleted,here will delete the
           // original account and overwrite it with the same name
-          g_db_client->UpdateAccount(new_account);
+          g_db_client->UpdateAccount(res_account);
           g_db_client->UpdateEntityOne(MongodbClient::EntityType::ACCOUNT,
                                        "$set", name, "creation_time",
                                        ToUnixSeconds(absl::Now()));
         } else {
           // Insert the new account
-          g_db_client->InsertAccount(new_account);
+          g_db_client->InsertAccount(res_account);
         }
-        for (const auto& qos : new_account.allowed_qos_list) {
+        for (const auto& qos : res_account.allowed_qos_list) {
           IncQosReferenceCountInDb_(qos, 1);
         }
       };
 
   if (!g_db_client->CommitTransaction(callback)) {
     return std::unexpected(CraneErrCode::ERR_UPDATE_DATABASE);
   }
-  if (!new_account.parent_account.empty()) {
-    m_account_map_[new_account.parent_account]->child_accounts.emplace_back(
+  if (!res_account.parent_account.empty()) {
+    m_account_map_[res_account.parent_account]->child_accounts.emplace_back(
         name);
   }
-  for (const auto& qos : new_account.allowed_qos_list) {
+  for (const auto& qos : res_account.allowed_qos_list) {
     m_qos_map_[qos]->reference_count++;
   }
-  m_account_map_[name] = std::make_unique<Account>(std::move(new_account));
+  m_account_map_[name] = std::make_unique<Account>(std::move(res_account));
 
   return true;
 }

diff --git a/src/CraneCtld/AccountManager.h b/src/CraneCtld/AccountManager.h
@@ -54,7 +54,7 @@ class AccountManager {
 
   SuccessOrErrCode AddUser(uint32_t uid, const User& new_user);
 
-  SuccessOrErrCode AddAccount(uint32_t uid, Account&& new_account);
+  SuccessOrErrCode AddAccount(uint32_t uid, const Account& new_account);
 
   SuccessOrErrCode AddQos(uint32_t uid, const Qos& new_qos);
 
@@ -313,7 +313,7 @@ class AccountManager {
 
   SuccessOrErrCode AddAccount_(const Account* find_account,
                                const Account* find_parent,
-                               Account&& new_account);
+                               const Account& new_account);
 
   SuccessOrErrCode AddQos_(const Qos* find_qos, const Qos& new_qos);
 

diff --git a/src/CraneCtld/CtldGrpcServer.cpp b/src/CraneCtld/CtldGrpcServer.cpp
@@ -300,8 +300,7 @@ grpc::Status CraneCtldServiceImpl::AddAccount(
     account.allowed_qos_list.emplace_back(qos);
   }
 
-  auto result =
-      g_account_manager->AddAccount(request->uid(), std::move(account));
+  auto result = g_account_manager->AddAccount(request->uid(), account);
   if (result) {
     response->set_ok(true);
   } else {