rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Store state events with state keys

Browse Source
This commit is contained in:
Nicolas Werner 2021-04-03 13:15:35 +02:00
parent 18e96d5c7d
commit 8108d98fa7
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
2 changed files with 46 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Cache.cpp
View File

@ -1182,10 +1182,13 @@ Cache::saveState(const mtx::responses::Sync &res)
// Save joined rooms // Save joined rooms
for (const auto &room : res.rooms.join) { for (const auto &room : res.rooms.join) {
auto statesdb = getStatesDb(txn, room.first); auto statesdb = getStatesDb(txn, room.first);
auto stateskeydb = getStatesKeyDb(txn, room.first);
auto membersdb = getMembersDb(txn, room.first); auto membersdb = getMembersDb(txn, room.first);
saveStateEvents(txn, statesdb, membersdb, room.first, room.second.state.events); saveStateEvents(
saveStateEvents(txn, statesdb, membersdb, room.first, room.second.timeline.events); txn, statesdb, stateskeydb, membersdb, room.first, room.second.state.events);
saveStateEvents(
txn, statesdb, stateskeydb, membersdb, room.first, room.second.timeline.events);
saveTimelineMessages(txn, room.first, room.second.timeline); saveTimelineMessages(txn, room.first, room.second.timeline);

43
src/Cache_p.h
View File

@ -273,6 +273,18 @@ public:
return false; return false;
} }
static int compare_state_key(const MDB_val *a, const MDB_val *b)
{
auto get_skey = [](const MDB_val *v) {
return nlohmann::json::parse(
std::string_view(static_cast<const char *>(v->mv_data),
v->mv_size))
.value("key", "");
};
return get_skey(a).compare(get_skey(b));
}
signals: signals:
void newReadReceipts(const QString &room_id, const std::vector<QString> &event_ids); void newReadReceipts(const QString &room_id, const std::vector<QString> &event_ids);
void roomReadStatus(const std::map<QString, bool> &status); void roomReadStatus(const std::map<QString, bool> &status);
@ -323,17 +335,19 @@ private:
template<class T> template<class T>
void saveStateEvents(lmdb::txn &txn, void saveStateEvents(lmdb::txn &txn,
lmdb::dbi &statesdb, lmdb::dbi &statesdb,
lmdb::dbi &stateskeydb,
lmdb::dbi &membersdb, lmdb::dbi &membersdb,
const std::string &room_id, const std::string &room_id,
const std::vector<T> &events) const std::vector<T> &events)
{ {
for (const auto &e : events) for (const auto &e : events)
saveStateEvent(txn, statesdb, membersdb, room_id, e); saveStateEvent(txn, statesdb, stateskeydb, membersdb, room_id, e);
} }
template<class T> template<class T>
void saveStateEvent(lmdb::txn &txn, void saveStateEvent(lmdb::txn &txn,
lmdb::dbi &statesdb, lmdb::dbi &statesdb,
lmdb::dbi &stateskeydb,
lmdb::dbi &membersdb, lmdb::dbi &membersdb,
const std::string &room_id, const std::string &room_id,
const T &event) const T &event)
@ -371,9 +385,22 @@ private:
} }
std::visit( std::visit(
[&txn, &statesdb](auto e) { [&txn, &statesdb, &stateskeydb](auto e) {
if (isStateEvent(e) && e.type != EventType::Unsupported) if constexpr (isStateEvent(e))
statesdb.put(txn, to_string(e.type), json(e).dump()); if (e.type != EventType::Unsupported) {
if (e.state_key.empty())
statesdb.put(
txn, to_string(e.type), json(e).dump());
else
stateskeydb.put(
txn,
to_string(e.type),
json::object({
{"key", e.state_key},
{"id", e.event_id},
})
.dump());
}
}, },
event); event);
} }
@ -461,6 +488,14 @@ private:
return lmdb::dbi::open(txn, std::string(room_id + "/state").c_str(), MDB_CREATE); return lmdb::dbi::open(txn, std::string(room_id + "/state").c_str(), MDB_CREATE);
} }
lmdb::dbi getStatesKeyDb(lmdb::txn &txn, const std::string &room_id)
{
auto db =
lmdb::dbi::open(txn, std::string(room_id + "/state_by_key").c_str(), MDB_CREATE);
lmdb::dbi_set_dupsort(txn, db, compare_state_key);
return db;
}
lmdb::dbi getAccountDataDb(lmdb::txn &txn, const std::string &room_id) lmdb::dbi getAccountDataDb(lmdb::txn &txn, const std::string &room_id)
{ {
return lmdb::dbi::open( return lmdb::dbi::open(