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

ircd:Ⓜ️:dbs: Drop the membership column; minor cleanup / fixes.

Browse source
This commit is contained in:
Jason Volk 2019-01-24 12:39:28 -08:00
parent d64a49428e
commit 250f315589
2 changed files with 64 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -123,11 +123,6 @@ namespace ircd::m::dbs::desc
extern conf::item<size_t> events__event_id__cache_comp__size;
extern const db::descriptor events_event_id;
extern conf::item<size_t> events__membership__block__size;
extern conf::item<size_t> events__membership__cache__size;
extern conf::item<size_t> events__membership__cache_comp__size;
extern const db::descriptor events_membership;
extern conf::item<size_t> events__origin__block__size;
extern conf::item<size_t> events__origin__cache__size;
extern conf::item<size_t> events__origin__cache_comp__size;

193
ircd/m_dbs.cc
View file

@ -2837,94 +2837,6 @@ ircd::m::dbs::desc::events_depth
size_t(events___event__meta_block__size),
};
//
// membership
//
decltype(ircd::m::dbs::desc::events__membership__block__size)
ircd::m::dbs::desc::events__membership__block__size
{
{ "name", "ircd.m.dbs.events.membership.block.size" },
{ "default", 256L },
};
decltype(ircd::m::dbs::desc::events__membership__cache__size)
ircd::m::dbs::desc::events__membership__cache__size
{
{
{ "name", "ircd.m.dbs.events.membership.cache.size" },
{ "default", long(8_MiB) },
}, []
{
auto &column(event_column.at(json::indexof<event, "membership"_>()));
const size_t &value{events__membership__cache__size};
db::capacity(db::cache(column), value);
}
};
decltype(ircd::m::dbs::desc::events__membership__cache_comp__size)
ircd::m::dbs::desc::events__membership__cache_comp__size
{
{
{ "name", "ircd.m.dbs.events.membership.cache_comp.size" },
{ "default", long(16_MiB) },
}, []
{
auto &column(event_column.at(json::indexof<event, "membership"_>()));
const size_t &value{events__membership__cache_comp__size};
db::capacity(db::cache_compressed(column), value);
}
};
const ircd::db::descriptor
ircd::m::dbs::desc::events_membership
{
// name
"membership",
// explanation
R"(Stores the membership property of an event.
### developer note:
key is event_idx number.
)",
// typing (key, value)
{
typeid(uint64_t), typeid(string_view)
},
// options
{},
// comparator
{},
// prefix transform
{},
// drop column
false,
// cache size
bool(events_cache_enable)? -1 : 0,
// cache size for compressed assets
bool(events_cache_comp_enable)? -1 : 0,
// bloom filter bits
size_t(events___event__bloom__bits),
// expect queries hit
false,
// block size
size_t(events__membership__block__size),
// meta_block size
size_t(events___event__meta_block__size),
};
//
// prev_events
//
@ -3029,6 +2941,7 @@ namespace ircd::m::dbs::desc
extern const ircd::db::descriptor events__event_bad;
extern const ircd::db::descriptor events_hashes;
extern const ircd::db::descriptor events_membership;
extern const ircd::db::descriptor events_prev_state;
extern const ircd::db::descriptor events_signatures;
@ -3071,9 +2984,68 @@ ircd::m::dbs::desc::events__event_bad
true,
};
//
// prev_state
//
const ircd::db::descriptor
ircd::m::dbs::desc::events_hashes
{
// name
"hashes",
// explanation
R"(
This column is deprecated and has been dropped from the schema. This
descriptor will erase its presence in the database upon next open.
)",
// typing (key, value)
{
typeid(uint64_t), typeid(string_view)
},
// options
{},
// comparator
{},
// prefix transform
{},
// drop column
true,
};
const ircd::db::descriptor
ircd::m::dbs::desc::events_membership
{
// name
"membership",
// explanation
R"(Stores the membership property of an event.
### developer note:
key is event_idx number.
)",
// typing (key, value)
{
typeid(uint64_t), typeid(string_view)
},
// options
{},
// comparator
{},
// prefix transform
{},
// drop column
true,
};
const ircd::db::descriptor
ircd::m::dbs::desc::events_prev_state
@ -3139,42 +3111,6 @@ ircd::m::dbs::desc::events_signatures
true,
};
//
// hashes
//
const ircd::db::descriptor
ircd::m::dbs::desc::events_hashes
{
// name
"hashes",
// explanation
R"(
This column is deprecated and has been dropped from the schema. This
descriptor will erase its presence in the database upon next open.
)",
// typing (key, value)
{
typeid(uint64_t), typeid(string_view)
},
// options
{},
// comparator
{},
// prefix transform
{},
// drop column
true,
};
const ircd::db::descriptor
ircd::m::dbs::desc::events__default
{
@ -3236,14 +3172,12 @@ ircd::m::dbs::desc::events
events_content,
events_depth,
events_event_id,
events_membership,
events_origin,
events_origin_server_ts,
events_prev_events,
events_redacts,
events_room_id,
events_sender,
events_signatures,
events_state_key,
events_type,
@ -3285,6 +3219,7 @@ ircd::m::dbs::desc::events
events__event_bad,
events_hashes,
events_membership,
events_prev_state,
events_signatures,
};