MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2025-01-13 08:23:56 +01:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:rooms::summary: Refactor for per-origin result synthesis and learning.

Browse source
This commit is contained in:
Jason Volk 2019-09-14 19:51:08 -07:00
parent cd952963da
commit ea33e0326e
6 changed files with 146 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
include/ircd/m/rooms_summary.h
View file

@ -15,20 +15,25 @@
namespace ircd::m::rooms::summary
{
struct fetch;
using closure = std::function<bool (const string_view &, const json::object &)>;
using closure_idx = std::function<bool (const string_view &, const event::idx &)>;
// util
string_view make_state_key(const mutable_buffer &, const room::id &);
room::id::buf unmake_state_key(const string_view &);
string_view make_state_key(const mutable_buffer &, const room::id &, const string_view &origin);
std::pair<room::id, string_view> unmake_state_key(const string_view &);
// observers
bool has(const room::id &);
void chunk(const room &, json::stack::object &chunk);
json::object chunk(const room &, const mutable_buffer &out);
bool for_each(const room::id &, const closure_idx &);
bool for_each(const room::id &, const closure &);
// mutators
event::id::buf set(const room::id &, const json::object &summary);
bool has(const room::id &, const string_view &origin = {});
void get(json::stack::object &chunk, const room &);
json::object get(const mutable_buffer &out, const room &);
event::id::buf set(const room::id &, const string_view &origin, const json::object &summary);
event::id::buf set(const room &);
event::id::buf del(const room &);
event::id::buf del(const room &, const string_view &origin);
void del(const room &);
}
struct ircd::m::rooms::summary::fetch

2
modules/client/publicrooms.cc
View file

@ -169,7 +169,7 @@ get__publicrooms(client &client,
m::rooms::for_each(opts, [&](const m::room::id &room_id)
{
json::stack::object obj{chunk};
m::rooms::summary::chunk(room_id, obj);
m::rooms::summary::get(obj, room_id);
if(!count && !empty(since))
prev_batch_buf = room_id; //TODO: ???

2
modules/federation/publicrooms.cc
View file

@ -116,7 +116,7 @@ handle_get(client &client,
chunk
};
m::rooms::summary::chunk(room_id, obj);
m::rooms::summary::get(obj, room_id);
next_batch_buf = room_id;
return ++count < limit;
});

2
modules/m_room_create.cc
View file

@ -528,7 +528,7 @@ try
// This call sends a message to the !public room to list this room in the
// public rooms list. We set an empty summary for this room because we
// already have its state on this server;
m::rooms::summary::set(room.room_id, json::object{});
m::rooms::summary::set(room.room_id);
}
catch(const std::exception &e)
{

34
modules/m_rooms.cc
View file

@ -95,14 +95,6 @@ ircd::m::rooms::for_each(const opts &opts,
if(opts.server != room_id.host())
return;
if(opts.summary)
if(!summary::has(room))
return;
if(opts.server && opts.summary)
if(!room::aliases(room).count(opts.server))
return;
if(opts.join_rule && !opts.summary)
if(!join_rule(room, opts.join_rule))
return;
@ -137,22 +129,6 @@ ircd::m::rooms::for_each(const opts &opts,
}});
}
// branch for optimized public rooms searches.
if(opts.summary && opts.server)
{
m::room::aliases::cache::for_each(opts.server, [&proffer, &ret]
(const auto &alias, const auto &room_id)
{
if(!m::rooms::summary::has(room_id))
return true;
proffer(room_id);
return ret;
});
return ret;
}
// branch for optimized public rooms searches.
if(opts.summary)
{
@ -166,19 +142,21 @@ ircd::m::rooms::for_each(const opts &opts,
public_room_id
};
const auto proffer_state{[&opts, &proffer, &ret]
state.for_each("ircd.rooms.summary", [&opts, &proffer, &ret]
(const string_view &type, const string_view &state_key, const event::idx &event_idx)
{
const auto room_id
const auto &[room_id, origin]
{
rooms::summary::unmake_state_key(state_key)
};
if(opts.server && origin != opts.server)
return true;
proffer(room_id);
return ret;
}};
});
state.for_each("ircd.rooms", proffer_state);
return ret;
}

184
modules/m_rooms_summary.cc
View file

@ -111,7 +111,7 @@ ircd::m::rooms::summary::fetch::fetch(const string_view &origin,
summary.at("room_id")
};
summary::set(room_id, summary);
summary::set(room_id, origin, summary);
}
this->total_room_count_estimate =
@ -129,9 +129,22 @@ ircd::m::rooms::summary::fetch::fetch(const string_view &origin,
// rooms::summary
//
ircd::m::event::id::buf
void
IRCD_MODULE_EXPORT
ircd::m::rooms::summary::del(const m::room &room)
{
for_each(room, [&room]
(const string_view &origin, const event::idx &event_idx)
{
del(room, origin);
return true;
});
}
ircd::m::event::id::buf
IRCD_MODULE_EXPORT
ircd::m::rooms::summary::del(const m::room &room,
const string_view &origin)
{
const m::room::state state
{
@ -141,12 +154,12 @@ ircd::m::rooms::summary::del(const m::room &room)
char state_key_buf[m::event::STATE_KEY_MAX_SIZE];
const auto state_key
{
make_state_key(state_key_buf, room.room_id)
make_state_key(state_key_buf, room.room_id, origin)
};
const m::event::idx &event_idx
{
state.get(std::nothrow, "ircd.rooms", state_key)
state.get(std::nothrow, "ircd.rooms.summary", state_key)
};
if(!event_idx)
@ -178,35 +191,36 @@ ircd::m::rooms::summary::set(const m::room &room)
const json::object summary
{
chunk(room, buf)
get(buf, room)
};
return set(room.room_id, summary);
return set(room.room_id, my_host(), summary);
}
ircd::m::event::id::buf
IRCD_MODULE_EXPORT
ircd::m::rooms::summary::set(const m::room::id &room_id,
const string_view &origin,
const json::object &summary)
{
char state_key_buf[event::STATE_KEY_MAX_SIZE];
const auto state_key
{
make_state_key(state_key_buf, room_id)
make_state_key(state_key_buf, room_id, origin)
};
return send(public_room_id, m::me, "ircd.rooms", state_key, summary);
return send(public_room_id, m::me, "ircd.rooms.summary", state_key, summary);
}
ircd::json::object
IRCD_MODULE_EXPORT
ircd::m::rooms::summary::chunk(const m::room &room,
const mutable_buffer &buf)
ircd::m::rooms::summary::get(const mutable_buffer &buf,
const m::room &room)
{
json::stack out{buf};
{
json::stack::object obj{out};
chunk(room, obj);
get(obj, room);
}
return json::object
@ -217,42 +231,122 @@ ircd::m::rooms::summary::chunk(const m::room &room,
void
IRCD_MODULE_EXPORT
ircd::m::rooms::summary::chunk(const m::room &room,
json::stack::object &obj)
ircd::m::rooms::summary::get(json::stack::object &obj,
const m::room &room)
{
return exists(room)?
chunk_local(room, obj):
chunk_remote(room, obj);
}
void
ircd::m::rooms::summary::chunk_remote(const m::room &room,
json::stack::object &obj)
bool
IRCD_MODULE_EXPORT
ircd::m::rooms::summary::has(const room::id &room_id,
const string_view &origin)
{
const m::room publix
return !for_each(room_id, [&origin]
(const string_view &_origin, const json::object &summary)
{
if(!origin)
return false;
if(origin && _origin == origin)
return false;
return true;
});
}
bool
IRCD_MODULE_EXPORT
ircd::m::rooms::summary::for_each(const room::id &room_id,
const closure &closure)
{
return for_each(room_id, [&closure]
(const string_view &origin, const event::idx &event_idx)
{
bool ret{true};
m::get(std::nothrow, event_idx, "content", [&closure, &origin, &ret]
(const json::object &content)
{
ret = closure(origin, content);
});
return ret;
});
}
bool
IRCD_MODULE_EXPORT
ircd::m::rooms::summary::for_each(const room::id &room_id,
const closure_idx &closure)
{
const m::room::state state
{
public_room_id
};
char state_key_buf[event::STATE_KEY_MAX_SIZE];
char state_key_buf[m::event::STATE_KEY_MAX_SIZE];
const auto state_key
{
make_state_key(state_key_buf, room.room_id)
make_state_key(state_key_buf, room_id, string_view{})
};
publix.get("ircd.rooms", state_key, [&obj]
(const m::event &event)
bool ret{true};
state.for_each("ircd.rooms.summary", state_key, [&room_id, &closure, &ret]
(const auto &type, const auto &state_key, const auto &event_idx)
{
const json::object &summary
const auto &[_room_id, origin]
{
json::at<"content"_>(event)
unmake_state_key(state_key)
};
for(const auto &member : summary)
json::stack::member m
{
obj, member.first, member.second
};
if(_room_id != room_id)
return false;
if(!closure(origin, event_idx))
ret = false;
return ret;
});
return ret;
}
std::pair<ircd::m::room::id, ircd::string_view>
IRCD_MODULE_EXPORT
ircd::m::rooms::summary::unmake_state_key(const string_view &key)
{
return rsplit(key, '!');
}
ircd::string_view
IRCD_MODULE_EXPORT
ircd::m::rooms::summary::make_state_key(const mutable_buffer &buf,
const m::room::id &room_id,
const string_view &origin)
{
return fmt::sprintf
{
buf, "%s!%s",
string_view{room_id},
origin,
};
}
//
// internal
//
void
ircd::m::rooms::summary::chunk_remote(const m::room &room,
json::stack::object &obj)
{
for_each(room, [&obj]
(const string_view &origin, const json::object &summary)
{
obj.append(summary);
return false;
});
}
@ -385,37 +479,3 @@ ircd::m::rooms::summary::chunk_local(const m::room &room,
};
});
}
bool
IRCD_MODULE_EXPORT
ircd::m::rooms::summary::has(const room::id &room_id)
{
const m::room::state state
{
public_room_id
};
char state_key_buf[m::event::STATE_KEY_MAX_SIZE];
const auto state_key
{
make_state_key(state_key_buf, room_id)
};
return state.has("ircd.rooms", state_key);
}
ircd::m::room::id::buf
IRCD_MODULE_EXPORT
ircd::m::rooms::summary::unmake_state_key(const string_view &key)
{
m::room::id::buf ret;
return m::room::id::unswap(key, ret);
}
ircd::string_view
IRCD_MODULE_EXPORT
ircd::m::rooms::summary::make_state_key(const mutable_buffer &buf,
const m::room::id &room_id)
{
return room_id.swap(buf);
}