MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-09-27 11:18:51 +02:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:room::head: Tolerate erroneous/inconsistent entries in head.

Browse source
This commit is contained in:
Jason Volk 2020-02-19 12:38:07 -08:00
parent 24325c8fc1
commit ec78085e45
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
matrix/room_head.cc
View file

@ -81,6 +81,27 @@ try
head.for_each([&]
(const event::idx &event_idx, const event::id &event_id)
{
// Determine the depth for metrics
const int64_t depth
{
event_id == std::get<0>(top_head)?
std::get<int64_t>(top_head):
m::get<int64_t>(std::nothrow, event_idx, "depth", -1L)
};
if(unlikely(depth < 0))
{
log::derror
{
log, "Missing depth for %s idx:%lu in room head of %s",
string_view{event_id},
event_idx,
string_view{head.room.room_id},
};
return true;
}
// When using the need_my_head option, if we hit a head which
// originated from this server we mark that is no longer needed.
if(need_my_head && event::my(event_idx))
@ -104,14 +125,6 @@ try
// Add this head reference to result to output.
append(out, event_id);
// Determine the depth for metrics
const int64_t depth
{
event_id == std::get<0>(top_head)?
std::get<int64_t>(top_head):
m::get<int64_t>(event_idx, "depth")
};
// Indicate if this depth is highest or lowest of the set.
this->depth[0] = std::min(depth, this->depth[0]);
this->depth[1] = std::max(depth, this->depth[1]);