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:Ⓜ️ Add event::idx to top() tuple.

Browse source
This commit is contained in:
Jason Volk 2018-04-18 15:04:46 -07:00
parent 7659ef3acc
commit 02bc9032e8
6 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/ircd/m/room.h
View file

@ -36,8 +36,8 @@ namespace ircd::m
id::room::buf room_id(const string_view &id_or_alias); id::room::buf room_id(const string_view &id_or_alias);
// [GET] Current Event ID and depth suite (non-locking) (one only) // [GET] Current Event ID and depth suite (non-locking) (one only)
std::tuple<id::event::buf, int64_t> top(std::nothrow_t, const id::room &); std::tuple<id::event::buf, int64_t, event::idx> top(std::nothrow_t, const id::room &);
std::tuple<id::event::buf, int64_t> top(const id::room &); std::tuple<id::event::buf, int64_t, event::idx> top(const id::room &);
// [GET] Current Event ID (non-locking) (one only) // [GET] Current Event ID (non-locking) (one only)
id::event::buf head(std::nothrow_t, const id::room &); id::event::buf head(std::nothrow_t, const id::room &);

20
ircd/m/room.cc
View file

@ -23,20 +23,20 @@ ircd::m::depth(std::nothrow_t,
return std::get<int64_t>(top(std::nothrow, room_id)); return std::get<int64_t>(top(std::nothrow, room_id));
} }
ircd::m::id::event::buf ircd::m::event::id::buf
ircd::m::head(const id::room &room_id) ircd::m::head(const id::room &room_id)
{ {
return std::get<event::id::buf>(top(room_id)); return std::get<event::id::buf>(top(room_id));
} }
ircd::m::id::event::buf ircd::m::event::id::buf
ircd::m::head(std::nothrow_t, ircd::m::head(std::nothrow_t,
const id::room &room_id) const id::room &room_id)
{ {
return std::get<event::id::buf>(top(std::nothrow, room_id)); return std::get<event::id::buf>(top(std::nothrow, room_id));
} }
std::tuple<ircd::m::id::event::buf, int64_t> std::tuple<ircd::m::event::id::buf, int64_t, ircd::m::event::idx>
ircd::m::top(const id::room &room_id) ircd::m::top(const id::room &room_id)
{ {
const auto ret const auto ret
@ -53,7 +53,7 @@ ircd::m::top(const id::room &room_id)
return ret; return ret;
} }
std::tuple<ircd::m::id::event::buf, int64_t> std::tuple<ircd::m::event::id::buf, int64_t, ircd::m::event::idx>
ircd::m::top(std::nothrow_t, ircd::m::top(std::nothrow_t,
const id::room &room_id) const id::room &room_id)
{ {
@ -65,7 +65,7 @@ ircd::m::top(std::nothrow_t,
if(!it) if(!it)
return return
{ {
id::event::buf{}, -1 event::id::buf{}, -1, 0
}; };
const auto part const auto part
@ -73,10 +73,9 @@ ircd::m::top(std::nothrow_t,
dbs::room_events_key(it->first) dbs::room_events_key(it->first)
}; };
const int64_t &depth(std::get<0>(part)); const int64_t &depth
std::tuple<id::event::buf, int64_t> ret
{ {
id::event::buf{}, depth int64_t(std::get<0>(part))
}; };
const event::idx &event_idx const event::idx &event_idx
@ -84,6 +83,11 @@ ircd::m::top(std::nothrow_t,
std::get<1>(part) std::get<1>(part)
}; };
std::tuple<event::id::buf, int64_t, event::idx> ret
{
event::id::buf{}, depth, event_idx
};
event::fetch::event_id(event_idx, std::nothrow, [&ret] event::fetch::event_id(event_idx, std::nothrow, [&ret]
(const event::id &event_id) (const event::id &event_id)
{ {

2
ircd/m/vm.cc
View file

@ -483,7 +483,7 @@ ircd::m::vm::_eval_pdu(eval &eval,
int64_t top; int64_t top;
id::event::buf head; id::event::buf head;
std::tie(top, head) = m::top(std::nothrow, room_id); std::tie(head, top, std::ignore) = m::top(std::nothrow, room_id);
if(top < 0 && (opts.head_must_exist || opts.history)) if(top < 0 && (opts.head_must_exist || opts.history))
throw error throw error
{ {

2
modules/client/rooms/rooms.cc
View file

@ -203,7 +203,7 @@ commit__iov_iov(const room &room,
int64_t depth; int64_t depth;
event::id::buf prev_event_id; event::id::buf prev_event_id;
std::tie(prev_event_id, depth) = m::top(std::nothrow, room.room_id); std::tie(prev_event_id, depth, std::ignore) = m::top(std::nothrow, room.room_id);
//TODO: X //TODO: X
const json::iov::set_if depth_ const json::iov::set_if depth_

2
modules/federation/make_join.cc
View file

@ -63,7 +63,7 @@ get__make_join(client &client,
int64_t depth; int64_t depth;
m::id::event::buf prev_event_id; m::id::event::buf prev_event_id;
std::tie(prev_event_id, depth) = m::top(room_id); std::tie(prev_event_id, depth, std::ignore) = m::top(room_id);
const m::event::fetch evf const m::event::fetch evf
{ {

2
modules/federation/make_leave.cc
View file

@ -63,7 +63,7 @@ get__make_leave(client &client,
int64_t depth; int64_t depth;
m::id::event::buf prev_event_id; m::id::event::buf prev_event_id;
std::tie(prev_event_id, depth) = m::top(room_id); std::tie(prev_event_id, depth, std::ignore) = m::top(room_id);
const m::event::fetch evf const m::event::fetch evf
{ {