MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-27 07:54:05 +01:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:room: Optimize the room::membership query fix.

Browse source
This commit is contained in:
Jason Volk 2018-06-02 22:18:45 -07:00
parent 6356f62de2
commit 7743198601
1 changed files with 31 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
ircd/m/room.cc
View file

@ -192,36 +192,53 @@ ircd::m::room::membership(const mutable_buffer &out,
const m::id::user &user_id) const m::id::user &user_id)
const const
{ {
static const event::keys keys static const event::keys membership_keys
{ {
event::keys::include event::keys::include{"membership"}
{
"membership",
"content"
}
}; };
// Since this is a member function of m::room there might be a supplied // Since this is a member function of m::room there might be a supplied
// fopts. Whatever keys it has are irrelevant, but we can preserve gopts. // fopts. Whatever keys it has are irrelevant, but we can preserve gopts.
const m::event::fetch::opts fopts const m::event::fetch::opts fopts
{ {
keys, this->fopts? this->fopts->gopts : db::gopts{} membership_keys, this->fopts? this->fopts->gopts : db::gopts{}
};
const state state
{
*this, &fopts
}; };
string_view ret; string_view ret;
state.get(std::nothrow, "m.room.member"_sv, user_id, [&out, &ret] const auto result_closure{[&out, &ret]
(const m::event &event) (const m::event &event)
{ {
ret = ret =
{ {
data(out), copy(out, m::membership(event)) data(out), copy(out, m::membership(event))
}; };
}); }};
const room::state state{*this, &fopts};
const bool exists
{
state.get(std::nothrow, "m.room.member"_sv, user_id, result_closure)
};
// This branch is taken when the event exists but the event.membership had
// no value. Due to wanton protocol violations event.membership may be
// jsundefined and only event.content.membership will exist in event. This
// is a rare case so both queries are optimized to only seek for their key.
if(exists && !ret)
{
static const event::keys content_membership_keys
{
event::keys::include{"content"}
};
const m::event::fetch::opts fopts
{
content_membership_keys, this->fopts? this->fopts->gopts : db::gopts{}
};
const room::state state{*this, &fopts};
state.get(std::nothrow, "m.room.member"_sv, user_id, result_closure);
}
return ret; return ret;
} }