From 68fec1c8da49d6fe05c41fdabee03c9c01d2d3b4 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 16 Aug 2022 21:58:24 -0400 Subject: [PATCH] leaderboard endpoint now uses connection pool (granted, not great) --- .../stats/calculate_tts_model_leaderboard.rs | 5 +- .../calculate_w2l_template_leaderboard.rs | 5 +- .../endpoints/leaderboard/get_leaderboard.rs | 47 ++++++++++++------- 3 files changed, 36 insertions(+), 21 deletions(-) diff --git a/crates/lib/database_queries/src/queries/tts/stats/calculate_tts_model_leaderboard.rs b/crates/lib/database_queries/src/queries/tts/stats/calculate_tts_model_leaderboard.rs index 0f5b4a5e86..74876af238 100644 --- a/crates/lib/database_queries/src/queries/tts/stats/calculate_tts_model_leaderboard.rs +++ b/crates/lib/database_queries/src/queries/tts/stats/calculate_tts_model_leaderboard.rs @@ -1,7 +1,8 @@ use anyhow::anyhow; use container_common::anyhow_result::AnyhowResult; use log::warn; -use sqlx::MySqlPool; +use sqlx::{MySql, MySqlPool}; +use sqlx::pool::PoolConnection; #[derive(Serialize)] pub struct TtsLeaderboardRecordForList { @@ -23,7 +24,7 @@ struct TtsLeaderboardRecordForListRaw { // NB: This may need to become an offline query if it is expensive. pub async fn calculate_tts_model_leaderboard( - mysql_pool: &MySqlPool + mysql_pool: &mut PoolConnection ) -> AnyhowResult> { // NB: We're not requiring "is_public_listing_approved IS TRUE" for TTS models diff --git a/crates/lib/database_queries/src/queries/w2l/stats/calculate_w2l_template_leaderboard.rs b/crates/lib/database_queries/src/queries/w2l/stats/calculate_w2l_template_leaderboard.rs index 52ed9d5979..4966960274 100644 --- a/crates/lib/database_queries/src/queries/w2l/stats/calculate_w2l_template_leaderboard.rs +++ b/crates/lib/database_queries/src/queries/w2l/stats/calculate_w2l_template_leaderboard.rs @@ -1,7 +1,8 @@ use anyhow::anyhow; use container_common::anyhow_result::AnyhowResult; use log::warn; -use sqlx::MySqlPool; +use sqlx::{MySql, MySqlPool}; +use sqlx::pool::PoolConnection; #[derive(Serialize)] pub struct W2lLeaderboardRecordForList { @@ -23,7 +24,7 @@ struct W2lLeaderboardRecordForListRaw { // NB: This may need to become an offline query if it is expensive. pub async fn calculate_w2l_template_leaderboard( - mysql_pool: &MySqlPool + mysql_pool: &mut PoolConnection ) -> AnyhowResult> { // NB: We're requiring "is_public_listing_approved IS TRUE" for W2L templates! diff --git a/crates/service/storyteller_web/src/http_server/endpoints/leaderboard/get_leaderboard.rs b/crates/service/storyteller_web/src/http_server/endpoints/leaderboard/get_leaderboard.rs index de65564b56..e01c5135f1 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/leaderboard/get_leaderboard.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/leaderboard/get_leaderboard.rs @@ -1,24 +1,18 @@ -use actix_http::Error; -use actix_http::http::header; -use actix_web::HttpResponseBuilder; -use actix_web::cookie::Cookie; +// NB: Incrementally getting rid of build warnings... +#![forbid(unused_imports)] +#![forbid(unused_mut)] +#![forbid(unused_variables)] + use actix_web::error::ResponseError; use actix_web::http::StatusCode; -use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; -use chrono::{DateTime, Utc}; -use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; +use actix_web::{web, HttpResponse, HttpRequest}; use crate::http_server::web_utils::serialize_as_json_error::serialize_as_json_error; use crate::server_state::ServerState; use database_queries::queries::tts::stats::calculate_tts_model_leaderboard::TtsLeaderboardRecordForList; use database_queries::queries::tts::stats::calculate_tts_model_leaderboard::calculate_tts_model_leaderboard; use database_queries::queries::w2l::stats::calculate_w2l_template_leaderboard::W2lLeaderboardRecordForList; use database_queries::queries::w2l::stats::calculate_w2l_template_leaderboard::calculate_w2l_template_leaderboard; -use log::{info, warn, log}; -use regex::Regex; -use sqlx::MySqlPool; -use sqlx::error::DatabaseError; -use sqlx::error::Error::Database; -use sqlx::mysql::MySqlDatabaseError; +use log::warn; use std::fmt; use std::sync::Arc; @@ -71,15 +65,34 @@ impl fmt::Display for LeaderboardErrorResponse { } pub async fn leaderboard_handler( - http_request: HttpRequest, + _http_request: HttpRequest, server_state: web::Data> ) -> Result { + // TODO: There has to be a better way of doing this in parallel. + // Some more intelligent DB connection pool. (What did jOOQ in Java do? Surely not this insanity!) + let mysql_connection_1 = server_state.mysql_pool.acquire(); + let mysql_connection_2 = server_state.mysql_pool.acquire(); + + let mut mysql_connection_1 = mysql_connection_1 + .await + .map_err(|e| { + warn!("Could not acquire DB pool: {:?}", e); + LeaderboardErrorResponse::server_error() + })?; + + let mut mysql_connection_2 = mysql_connection_2 + .await + .map_err(|e| { + warn!("Could not acquire DB pool: {:?}", e); + LeaderboardErrorResponse::server_error() + })?; + let maybe_tts_results = - calculate_tts_model_leaderboard(&server_state.mysql_pool); + calculate_tts_model_leaderboard(&mut mysql_connection_1); let maybe_w2l_results = - calculate_w2l_template_leaderboard(&server_state.mysql_pool); + calculate_w2l_template_leaderboard(&mut mysql_connection_2); let tts_results = match maybe_tts_results.await { Ok(results) => results, @@ -104,7 +117,7 @@ pub async fn leaderboard_handler( }; let body = serde_json::to_string(&response) - .map_err(|e| LeaderboardErrorResponse::server_error())?; + .map_err(|_e| LeaderboardErrorResponse::server_error())?; Ok(HttpResponse::Ok() .content_type("application/json")