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

ircd:Ⓜ️:room::state: Refactor the prefetch() interface.

Browse source
This commit is contained in:
Jason Volk 2019-09-18 13:34:23 -07:00
parent 83cce03f6f
commit c12205e39b
2 changed files with 25 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/ircd/m/room/state.h
View file

@ -81,9 +81,9 @@ struct ircd::m::room::state
event::idx get(std::nothrow_t, const string_view &type, const string_view &state_key = "") const;
event::idx get(const string_view &type, const string_view &state_key = "") const;
// Initiate a database prefetch on the state to cache for future access.
size_t prefetch(const string_view &type, const event::idx &start = 0, const event::idx &stop = 0) const;
size_t prefetch(const event::idx &start = 0, const event::idx &stop = 0) const;
// Prefetch state cells
bool prefetch(const string_view &type, const string_view &state_key) const;
bool prefetch(const string_view &type) const;
state(const m::room &room, const event::fetch::opts *const & = nullptr);
state() = default;
@ -95,7 +95,6 @@ struct ircd::m::room::state
static event::idx prev(const event::idx &);
static event::idx next(const event::idx &);
static size_t prefetch(const state &, const string_view &, const event::idx_range &);
static bool present(const event::idx &);
static size_t purge_replaced(const room::id &);
static bool is(std::nothrow_t, const event::idx &);

59
ircd/m_room.cc
View file

@ -233,35 +233,6 @@ ircd::m::room::state::present(const event::idx &event_idx)
return state_idx == event_idx;
}
size_t
ircd::m::room::state::prefetch(const state &state,
const string_view &type,
const event::idx_range &range)
{
const m::event::fetch::opts &fopts
{
state.fopts?
*state.fopts:
m::event::fetch::default_opts
};
size_t ret{0};
state.for_each(type, m::event::closure_idx{[&ret, &fopts, &range]
(const m::event::idx &event_idx)
{
if(event_idx < range.first)
return;
if(range.second && event_idx > range.second)
return;
ret += m::prefetch(event_idx, fopts);
}});
ctx::yield();
return ret;
}
ircd::m::event::idx
ircd::m::room::state::prev(const event::idx &event_idx)
{
@ -1874,21 +1845,35 @@ ircd::m::room::state::state(const m::room &room,
{
}
size_t
ircd::m::room::state::prefetch(const event::idx &start,
const event::idx &stop)
bool
ircd::m::room::state::prefetch(const string_view &type)
const
{
return prefetch(string_view{}, start, stop);
return prefetch(type, string_view{});
}
size_t
bool
ircd::m::room::state::prefetch(const string_view &type,
const event::idx &start,
const event::idx &stop)
const string_view &state_key)
const
{
return prefetch(*this, type, event::idx_range{start, stop});
if(!present())
{
const history history
{
room_id, event_id
};
return history.prefetch(type, state_key);
}
char buf[dbs::ROOM_STATE_KEY_MAX_SIZE];
const auto &key
{
dbs::room_state_key(buf, room_id, type, state_key)
};
return db::prefetch(dbs::room_state, key);
}
ircd::m::event::idx