magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge rooms/short Data w/ Service; optimize queries

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-09-29 13:13:09 +00:00 • committed by strawberry
parent 0e8ae1e13e
commit c569881b08
18 changed files with 257 additions and 262 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/service/globals/data.rs
View file

@ -260,7 +260,7 @@ impl Data {
&self, origin: &ServerName, new_keys: ServerSigningKeys,
) -> BTreeMap<OwnedServerSigningKeyId, VerifyKey> {
// Not atomic, but this is not critical
let signingkeys = self.server_signingkeys.qry(origin).await;
let signingkeys = self.server_signingkeys.get(origin).await;
let mut keys = signingkeys
.and_then(|keys| serde_json::from_slice(&keys).map_err(Into::into))
@ -311,10 +311,16 @@ impl Data {
}
pub async fn signing_keys_for(&self, origin: &ServerName) -> Result<ServerSigningKeys> {
self.server_signingkeys.qry(origin).await.deserialized()
self.server_signingkeys.get(origin).await.deserialized()
}
pub async fn database_version(&self) -> u64 { self.global.qry("version").await.deserialized().unwrap_or(0) }
pub async fn database_version(&self) -> u64 {
self.global
.get(b"version")
.await
.deserialized()
.unwrap_or(0)
}
#[inline]
pub fn bump_database_version(&self, new_version: u64) -> Result<()> {

6
src/service/globals/migrations.rs
View file

@ -99,14 +99,14 @@ async fn migrate(services: &Services) -> Result<()> {
db_lt_13(services).await?;
}
if db["global"].qry("feat_sha256_media").await.is_not_found() {
if db["global"].get(b"feat_sha256_media").await.is_not_found() {
media::migrations::migrate_sha256_media(services).await?;
} else if config.media_startup_check {
media::migrations::checkup_sha256_media(services).await?;
}
if db["global"]
.qry("fix_bad_double_separator_in_state_cache")
.get(b"fix_bad_double_separator_in_state_cache")
.await
.is_not_found()
{
@ -114,7 +114,7 @@ async fn migrate(services: &Services) -> Result<()> {
}
if db["global"]
.qry("retroactively_fix_bad_data_from_roomuserid_joined")
.get(b"retroactively_fix_bad_data_from_roomuserid_joined")
.await
.is_not_found()
{