Speed up GET /api/v3/site endpoint (#4245)
* Make db queries for GET /api/v3/site in parallel (ref #4244) * Cache site response * machete * Use try_join_with_pool macro * machete * taplo * ttl 1s
This commit is contained in:
parent
e0e74e50ae
commit
30d58865b8
4 changed files with 65 additions and 47 deletions
4
Cargo.lock
generated
4
Cargo.lock
generated
|
@ -2589,12 +2589,16 @@ version = "0.19.0-rc.13"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"activitypub_federation",
|
"activitypub_federation",
|
||||||
"actix-web",
|
"actix-web",
|
||||||
|
"anyhow",
|
||||||
"bcrypt",
|
"bcrypt",
|
||||||
|
"futures",
|
||||||
"lemmy_api_common",
|
"lemmy_api_common",
|
||||||
"lemmy_db_schema",
|
"lemmy_db_schema",
|
||||||
"lemmy_db_views",
|
"lemmy_db_views",
|
||||||
"lemmy_db_views_actor",
|
"lemmy_db_views_actor",
|
||||||
"lemmy_utils",
|
"lemmy_utils",
|
||||||
|
"moka",
|
||||||
|
"once_cell",
|
||||||
"tracing",
|
"tracing",
|
||||||
"url",
|
"url",
|
||||||
"uuid",
|
"uuid",
|
||||||
|
|
|
@ -22,5 +22,12 @@ bcrypt = { workspace = true }
|
||||||
actix-web = { workspace = true }
|
actix-web = { workspace = true }
|
||||||
tracing = { workspace = true }
|
tracing = { workspace = true }
|
||||||
url = { workspace = true }
|
url = { workspace = true }
|
||||||
webmention = "0.5.0"
|
futures.workspace = true
|
||||||
uuid = { workspace = true }
|
uuid = { workspace = true }
|
||||||
|
moka.workspace = true
|
||||||
|
once_cell.workspace = true
|
||||||
|
anyhow.workspace = true
|
||||||
|
webmention = "0.5.0"
|
||||||
|
|
||||||
|
[package.metadata.cargo-machete]
|
||||||
|
ignored = ["futures"]
|
||||||
|
|
|
@ -21,46 +21,68 @@ use lemmy_utils::{
|
||||||
error::{LemmyError, LemmyErrorExt, LemmyErrorType},
|
error::{LemmyError, LemmyErrorExt, LemmyErrorType},
|
||||||
version,
|
version,
|
||||||
};
|
};
|
||||||
|
use moka::future::Cache;
|
||||||
|
use once_cell::sync::Lazy;
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
#[tracing::instrument(skip(context))]
|
#[tracing::instrument(skip(context))]
|
||||||
pub async fn get_site(
|
pub async fn get_site(
|
||||||
local_user_view: Option<LocalUserView>,
|
local_user_view: Option<LocalUserView>,
|
||||||
context: Data<LemmyContext>,
|
context: Data<LemmyContext>,
|
||||||
) -> Result<Json<GetSiteResponse>, LemmyError> {
|
) -> Result<Json<GetSiteResponse>, LemmyError> {
|
||||||
let site_view = SiteView::read_local(&mut context.pool()).await?;
|
static CACHE: Lazy<Cache<(), GetSiteResponse>> = Lazy::new(|| {
|
||||||
|
Cache::builder()
|
||||||
|
.max_capacity(1)
|
||||||
|
.time_to_live(Duration::from_secs(1))
|
||||||
|
.build()
|
||||||
|
});
|
||||||
|
|
||||||
let admins = PersonView::admins(&mut context.pool()).await?;
|
// This data is independent from the user account so we can cache it across requests
|
||||||
|
let mut site_response = CACHE
|
||||||
|
.try_get_with::<_, LemmyError>((), async {
|
||||||
|
let site_view = SiteView::read_local(&mut context.pool()).await?;
|
||||||
|
let admins = PersonView::admins(&mut context.pool()).await?;
|
||||||
|
let all_languages = Language::read_all(&mut context.pool()).await?;
|
||||||
|
let discussion_languages = SiteLanguage::read_local_raw(&mut context.pool()).await?;
|
||||||
|
let taglines = Tagline::get_all(&mut context.pool(), site_view.local_site.id).await?;
|
||||||
|
let custom_emojis =
|
||||||
|
CustomEmojiView::get_all(&mut context.pool(), site_view.local_site.id).await?;
|
||||||
|
Ok(GetSiteResponse {
|
||||||
|
site_view,
|
||||||
|
admins,
|
||||||
|
version: version::VERSION.to_string(),
|
||||||
|
my_user: None,
|
||||||
|
all_languages,
|
||||||
|
discussion_languages,
|
||||||
|
taglines,
|
||||||
|
custom_emojis,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| anyhow::anyhow!("Failed to construct site response: {e}"))?;
|
||||||
|
|
||||||
// Build the local user
|
// Build the local user with parallel queries and add it to site response
|
||||||
let my_user = if let Some(local_user_view) = local_user_view {
|
site_response.my_user = if let Some(local_user_view) = local_user_view {
|
||||||
let person_id = local_user_view.person.id;
|
let person_id = local_user_view.person.id;
|
||||||
let local_user_id = local_user_view.local_user.id;
|
let local_user_id = local_user_view.local_user.id;
|
||||||
|
let pool = &mut context.pool();
|
||||||
|
|
||||||
let follows = CommunityFollowerView::for_person(&mut context.pool(), person_id)
|
let (
|
||||||
.await
|
follows,
|
||||||
.with_lemmy_type(LemmyErrorType::SystemErrLogin)?;
|
community_blocks,
|
||||||
|
instance_blocks,
|
||||||
let person_id = local_user_view.person.id;
|
person_blocks,
|
||||||
let community_blocks = CommunityBlockView::for_person(&mut context.pool(), person_id)
|
moderates,
|
||||||
.await
|
discussion_languages,
|
||||||
.with_lemmy_type(LemmyErrorType::SystemErrLogin)?;
|
) = lemmy_db_schema::try_join_with_pool!(pool => (
|
||||||
|
|pool| CommunityFollowerView::for_person(pool, person_id),
|
||||||
let instance_blocks = InstanceBlockView::for_person(&mut context.pool(), person_id)
|
|pool| CommunityBlockView::for_person(pool, person_id),
|
||||||
.await
|
|pool| InstanceBlockView::for_person(pool, person_id),
|
||||||
.with_lemmy_type(LemmyErrorType::SystemErrLogin)?;
|
|pool| PersonBlockView::for_person(pool, person_id),
|
||||||
|
|pool| CommunityModeratorView::for_person(pool, person_id),
|
||||||
let person_id = local_user_view.person.id;
|
|pool| LocalUserLanguage::read(pool, local_user_id)
|
||||||
let person_blocks = PersonBlockView::for_person(&mut context.pool(), person_id)
|
))
|
||||||
.await
|
.with_lemmy_type(LemmyErrorType::SystemErrLogin)?;
|
||||||
.with_lemmy_type(LemmyErrorType::SystemErrLogin)?;
|
|
||||||
|
|
||||||
let moderates = CommunityModeratorView::for_person(&mut context.pool(), person_id)
|
|
||||||
.await
|
|
||||||
.with_lemmy_type(LemmyErrorType::SystemErrLogin)?;
|
|
||||||
|
|
||||||
let discussion_languages = LocalUserLanguage::read(&mut context.pool(), local_user_id)
|
|
||||||
.await
|
|
||||||
.with_lemmy_type(LemmyErrorType::SystemErrLogin)?;
|
|
||||||
|
|
||||||
Some(MyUserInfo {
|
Some(MyUserInfo {
|
||||||
local_user_view,
|
local_user_view,
|
||||||
|
@ -75,20 +97,5 @@ pub async fn get_site(
|
||||||
None
|
None
|
||||||
};
|
};
|
||||||
|
|
||||||
let all_languages = Language::read_all(&mut context.pool()).await?;
|
Ok(Json(site_response))
|
||||||
let discussion_languages = SiteLanguage::read_local_raw(&mut context.pool()).await?;
|
|
||||||
let taglines = Tagline::get_all(&mut context.pool(), site_view.local_site.id).await?;
|
|
||||||
let custom_emojis =
|
|
||||||
CustomEmojiView::get_all(&mut context.pool(), site_view.local_site.id).await?;
|
|
||||||
|
|
||||||
Ok(Json(GetSiteResponse {
|
|
||||||
site_view,
|
|
||||||
admins,
|
|
||||||
version: version::VERSION.to_string(),
|
|
||||||
my_user,
|
|
||||||
all_languages,
|
|
||||||
discussion_languages,
|
|
||||||
taglines,
|
|
||||||
custom_emojis,
|
|
||||||
}))
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit aa9438c4930deb23ae0dc54a061ed4b0b3824582
|
Subproject commit b3343aef72e5a7e5df34cf328b910ed798027270
|
Loading…
Reference in a new issue