From 68ffcf50d31d5046f1880d24683ba1ce7b672f78 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Fri, 9 Oct 2020 14:53:37 +0800
Subject: [PATCH] 1

---
 server/rankserver/guildmgr.cc | 18 +++++++-----------
 server/rankserver/guildmgr.h  |  4 ++--
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/server/rankserver/guildmgr.cc b/server/rankserver/guildmgr.cc
index e7194ad..41654d4 100644
--- a/server/rankserver/guildmgr.cc
+++ b/server/rankserver/guildmgr.cc
@@ -142,7 +142,7 @@ void GuildMgr::__GuildSearch(f8::JsonHttpRequest* request)
     request->resp_xobj->SetVal("curr_page", curr_page);
     request->resp_xobj->SetVal("page_size", page_size);
     a8::MutableXObject* guild_list = a8::MutableXObject::NewArray();
-    for (auto& pair : guild_hash_) {
+    for (auto& pair : id_hash_) {
         cs::MFGuildBasic* guild = pair.second;
         if (guild->guild_name().find(search_name) != std::string::npos) {
             ++total_count;
@@ -295,8 +295,8 @@ void GuildMgr::__GenTestData(f8::JsonHttpRequest* request)
 
 cs::MFGuildBasic* GuildMgr::GetGuild(long long guild_id)
 {
-    auto itr = guild_hash_.find(guild_id);
-    return itr != guild_hash_.end() ? itr->second : nullptr;
+    auto itr = id_hash_.find(guild_id);
+    return itr != id_hash_.end() ? itr->second : nullptr;
 }
 
 std::vector<cs::MFGuildBasic*>* GuildMgr::GetGuildRank(int gameid)
@@ -307,7 +307,8 @@ std::vector<cs::MFGuildBasic*>* GuildMgr::GetGuildRank(int gameid)
 
 void GuildMgr::AddGuild(cs::MFGuildBasic* guild)
 {
-    guild_hash_[guild->guild_id()] = guild;
+    id_hash_[guild->guild_id()] = guild;
+    name_hash_[guild->guild_name()] = guild;
 }
 
 void GuildMgr::LoadGuild(int instance_id, long long last_idx)
@@ -435,7 +436,7 @@ void GuildMgr::OnOneDBDone(int instance_id)
     }
     a8::UdpLog::Instance()->Debug("%d db done", {instance_id});
     if (load_done_) {
-        a8::UdpLog::Instance()->Debug("all db done guild_num:%d", {guild_hash_.size()});
+        a8::UdpLog::Instance()->Debug("all db done guild_num:%d", {id_hash_.size()});
         GenGuildRank();
         InstallSyncGuildTimer();
     }
@@ -498,7 +499,7 @@ void GuildMgr::GenGuildRank()
             return sorted_game_guild_list_[gameid];
         };
     sorted_game_guild_list_.clear();
-    for (auto& pair : guild_hash_) {
+    for (auto& pair : id_hash_) {
         auto guild = pair.second;
         std::vector<cs::MFGuildBasic*>& rank_list = force_rank_list(guild->_gameid());
         UpdateRank(rank_list, guild);
@@ -507,11 +508,6 @@ void GuildMgr::GenGuildRank()
 
 void GuildMgr::ResortRank(std::vector<cs::MFGuildBasic*>& rank_list)
 {
-    if (rank_list.size() == 41) {
-        for (int i = 0; i < rank_list.size(); ++i) {
-            printf("%d guild_id:%lld\n", i, rank_list[i]->guild_id());
-        }
-    }
     #if 0
     std::sort(rank_list.begin(),
               rank_list.end(),
diff --git a/server/rankserver/guildmgr.h b/server/rankserver/guildmgr.h
index 02e61da..d0e5b18 100644
--- a/server/rankserver/guildmgr.h
+++ b/server/rankserver/guildmgr.h
@@ -44,7 +44,7 @@ class GuildMgr : public a8::Singleton<GuildMgr>
     bool load_done_ = false;
     std::map<int, int> pending_db_hash_;
     std::map<int, int> sync_db_hash_;
-    std::map<long long, cs::MFGuildBasic*> guild_hash_;
-    std::map<std::string, cs::MFGuildBasic*> guild_name_hash_;
+    std::map<long long, cs::MFGuildBasic*> id_hash_;
+    std::map<std::string, cs::MFGuildBasic*> name_hash_;
     std::map<int, std::vector<cs::MFGuildBasic*>> sorted_game_guild_list_;
 };