MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-17 15:30:52 +01:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:dbs: Typedef a tuple for room_space key; conditions for truncated key generation.

Browse source
This commit is contained in:
Jason Volk 2019-05-13 10:19:18 -07:00
parent e486d8907e
commit d1425da434
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/ircd/m/dbs/room_space.h
View file

@ -13,15 +13,21 @@
namespace ircd::m::dbs namespace ircd::m::dbs
{ {
using room_space_key_parts = std::tuple<string_view, string_view, int64_t, event::idx>;
constexpr size_t ROOM_SPACE_KEY_MAX_SIZE constexpr size_t ROOM_SPACE_KEY_MAX_SIZE
{ {
id::MAX_SIZE + event::TYPE_MAX_SIZE + event::STATE_KEY_MAX_SIZE + sizeof(int64_t) id::MAX_SIZE +
event::TYPE_MAX_SIZE +
event::STATE_KEY_MAX_SIZE +
sizeof(int64_t) +
sizeof(event::idx)
}; };
string_view room_space_key(const mutable_buffer &out, const id::room &, const string_view &type, const string_view &state_key, const int64_t &depth, const event::idx & = 0); string_view room_space_key(const mutable_buffer &out, const id::room &, const string_view &type, const string_view &state_key, const int64_t &depth, const event::idx & = 0);
string_view room_space_key(const mutable_buffer &out, const id::room &, const string_view &type, const string_view &state_key); string_view room_space_key(const mutable_buffer &out, const id::room &, const string_view &type, const string_view &state_key);
string_view room_space_key(const mutable_buffer &out, const id::room &, const string_view &type); string_view room_space_key(const mutable_buffer &out, const id::room &, const string_view &type);
std::tuple<string_view, string_view, int64_t, event::idx> room_space_key(const string_view &amalgam); room_space_key_parts room_space_key(const string_view &amalgam);
// room_id | type, state_key, depth, event_idx => -- // room_id | type, state_key, depth, event_idx => --
extern db::index room_space; extern db::index room_space;

16
ircd/m_dbs.cc
View file

@ -3225,17 +3225,31 @@ ircd::m::dbs::room_space_key(const mutable_buffer &out_,
consume(out, copy(out, type)); consume(out, copy(out, type));
if(!defined(state_key)) if(!defined(state_key))
{
assert(depth < 0L && !event_idx);
return { data(out_), data(out) }; return { data(out_), data(out) };
}
consume(out, copy(out, "\0"_sv)); consume(out, copy(out, "\0"_sv));
consume(out, copy(out, state_key)); consume(out, copy(out, state_key));
consume(out, copy(out, "\0"_sv)); consume(out, copy(out, "\0"_sv));
if(depth < 0)
{
assert(!event_idx);
return { data(out_), data(out) };
}
consume(out, copy(out, byte_view<string_view>(depth))); consume(out, copy(out, byte_view<string_view>(depth)));
if(!event_idx)
return { data(out_), data(out) };
consume(out, copy(out, byte_view<string_view>(event_idx))); consume(out, copy(out, byte_view<string_view>(event_idx)));
return { data(out_), data(out) }; return { data(out_), data(out) };
} }
std::tuple<ircd::string_view, ircd::string_view, int64_t, ircd::m::event::idx> ircd::m::dbs::room_space_key_parts
ircd::m::dbs::room_space_key(const string_view &amalgam) ircd::m::dbs::room_space_key(const string_view &amalgam)
{ {
const auto &key const auto &key