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

ircd:Ⓜ️:dbs: Checkpoint the meta-index "state_head for event_id in room_id"

Browse source
This commit is contained in:
Jason Volk 2018-02-04 19:34:59 -08:00
parent 42bd702d8f
commit 7b48bc9f40
2 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ircd/m/dbs.cc
View file

@ -16,6 +16,7 @@ namespace ircd::m
extern std::set<std::shared_ptr<indexer>> indexers; extern std::set<std::shared_ptr<indexer>> indexers;
extern const std::unique_ptr<indexer> indexer_origin_joined; extern const std::unique_ptr<indexer> indexer_origin_joined;
extern const std::unique_ptr<indexer> indexer_state_head_for_event_id_in_room_id;
} }
struct ircd::m::indexer struct ircd::m::indexer
@ -29,7 +30,8 @@ struct ircd::m::indexer
std::string name; std::string name;
virtual void operator()(const event &, db::txn &txn, const db::op &op) const {} virtual void operator()(const event &, db::txn &, const db::op &op) const {}
virtual void operator()(const event &, db::txn &, const db::op &op, const string_view &) const {}
indexer(std::string name) indexer(std::string name)
:name{std::move(name)} :name{std::move(name)}
@ -104,9 +106,6 @@ ircd::m::dbs::write(const event &event,
txn, at<"event_id"_>(event), event txn, at<"event_id"_>(event), event
}; };
if(defined(json::get<"state_key"_>(event)))
state::append_nodes(txn, event);
append_indexes(event, txn); append_indexes(event, txn);
} }
@ -120,6 +119,14 @@ ircd::m::dbs::append_indexes(const event &event,
indexer(event, txn, db::op::SET); indexer(event, txn, db::op::SET);
} }
if(defined(json::get<"state_key"_>(event)))
{
char headbuf[state::ID_MAX_SZ];
const auto head{state::insert(txn, headbuf, event)};
const m::indexer &indexer{*indexer_state_head_for_event_id_in_room_id};
indexer(event, txn, db::op::SET, head);
}
if(json::get<"type"_>(event) == "m.room.member") if(json::get<"type"_>(event) == "m.room.member")
{ {
const m::indexer &indexer{*indexer_origin_joined}; const m::indexer &indexer{*indexer_origin_joined};
@ -526,7 +533,7 @@ struct ircd::m::indexer::concat_v
std::string col_c; std::string col_c;
void operator()(const event &, db::txn &, const db::op &op) const final override; void operator()(const event &, db::txn &, const db::op &op) const final override;
void operator()(const event &, db::txn &, const db::op &op, const string_view &) const; void operator()(const event &, db::txn &, const db::op &op, const string_view &) const final override;
concat_v(std::string col_a, std::string col_b, std::string col_c) concat_v(std::string col_a, std::string col_b, std::string col_c)
:indexer :indexer
@ -696,7 +703,7 @@ struct ircd::m::indexer::concat_3vs
std::string col_b2; std::string col_b2;
std::string col_c; std::string col_c;
void operator()(const event &, db::txn &, const db::op &op, const string_view &prev_event_id) const; void operator()(const event &, db::txn &, const db::op &op, const string_view &prev_event_id) const final override;
concat_3vs(std::string col_a, std::string col_b0, std::string col_b1, std::string col_b2, std::string col_c) concat_3vs(std::string col_a, std::string col_b0, std::string col_b1, std::string col_b2, std::string col_c)
:indexer :indexer
@ -790,7 +797,6 @@ decltype(ircd::m::indexers)
ircd::m::indexers ircd::m::indexers
{{ {{
std::make_shared<ircd::m::indexer::concat>("event_id", "sender"), std::make_shared<ircd::m::indexer::concat>("event_id", "sender"),
std::make_shared<ircd::m::indexer::concat>("event_id", "room_id"),
std::make_shared<ircd::m::indexer::concat_s>("origin", "room_id"), std::make_shared<ircd::m::indexer::concat_s>("origin", "room_id"),
std::make_shared<ircd::m::indexer::concat_2v>("event_id", "type", "state_key", "room_id"), std::make_shared<ircd::m::indexer::concat_2v>("event_id", "type", "state_key", "room_id"),
std::make_shared<ircd::m::indexer::concat_3vs>("prev_event_id", "type", "state_key", "event_id", "room_id"), std::make_shared<ircd::m::indexer::concat_3vs>("prev_event_id", "type", "state_key", "event_id", "room_id"),
@ -802,6 +808,12 @@ ircd::m::indexer_origin_joined
std::make_unique<ircd::m::indexer::concat_s>("origin", "room_id", "origin_joined in room_id") std::make_unique<ircd::m::indexer::concat_s>("origin", "room_id", "origin_joined in room_id")
}; };
decltype(ircd::m::indexer_state_head_for_event_id_in_room_id)
ircd::m::indexer_state_head_for_event_id_in_room_id
{
std::make_unique<ircd::m::indexer::concat_v>("state_head", "event_id", "room_id")
};
// //
// //
// //

6
modules/db/events.cc
View file

@ -398,10 +398,10 @@ const database::descriptor event_id_in_sender
event_id_in, event_id_in,
}; };
const database::descriptor event_id_in_room_id const database::descriptor state_head_for_event_id_in_room_id
{ {
// name // name
"event_id in room_id", "state_head for event_id in room_id",
// explanation // explanation
R"(### developer note: R"(### developer note:
@ -742,7 +742,7 @@ const database::description events_description
// * broad but useful in cases // * broad but useful in cases
// ? eliminate for prev_event? // ? eliminate for prev_event?
// ? eliminate/combine with state tree related? // ? eliminate/combine with state tree related?
event_id_in_room_id, state_head_for_event_id_in_room_id,
// (room_id, origin) => () // (room_id, origin) => ()
// Sequence of all origins for a room, EVER // Sequence of all origins for a room, EVER