store: Limit maximum execution time for SQL queries

Author: lutter

store/postgres/src/deployment_store.rs

@@ -54,7 +54,7 @@ use crate::detail::ErrorDetail;
 use crate::dynds::DataSourcesTable;
 use crate::primary::{DeploymentId, Primary};
 use crate::relational::index::{CreateIndex, IndexList, Method};
-use crate::relational::{self, Layout, LayoutCache, SqlName, Table};
+use crate::relational::{self, Layout, LayoutCache, SqlName, Table, STATEMENT_TIMEOUT};
 use crate::relational_queries::{FromEntityData, JSONData};
 use crate::{advisory_lock, catalog, retry};
 use crate::{detail, ConnectionPool};
@@ -297,12 +297,17 @@ impl DeploymentStore {
         query: &str,
     ) -> Result<Vec<SqlQueryObject>, QueryExecutionError> {
         let query = format!("select to_jsonb(sub.*) as data from ({}) as sub", query);
-
         let query = diesel::sql_query(query);
 
-        // Execute the provided SQL query
-        let results = query
-            .load::<JSONData>(conn)
+        let results = conn
+            .transaction(|conn| {
+                if let Some(ref timeout_sql) = *STATEMENT_TIMEOUT {
+                    conn.batch_execute(timeout_sql)?;
+                }
+
+                // Execute the provided SQL query
+                query.load::<JSONData>(conn)
+            })
             .map_err(|e| QueryExecutionError::SqlError(e.to_string()))?;
 
         Ok(results

store/postgres/src/relational.rs

@@ -94,7 +94,7 @@ pub const STRING_PREFIX_SIZE: usize = 256;
 pub const BYTE_ARRAY_PREFIX_SIZE: usize = 64;
 
 lazy_static! {
-    static ref STATEMENT_TIMEOUT: Option<String> = ENV_VARS
+    pub(crate) static ref STATEMENT_TIMEOUT: Option<String> = ENV_VARS
         .graphql
         .sql_statement_timeout
         .map(|duration| format!("set local statement_timeout={}", duration.as_millis()));