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:Ⓜ️:events: Refactor for_each interface; split into raw suite.

Browse source
This commit is contained in:
Jason Volk 2020-10-07 04:36:36 -07:00
parent 12771f1965
commit e6a7904040
2 changed files with 40 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
include/ircd/m/events.h
View file

@ -16,13 +16,12 @@ namespace ircd::m::events
struct range;
using closure = std::function<bool (const event::idx &, const event &)>;
// Iterate viable event indexes in a range
bool for_each(const range &, const event::closure_idx_bool &);
bool for_each(const range &, const event_filter &, const event::closure_idx_bool &);
// Iterate events in an index range
// Iterate events in range
bool for_each(const range &, const closure &);
// Iterate events in range w/ filter
bool for_each(const range &, const event_filter &, const closure &);
bool for_each(const range &, const event_filter &, const event::closure_idx_bool &);
// util
void dump__file(const string_view &filename);
@ -92,6 +91,15 @@ namespace ircd::m::events::content
bool for_each(const closure &);
}
/// Interface to scan the JSON source of events
namespace ircd::m::events::source
{
using closure = std::function<bool (const event::idx &, const json::object &)>;
// Iterate events in range
bool for_each(const range &, const closure &);
}
/// Range to start (inclusive) and stop (exclusive). If start is greater than
/// stop a reverse iteration will occur. -1 (or unsigned max value) can be used
/// to start or stop at the end. 0 can be used to start or stop at the beginning.

67
matrix/events.cc
View file

@ -275,45 +275,25 @@ ircd::m::events::for_each(const range &range,
return true;
}
///TODO: This impl is temp. Need better dispatching based on filter before
///TODO: fetching event.
bool
ircd::m::events::for_each(const range &range,
const event_filter &filter,
const event::closure_idx_bool &closure)
//
// events::source
//
namespace ircd::m::events::source
{
auto limit
{
json::get<"limit"_>(filter)?: 32L
};
return for_each(range, event::closure_idx_bool{[&filter, &closure, &limit, &range]
(const event::idx &event_idx)
-> bool
{
const m::event::fetch event
{
std::nothrow, event_idx, range.fopts? *range.fopts : event::fetch::default_opts
};
if(!event.valid)
return true;
if(!match(filter, event))
return true;
if(!closure(event_idx))
return false;
return --limit > 0L;
}});
return true;
extern conf::item<size_t> readahead;
}
decltype(ircd::m::events::source::readahead)
ircd::m::events::source::readahead
{
{ "name", "ircd.m.events.source.readahead" },
{ "default", long(4_MiB) },
};
bool
ircd::m::events::for_each(const range &range,
const event::closure_idx_bool &closure)
ircd::m::events::source::for_each(const range &range,
const closure &closure)
{
const bool ascending
{
@ -334,14 +314,16 @@ ircd::m::events::for_each(const range &range,
range.second
};
auto &column
db::gopts gopts
{
dbs::event_json
db::get::NO_CACHE,
db::get::NO_CHECKSUM
};
gopts.readahead = size_t(readahead);
auto it
{
column.lower_bound(byte_view<string_view>(start))
dbs::event_json.lower_bound(byte_view<string_view>(start), gopts)
};
for(; bool(it); ascending? ++it : --it)
@ -357,7 +339,12 @@ ircd::m::events::for_each(const range &range,
if(!ascending && event_idx <= stop)
break;
if(!closure(event_idx))
const json::object &event
{
it->second
};
if(!closure(event_idx, event))
return false;
}
@ -365,7 +352,7 @@ ircd::m::events::for_each(const range &range,
}
//
// events::state
// events::content
//
namespace ircd::m::events::content