server/relation
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2020-10-09 14:53:37 +08:00
parent 3392d7d81e
commit 68ffcf50d3
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/rankserver/guildmgr.cc
View File

@ -142,7 +142,7 @@ void GuildMgr::__GuildSearch(f8::JsonHttpRequest* request)
request->resp_xobj->SetVal("curr_page", curr_page); request->resp_xobj->SetVal("curr_page", curr_page);
request->resp_xobj->SetVal("page_size", page_size); request->resp_xobj->SetVal("page_size", page_size);
a8::MutableXObject* guild_list = a8::MutableXObject::NewArray(); a8::MutableXObject* guild_list = a8::MutableXObject::NewArray();
for (auto& pair : guild_hash_) { for (auto& pair : id_hash_) {
cs::MFGuildBasic* guild = pair.second; cs::MFGuildBasic* guild = pair.second;
if (guild->guild_name().find(search_name) != std::string::npos) { if (guild->guild_name().find(search_name) != std::string::npos) {
++total_count; ++total_count;
@ -295,8 +295,8 @@ void GuildMgr::__GenTestData(f8::JsonHttpRequest* request)
cs::MFGuildBasic* GuildMgr::GetGuild(long long guild_id) cs::MFGuildBasic* GuildMgr::GetGuild(long long guild_id)
{ {
auto itr = guild_hash_.find(guild_id); auto itr = id_hash_.find(guild_id);
return itr != guild_hash_.end() ? itr->second : nullptr; return itr != id_hash_.end() ? itr->second : nullptr;
} }
std::vector<cs::MFGuildBasic*>* GuildMgr::GetGuildRank(int gameid) 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) 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) 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}); a8::UdpLog::Instance()->Debug("%d db done", {instance_id});
if (load_done_) { 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(); GenGuildRank();
InstallSyncGuildTimer(); InstallSyncGuildTimer();
} }
@ -498,7 +499,7 @@ void GuildMgr::GenGuildRank()
return sorted_game_guild_list_[gameid]; return sorted_game_guild_list_[gameid];
}; };
sorted_game_guild_list_.clear(); sorted_game_guild_list_.clear();
for (auto& pair : guild_hash_) { for (auto& pair : id_hash_) {
auto guild = pair.second; auto guild = pair.second;
std::vector<cs::MFGuildBasic*>& rank_list = force_rank_list(guild->_gameid()); std::vector<cs::MFGuildBasic*>& rank_list = force_rank_list(guild->_gameid());
UpdateRank(rank_list, guild); UpdateRank(rank_list, guild);
@ -507,11 +508,6 @@ void GuildMgr::GenGuildRank()
void GuildMgr::ResortRank(std::vector<cs::MFGuildBasic*>& rank_list) 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 #if 0
std::sort(rank_list.begin(), std::sort(rank_list.begin(),
rank_list.end(), rank_list.end(),

4
server/rankserver/guildmgr.h
View File

@ -44,7 +44,7 @@ class GuildMgr : public a8::Singleton<GuildMgr>
bool load_done_ = false; bool load_done_ = false;
std::map<int, int> pending_db_hash_; std::map<int, int> pending_db_hash_;
std::map<int, int> sync_db_hash_; std::map<int, int> sync_db_hash_;
std::map<long long, cs::MFGuildBasic*> guild_hash_; std::map<long long, cs::MFGuildBasic*> id_hash_;
std::map<std::string, cs::MFGuildBasic*> guild_name_hash_; std::map<std::string, cs::MFGuildBasic*> name_hash_;
std::map<int, std::vector<cs::MFGuildBasic*>> sorted_game_guild_list_; std::map<int, std::vector<cs::MFGuildBasic*>> sorted_game_guild_list_;
}; };