MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2025-01-14 00:34:18 +01:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:dbs: Rename room_origins to room_joined.

Browse source
This commit is contained in:
Jason Volk 2018-04-15 14:40:10 -07:00
parent 7b54dba291
commit 6d88ee339d
3 changed files with 44 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,7 @@ namespace ircd::m::dbs
// Event metadata columns
extern db::column state_node;
extern db::index room_events;
extern db::index room_origins;
extern db::index room_joined;
extern db::index room_state;
// Lowlevel util
@ -36,9 +36,9 @@ namespace ircd::m::dbs
string_view room_state_key(const mutable_buffer &out, const id::room &, const string_view &type);
std::pair<string_view, string_view> room_state_key(const string_view &amalgam);
string_view room_origins_key(const mutable_buffer &out, const id::room &, const string_view &origin, const id::user &member);
string_view room_origins_key(const mutable_buffer &out, const id::room &, const string_view &origin);
std::pair<string_view, string_view> room_origins_key(const string_view &amalgam);
string_view room_joined_key(const mutable_buffer &out, const id::room &, const string_view &origin, const id::user &member);
string_view room_joined_key(const mutable_buffer &out, const id::room &, const string_view &origin);
std::pair<string_view, string_view> room_joined_key(const string_view &amalgam);
string_view room_events_key(const mutable_buffer &out, const id::room &, const uint64_t &depth, const id::event &);
string_view room_events_key(const mutable_buffer &out, const id::room &, const uint64_t &depth);
@ -105,8 +105,8 @@ namespace ircd::m::dbs::desc
extern const database::descriptor events__room_state;
// room present joined members sequence
extern const db::prefix_transform events__room_origins__pfx;
extern const database::descriptor events__room_origins;
extern const db::prefix_transform events__room_joined__pfx;
extern const database::descriptor events__room_joined;
// state btree node key-value store
extern const database::descriptor events__state_node;

64
ircd/m/dbs.cc
View file

@ -33,9 +33,9 @@ decltype(ircd::m::dbs::room_events)
ircd::m::dbs::room_events
{};
/// Linkage for a reference to the room_origins column
decltype(ircd::m::dbs::room_origins)
ircd::m::dbs::room_origins
/// Linkage for a reference to the room_joined column
decltype(ircd::m::dbs::room_joined)
ircd::m::dbs::room_joined
{};
/// Linkage for a reference to the room_state column
@ -67,10 +67,10 @@ ircd::m::dbs::init::init(std::string dbopts)
};
// Cache the columns for the metadata
state_node = db::column{*events, "_state_node"};
room_events = db::index{*events, "_room_events"};
room_origins = db::index{*events, "_room_origins"};
room_state = db::index{*events, "_room_state"};
state_node = db::column{*events, desc::events__state_node.name};
room_events = db::index{*events, desc::events__room_events.name};
room_joined = db::index{*events, desc::events__room_joined.name};
room_state = db::index{*events, desc::events__room_state.name};
}
/// Shuts down the m::dbs subsystem; closes the events database. The extern
@ -81,7 +81,7 @@ noexcept
// Columns should be unrefed before DB closes
state_node = {};
room_events = {};
room_origins = {};
room_joined = {};
room_state = {};
for(auto &column : event_column)
column = {};
@ -94,7 +94,7 @@ namespace ircd::m::dbs
{
static void _index__room_state(db::txn &, const event &, const write_opts &);
static void _index__room_events(db::txn &, const event &, const write_opts &, const string_view &);
static void _index__room_origins(db::txn &, const event &, const write_opts &);
static void _index__room_joined(db::txn &, const event &, const write_opts &);
static string_view _index_state(db::txn &, const event &, const write_opts &);
static string_view _index_redact(db::txn &, const event &, const write_opts &);
static string_view _index_ephem(db::txn &, const event &, const write_opts &);
@ -200,7 +200,7 @@ try
};
_index__room_events(txn, event, opts, new_root);
_index__room_origins(txn, event, opts);
_index__room_joined(txn, event, opts);
_index__room_state(txn, event, opts);
return new_root;
}
@ -240,10 +240,10 @@ ircd::m::dbs::_index__room_events(db::txn &txn,
};
}
/// Adds the entry for the room_origins column into the txn.
/// Adds the entry for the room_joined column into the txn.
/// This only is affected if opts.present=true
void
ircd::m::dbs::_index__room_origins(db::txn &txn,
ircd::m::dbs::_index__room_joined(db::txn &txn,
const event &event,
const write_opts &opts)
{
@ -257,7 +257,7 @@ ircd::m::dbs::_index__room_origins(db::txn &txn,
thread_local char buf[512];
const string_view &key
{
room_origins_key(buf, at<"room_id"_>(event), at<"origin"_>(event), at<"state_key"_>(event))
room_joined_key(buf, at<"room_id"_>(event), at<"origin"_>(event), at<"state_key"_>(event))
};
const string_view &membership
@ -289,7 +289,7 @@ ircd::m::dbs::_index__room_origins(db::txn &txn,
db::txn::append
{
txn, room_origins,
txn, room_joined,
{
op,
key,
@ -297,7 +297,7 @@ ircd::m::dbs::_index__room_origins(db::txn &txn,
};
}
/// Adds the entry for the room_origins column into the txn.
/// Adds the entry for the room_joined column into the txn.
/// This only is affected if opts.present=true
void
ircd::m::dbs::_index__room_state(db::txn &txn,
@ -653,15 +653,15 @@ ircd::m::dbs::desc::events__room_events
};
//
// origins sequential
// joined sequential
//
/// Prefix transform for the events__room_origins
/// Prefix transform for the events__room_joined
///
const ircd::db::prefix_transform
ircd::m::dbs::desc::events__room_origins__pfx
ircd::m::dbs::desc::events__room_joined__pfx
{
"_room_origins",
"_room_joined",
[](const string_view &key)
{
@ -675,9 +675,9 @@ ircd::m::dbs::desc::events__room_origins__pfx
};
ircd::string_view
ircd::m::dbs::room_origins_key(const mutable_buffer &out_,
const id::room &room_id,
const string_view &origin)
ircd::m::dbs::room_joined_key(const mutable_buffer &out_,
const id::room &room_id,
const string_view &origin)
{
mutable_buffer out{out_};
consume(out, copy(out, room_id));
@ -687,10 +687,10 @@ ircd::m::dbs::room_origins_key(const mutable_buffer &out_,
}
ircd::string_view
ircd::m::dbs::room_origins_key(const mutable_buffer &out_,
const id::room &room_id,
const string_view &origin,
const id::user &member)
ircd::m::dbs::room_joined_key(const mutable_buffer &out_,
const id::room &room_id,
const string_view &origin,
const id::user &member)
{
mutable_buffer out{out_};
consume(out, copy(out, room_id));
@ -701,7 +701,7 @@ ircd::m::dbs::room_origins_key(const mutable_buffer &out_,
}
std::pair<ircd::string_view, ircd::string_view>
ircd::m::dbs::room_origins_key(const string_view &amalgam)
ircd::m::dbs::room_joined_key(const string_view &amalgam)
{
const auto &key
{
@ -723,10 +723,10 @@ ircd::m::dbs::room_origins_key(const string_view &amalgam)
}
const ircd::database::descriptor
ircd::m::dbs::desc::events__room_origins
ircd::m::dbs::desc::events__room_joined
{
// name
"_room_origins",
"_room_joined",
// explanation
R"(### developer note:
@ -748,7 +748,7 @@ ircd::m::dbs::desc::events__room_origins
{},
// prefix transform
events__room_origins__pfx,
events__room_joined__pfx,
// cache size
64_MiB, //TODO: conf
@ -1259,8 +1259,8 @@ ircd::m::dbs::desc::events
events__room_events,
// (room_id, (origin, user_id)) => ()
// Sequence of all PRESENTLY JOINED origins for a room.
events__room_origins,
// Sequence of all PRESENTLY JOINED joined for a room.
events__room_joined,
// (room_id, (type, state_key)) => (event_id)
// Sequence of the PRESENT STATE of the room.

12
ircd/m/room.cc
View file

@ -1045,7 +1045,7 @@ const
{
const string_view &member
{
std::get<1>(dbs::room_origins_key(key))
std::get<1>(dbs::room_joined_key(key))
};
bool ret{false};
@ -1139,13 +1139,13 @@ const
{
db::index &index
{
dbs::room_origins
dbs::room_joined
};
char querybuf[512];
const auto query
{
dbs::room_origins_key(querybuf, room.room_id, origin)
dbs::room_joined_key(querybuf, room.room_id, origin)
};
auto it
@ -1163,7 +1163,7 @@ const
const string_view &key_origin
{
std::get<0>(dbs::room_origins_key(key))
std::get<0>(dbs::room_joined_key(key))
};
return key_origin == origin;
@ -1191,7 +1191,7 @@ const
{
const string_view &origin
{
std::get<0>(dbs::room_origins_key(key))
std::get<0>(dbs::room_joined_key(key))
};
if(origin == last)
@ -1211,7 +1211,7 @@ const
{
db::index &index
{
dbs::room_origins
dbs::room_joined
};
auto it