MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-25 16:22:35 +01:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:dbs: Fixes to the index_redact path and related; minor reorg.

Browse source
This commit is contained in:
Jason Volk 2019-02-18 13:08:11 -08:00
parent a6d33ad4f1
commit 3b8130cee1
1 changed files with 68 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

135
ircd/m_dbs.cc
View file

@ -569,64 +569,6 @@ ircd::m::dbs::_index_room(db::txn &txn,
return _index_other(txn, event, opts);
}
ircd::string_view
ircd::m::dbs::_index_other(db::txn &txn,
const event &event,
const write_opts &opts)
{
_index__room_events(txn, event, opts, opts.root_in);
return strlcpy(opts.root_out, opts.root_in);
}
ircd::string_view
ircd::m::dbs::_index_redact(db::txn &txn,
const event &event,
const write_opts &opts)
try
{
const auto &target_id
{
at<"redacts"_>(event)
};
event::fetch target
{
target_id, std::nothrow
};
if(unlikely(!target.valid))
log::error
{
"Redaction from '%s' missing redaction target '%s'",
at<"event_id"_>(event),
target_id
};
if(!defined(json::get<"state_key"_>(target)))
{
_index__room_events(txn, event, opts, opts.root_in);
return strlcpy(opts.root_out, opts.root_in);
}
const string_view new_root
{
//state::remove(txn, state_root_out, state_root_in, target)
strlcpy(opts.root_out, opts.root_in)
};
_index__room_events(txn, event, opts, new_root);
return new_root;
}
catch(const std::exception &e)
{
log::error
{
"Failed to update state from redaction: %s", e.what()
};
throw;
}
ircd::string_view
ircd::m::dbs::_index_state(db::txn &txn,
const event &event,
@ -665,6 +607,72 @@ catch(const std::exception &e)
throw;
}
ircd::string_view
ircd::m::dbs::_index_redact(db::txn &txn,
const event &event,
const write_opts &opts)
try
{
const auto &target_id
{
at<"redacts"_>(event)
};
const m::event::idx target_idx
{
m::index(target_id, std::nothrow)
};
if(unlikely(!target_idx))
log::error
{
"Redaction from '%s' missing redaction target '%s'",
at<"event_id"_>(event),
target_id
};
const m::event::fetch target
{
target_idx, std::nothrow
};
const string_view new_root
{
target.valid && defined(json::get<"state_key"_>(target))?
//state::remove(txn, state_root_out, state_root_in, target):
strlcpy(opts.root_out, opts.root_in):
strlcpy(opts.root_out, opts.root_in)
};
_index__room_events(txn, event, opts, opts.root_in);
if(target.valid && defined(json::get<"state_key"_>(target)))
{
auto _opts(opts);
_opts.op = db::op::DELETE;
_index__room_state(txn, target, _opts);
}
return new_root;
}
catch(const std::exception &e)
{
log::error
{
"Failed to update state from redaction: %s", e.what()
};
throw;
}
ircd::string_view
ircd::m::dbs::_index_other(db::txn &txn,
const event &event,
const write_opts &opts)
{
_index__room_events(txn, event, opts, opts.root_in);
return strlcpy(opts.root_out, opts.root_in);
}
void
ircd::m::dbs::_index__room_head(db::txn &txn,
const event &event,
@ -827,20 +835,13 @@ ircd::m::dbs::_index__room_state(db::txn &txn,
byte_view<string_view>(opts.event_idx)
};
const db::op op
{
opts.op == db::op::SET && at<"type"_>(event) != "m.room.redaction"?
db::op::SET:
db::op::DELETE
};
db::txn::append
{
txn, room_state,
{
op,
opts.op,
key,
value_required(op)? val : string_view{},
value_required(opts.op)? val : string_view{},
}
};
}