MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-09-29 20:28:52 +02:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:dbs: Fix prefix related for event_refs column.

Browse source
This commit is contained in:
Jason Volk 2019-02-06 17:18:01 -08:00
parent a63f23fc2d
commit 2586476a57
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/ircd/m/dbs.h
View file

@ -44,7 +44,7 @@ namespace ircd::m::dbs
// Lowlevel util // Lowlevel util
constexpr size_t EVENT_REFS_KEY_MAX_SIZE {sizeof(event::idx) + sizeof(event::idx)}; constexpr size_t EVENT_REFS_KEY_MAX_SIZE {sizeof(event::idx) + sizeof(event::idx)};
string_view event_refs_key(const mutable_buffer &out, const event::idx &tgt, const event::idx &referer); string_view event_refs_key(const mutable_buffer &out, const event::idx &tgt, const event::idx &referer);
std::pair<event::idx, event::idx> event_refs_key(const string_view &amalgam); std::tuple<event::idx> event_refs_key(const string_view &amalgam);
constexpr size_t ROOM_HEAD_KEY_MAX_SIZE {id::MAX_SIZE + 1 + id::MAX_SIZE}; constexpr size_t ROOM_HEAD_KEY_MAX_SIZE {id::MAX_SIZE + 1 + id::MAX_SIZE};
string_view room_head_key(const mutable_buffer &out, const id::room &, const id::event &); string_view room_head_key(const mutable_buffer &out, const id::room &, const id::event &);

11
ircd/m_dbs.cc
View file

@ -1063,18 +1063,17 @@ ircd::m::dbs::event_refs_key(const mutable_buffer &out,
}; };
} }
std::pair<ircd::m::event::idx, ircd::m::event::idx> std::tuple<ircd::m::event::idx>
ircd::m::dbs::event_refs_key(const string_view &amalgam) ircd::m::dbs::event_refs_key(const string_view &amalgam)
{ {
assert(size(amalgam) >= sizeof(event::idx) * 2); const byte_view<event::idx> key
const event::idx *const &key
{ {
reinterpret_cast<const event::idx *>(data(amalgam)) amalgam
}; };
return return
{ {
key[0], key[1] key
}; };
} }
@ -1115,7 +1114,7 @@ ircd::m::dbs::desc::events__event_refs
{}, {},
// prefix transform // prefix transform
{}, events__event_refs__pfx,
// drop column // drop column
false, false,