MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-29 10:12:39 +01:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:room::events::missing: Dedup inner loop; optimize w/ parallel query.

Browse source
This commit is contained in:
Jason Volk 2022-07-30 20:34:01 -07:00
parent 33094ece07
commit 0ba3c5629f
2 changed files with 44 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/ircd/m/room/events.h
View file

@ -135,6 +135,9 @@ struct ircd::m::room::events::missing
m::room room;
private:
bool _each(m::room::events &, const closure &) const;
public:
bool rfor_each(const pair<int64_t> &depth, const closure &) const;
bool for_each(const pair<int64_t> &depth, const closure &) const;

67
matrix/room_events.cc
View file

@ -471,27 +471,16 @@ const
room, uint64_t(depth.first)
};
bool ret{true};
for(; it && ret; ++it)
for(; it; ++it)
{
if(depth.second && int64_t(it.depth()) > depth.second)
break;
const m::event &event{*it};
const m::event::prev prev{event};
ret = m::for_each(prev, [&](const m::event::id &event_id)
{
if(m::exists(event_id))
return true;
if(!closure(event_id, it.depth(), it.event_idx()))
if(!_each(it, closure))
return false;
return true;
});
}
return ret;
return true;
}
bool
@ -504,8 +493,7 @@ const
room, depth.second?: -1UL
};
bool ret{true};
for(; it && ret; --it)
for(; it; --it)
{
if(depth.second && int64_t(it.depth()) > depth.second)
continue;
@ -513,21 +501,44 @@ const
if(int64_t(it.depth()) < depth.first)
break;
const m::event &event{*it};
const m::event::prev prev{event};
ret = m::for_each(prev, [&](const m::event::id &event_id)
{
if(m::exists(event_id))
return true;
if(!closure(event_id, it.depth(), it.event_idx()))
if(!_each(it, closure))
return false;
return true;
});
}
return ret;
return true;
}
bool
ircd::m::room::events::missing::_each(m::room::events &it,
const closure &closure)
const
{
const m::event event
{
*it
};
const event::prev prev
{
event
};
event::idx idx_buf[event::prev::MAX];
const auto idx
{
prev.idxs(idx_buf)
};
for(size_t i(0); i < idx.size(); ++i)
{
if(idx[i])
continue;
if(!closure(prev.prev_event(i), it.depth(), it.event_idx()))
return false;
}
return true;
}
//