mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-17 03:08:26 +00:00
[Zone] Implement zone player count sharding (#4536)
* [Zone] Implement zone player count sharding * Update client.cpp * Update database_instances.cpp * You must request a shard change from the zone you are currently in. * // zone sharding * You cannot request a shard change while in combat. * Query adjustment * Use safe coords * Changes * Fixes to instance query * Push * Push * Final push * Update client.cpp * Update eq_packet_structs.h * Remove pick menu * Comment * Update character_data_repository.h * Update zoning.cpp --------- Co-authored-by: Kinglykrab <kinglykrab@gmail.com>
This commit is contained in:
Chris Miles
GitHub
@@ -117,6 +117,7 @@ public:
|
||||
int32_t min_lava_damage;
|
||||
uint8_t idle_when_empty;
|
||||
uint32_t seconds_before_idle;
|
||||
int32_t shard_at_player_count;
|
||||
};
|
||||
|
||||
static std::string PrimaryKey()
|
||||
@@ -225,6 +226,7 @@ public:
|
||||
"min_lava_damage",
|
||||
"idle_when_empty",
|
||||
"seconds_before_idle",
|
||||
"shard_at_player_count",
|
||||
};
|
||||
}
|
||||
|
||||
@@ -329,6 +331,7 @@ public:
|
||||
"min_lava_damage",
|
||||
"idle_when_empty",
|
||||
"seconds_before_idle",
|
||||
"shard_at_player_count",
|
||||
};
|
||||
}
|
||||
|
||||
@@ -467,6 +470,7 @@ public:
|
||||
e.min_lava_damage = 10;
|
||||
e.idle_when_empty = 1;
|
||||
e.seconds_before_idle = 60;
|
||||
e.shard_at_player_count = 0;
|
||||
|
||||
return e;
|
||||
}
|
||||
@@ -601,6 +605,7 @@ public:
|
||||
e.min_lava_damage = row[95] ? static_cast<int32_t>(atoi(row[95])) : 10;
|
||||
e.idle_when_empty = row[96] ? static_cast<uint8_t>(strtoul(row[96], nullptr, 10)) : 1;
|
||||
e.seconds_before_idle = row[97] ? static_cast<uint32_t>(strtoul(row[97], nullptr, 10)) : 60;
|
||||
e.shard_at_player_count = row[98] ? static_cast<int32_t>(atoi(row[98])) : 0;
|
||||
|
||||
return e;
|
||||
}
|
||||
@@ -731,6 +736,7 @@ public:
|
||||
v.push_back(columns[95] + " = " + std::to_string(e.min_lava_damage));
|
||||
v.push_back(columns[96] + " = " + std::to_string(e.idle_when_empty));
|
||||
v.push_back(columns[97] + " = " + std::to_string(e.seconds_before_idle));
|
||||
v.push_back(columns[98] + " = " + std::to_string(e.shard_at_player_count));
|
||||
|
||||
auto results = db.QueryDatabase(
|
||||
fmt::format(
|
||||
@@ -850,6 +856,7 @@ public:
|
||||
v.push_back(std::to_string(e.min_lava_damage));
|
||||
v.push_back(std::to_string(e.idle_when_empty));
|
||||
v.push_back(std::to_string(e.seconds_before_idle));
|
||||
v.push_back(std::to_string(e.shard_at_player_count));
|
||||
|
||||
auto results = db.QueryDatabase(
|
||||
fmt::format(
|
||||
@@ -977,6 +984,7 @@ public:
|
||||
v.push_back(std::to_string(e.min_lava_damage));
|
||||
v.push_back(std::to_string(e.idle_when_empty));
|
||||
v.push_back(std::to_string(e.seconds_before_idle));
|
||||
v.push_back(std::to_string(e.shard_at_player_count));
|
||||
|
||||
insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
|
||||
}
|
||||
@@ -1108,6 +1116,7 @@ public:
|
||||
e.min_lava_damage = row[95] ? static_cast<int32_t>(atoi(row[95])) : 10;
|
||||
e.idle_when_empty = row[96] ? static_cast<uint8_t>(strtoul(row[96], nullptr, 10)) : 1;
|
||||
e.seconds_before_idle = row[97] ? static_cast<uint32_t>(strtoul(row[97], nullptr, 10)) : 60;
|
||||
e.shard_at_player_count = row[98] ? static_cast<int32_t>(atoi(row[98])) : 0;
|
||||
|
||||
all_entries.push_back(e);
|
||||
}
|
||||
@@ -1230,6 +1239,7 @@ public:
|
||||
e.min_lava_damage = row[95] ? static_cast<int32_t>(atoi(row[95])) : 10;
|
||||
e.idle_when_empty = row[96] ? static_cast<uint8_t>(strtoul(row[96], nullptr, 10)) : 1;
|
||||
e.seconds_before_idle = row[97] ? static_cast<uint32_t>(strtoul(row[97], nullptr, 10)) : 60;
|
||||
e.shard_at_player_count = row[98] ? static_cast<int32_t>(atoi(row[98])) : 0;
|
||||
|
||||
all_entries.push_back(e);
|
||||
}
|
||||
@@ -1402,6 +1412,7 @@ public:
|
||||
v.push_back(std::to_string(e.min_lava_damage));
|
||||
v.push_back(std::to_string(e.idle_when_empty));
|
||||
v.push_back(std::to_string(e.seconds_before_idle));
|
||||
v.push_back(std::to_string(e.shard_at_player_count));
|
||||
|
||||
auto results = db.QueryDatabase(
|
||||
fmt::format(
|
||||
@@ -1522,6 +1533,7 @@ public:
|
||||
v.push_back(std::to_string(e.min_lava_damage));
|
||||
v.push_back(std::to_string(e.idle_when_empty));
|
||||
v.push_back(std::to_string(e.seconds_before_idle));
|
||||
v.push_back(std::to_string(e.shard_at_player_count));
|
||||
|
||||
insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
|
||||
}
|
||||
|
||||
@@ -80,6 +80,93 @@ public:
|
||||
|
||||
return l.empty() ? CharacterDataRepository::NewEntity() : l.front();
|
||||
}
|
||||
|
||||
struct InstancePlayerCount {
|
||||
int32_t instance_id;
|
||||
uint32_t zone_id;
|
||||
uint32_t player_count;
|
||||
};
|
||||
|
||||
static std::vector<InstancePlayerCount> GetInstanceZonePlayerCounts(Database& db, int zone_id) {
|
||||
std::vector<InstancePlayerCount> zone_player_counts;
|
||||
|
||||
uint64_t shard_instance_duration = 3155760000;
|
||||
|
||||
auto query = fmt::format(SQL(
|
||||
SELECT
|
||||
zone_id,
|
||||
0 AS instance_id,
|
||||
COUNT(id) AS player_count
|
||||
FROM
|
||||
character_data
|
||||
WHERE
|
||||
zone_instance = 0
|
||||
AND zone_id = {}
|
||||
AND last_login >= UNIX_TIMESTAMP(NOW()) - 600
|
||||
GROUP BY
|
||||
zone_id
|
||||
ORDER BY
|
||||
zone_id, player_count DESC
|
||||
), zone_id);
|
||||
|
||||
auto results = db.QueryDatabase(query);
|
||||
for (auto row = results.begin(); row != results.end(); ++row) {
|
||||
InstancePlayerCount e{};
|
||||
e.zone_id = std::stoi(row[0]);
|
||||
e.instance_id = 0;
|
||||
e.player_count = std::stoi(row[2]);
|
||||
zone_player_counts.push_back(e);
|
||||
}
|
||||
|
||||
if (zone_player_counts.empty()) {
|
||||
InstancePlayerCount e{};
|
||||
e.zone_id = zone_id;
|
||||
e.instance_id = 0;
|
||||
e.player_count = 0;
|
||||
zone_player_counts.push_back(e);
|
||||
}
|
||||
|
||||
// duration 3155760000 is for shards explicitly
|
||||
query = fmt::format(
|
||||
SQL(
|
||||
SELECT
|
||||
i.id AS instance_id,
|
||||
i.zone AS zone_id,
|
||||
COUNT(c.id) AS player_count
|
||||
FROM
|
||||
instance_list i
|
||||
LEFT JOIN
|
||||
character_data c
|
||||
ON
|
||||
i.zone = c.zone_id
|
||||
AND i.id = c.zone_instance
|
||||
AND c.last_login >= UNIX_TIMESTAMP(NOW()) - 600
|
||||
AND (i.start_time + i.duration >= UNIX_TIMESTAMP(NOW()) OR i.never_expires = 0)
|
||||
AND i.duration = {}
|
||||
WHERE
|
||||
i.zone IS NOT NULL AND i.zone = {}
|
||||
GROUP BY
|
||||
i.id, i.zone, i.version
|
||||
ORDER BY
|
||||
i.id ASC;
|
||||
), shard_instance_duration, zone_id
|
||||
);
|
||||
|
||||
results = db.QueryDatabase(query);
|
||||
if (!results.Success() || results.RowCount() == 0) {
|
||||
return zone_player_counts;
|
||||
}
|
||||
|
||||
for (auto row = results.begin(); row != results.end(); ++row) {
|
||||
InstancePlayerCount e{};
|
||||
e.instance_id = std::stoi(row[0]);
|
||||
e.zone_id = std::stoi(row[1]);
|
||||
e.player_count = std::stoi(row[2]);
|
||||
zone_player_counts.push_back(e);
|
||||
}
|
||||
|
||||
return zone_player_counts;
|
||||
}
|
||||
};
|
||||
|
||||
#endif //EQEMU_CHARACTER_DATA_REPOSITORY_H
|
||||
|
||||
Reference in New Issue
Block a user