From 45fac7f3668c319e79039ee1355a9fdb68847b68 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Sat, 10 Oct 2020 13:01:51 +0800
Subject: [PATCH] 1

---
 server/rankserver/guildmgr.cc | 14 +++++++-------
 server/rankserver/guildmgr.h  |  5 +++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/server/rankserver/guildmgr.cc b/server/rankserver/guildmgr.cc
index efeb876..1587366 100644
--- a/server/rankserver/guildmgr.cc
+++ b/server/rankserver/guildmgr.cc
@@ -448,8 +448,8 @@ cs::MFGuildBasic* GuildMgr::GetGuildByName(int gameid, int channel, const std::s
 
 std::vector<cs::MFGuildBasic*>* GuildMgr::GetGuildRank(int gameid)
 {
-    auto itr = sorted_game_guild_list_.find(gameid);
-    return itr != sorted_game_guild_list_.end() ? &itr->second : nullptr;
+    auto itr = rank_list_.find(gameid);
+    return itr != rank_list_.end() ? &itr->second : nullptr;
 }
 
 void GuildMgr::AddGuild(cs::MFGuildBasic* guild)
@@ -641,14 +641,14 @@ void GuildMgr::GenGuildRank()
     auto force_rank_list =
         [this] (int gameid) -> std::vector<cs::MFGuildBasic*>&
         {
-            auto itr = sorted_game_guild_list_.find(gameid);
-            if (itr != sorted_game_guild_list_.end()) {
+            auto itr = rank_list_.find(gameid);
+            if (itr != rank_list_.end()) {
                 return itr->second;
             }
-            sorted_game_guild_list_[gameid] = std::vector<cs::MFGuildBasic*>();
-            return sorted_game_guild_list_[gameid];
+            rank_list_[gameid] = std::vector<cs::MFGuildBasic*>();
+            return rank_list_[gameid];
         };
-    sorted_game_guild_list_.clear();
+    rank_list_.clear();
     for (auto& pair : id_hash_) {
         auto guild = pair.second;
         std::vector<cs::MFGuildBasic*>& rank_list = force_rank_list(guild->_gameid());
diff --git a/server/rankserver/guildmgr.h b/server/rankserver/guildmgr.h
index 68a0abf..1dec073 100644
--- a/server/rankserver/guildmgr.h
+++ b/server/rankserver/guildmgr.h
@@ -7,6 +7,7 @@ namespace cs
     class MFGuildBasic;
 }
 
+struct timer_list;
 class GuildMgr : public a8::Singleton<GuildMgr>
 {
  private:
@@ -50,6 +51,6 @@ class GuildMgr : public a8::Singleton<GuildMgr>
     std::map<int, int> sync_db_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_;
-    std::map<std::string, std::set<long long>> search_cache_;
+    std::map<int, std::vector<cs::MFGuildBasic*>> rank_list_;
+    std::map<std::string, std::tuple<timer_list*, std::set<long long>>> search_cache_;
 };