Nice

Author: danieljharvey

crates/connectors/ndc-postgres/src/connector.rs

@@ -40,8 +40,8 @@ impl Connector for Postgres {
     /// can be polled but not updated directly.
     fn fetch_metrics(_configuration: &Self::Configuration, state: &Self::State) -> Result<()> {
         match &state.pool {
-            state::Pool::Static { pool, .. } => state.query_metrics.update_pool_metrics(&pool),
-            state::Pool::Dynamic(_) => {}
+            state::Pool::Static { pool, .. } => state.query_metrics.update_pool_metrics(pool),
+            state::Pool::Dynamic(()) => {}
         };
         Ok(())
     }

crates/connectors/ndc-postgres/src/mutation.rs

@@ -99,15 +99,15 @@ async fn execute_mutation(
     state: &state::State,
     plan: sql::execution_plan::ExecutionPlan<sql::execution_plan::Mutations>,
 ) -> Result<JsonResponse<models::MutationResponse>, query_engine_execution::error::Error> {
-    let (pool, database_info) = match &state.pool {
-        state::Pool::Static {
-            pool,
-            database_info,
-        } => (pool, database_info),
-        _ => todo!("Dynamic connect for execute_mutation"),
+    let state::Pool::Static {
+        pool,
+        database_info,
+    } = &state.pool
+    else {
+        todo!("Dynamic connect for execute_mutation");
     };
 
-    query_engine_execution::mutation::execute(&pool, &database_info, &state.query_metrics, plan)
+    query_engine_execution::mutation::execute(pool, database_info, &state.query_metrics, plan)
         .await
         .map(JsonResponse::Serialized)
 }

crates/connectors/ndc-postgres/src/mutation/explain.rs

@@ -5,7 +5,6 @@
 
 use std::collections::BTreeMap;
 
-use query_engine_execution::database_info;
 use tracing::{info_span, Instrument};
 
 use ndc_postgres_configuration as configuration;
@@ -44,17 +43,17 @@ pub async fn explain(
 
         // Execute an explain query.
         let results = async {
-            let (pool, database_info) = match &state.pool {
-                state::Pool::Static {
-                    pool,
-                    database_info,
-                } => (pool, database_info),
-                _ => todo!("Dynamic connect for explain_mutation"),
+            let state::Pool::Static {
+                pool,
+                database_info,
+            } = &state.pool
+            else {
+                todo!("Dynamic connect for explain_mutation");
             };
 
             query_engine_execution::mutation::explain(
-                &pool,
-                &database_info,
+                pool,
+                database_info,
                 &state.query_metrics,
                 plan,
             )

crates/connectors/ndc-postgres/src/query.rs

@@ -80,15 +80,15 @@ async fn execute_query(
     state: &state::State,
     plan: sql::execution_plan::ExecutionPlan<sql::execution_plan::Query>,
 ) -> Result<JsonResponse<models::QueryResponse>, query_engine_execution::error::Error> {
-    let (pool, database_info) = match &state.pool {
-        state::Pool::Static {
-            pool,
-            database_info,
-        } => (pool, database_info),
-        _ => todo!("Dynamic connect for execute_query"),
+    let state::Pool::Static {
+        pool,
+        database_info,
+    } = &state.pool
+    else {
+        todo!("Dynamic connect for execute_query");
     };
 
-    query_engine_execution::query::execute(&pool, &database_info, &state.query_metrics, plan)
+    query_engine_execution::query::execute(pool, database_info, &state.query_metrics, plan)
         .await
         .map(JsonResponse::Serialized)
 }

crates/connectors/ndc-postgres/src/query/explain.rs

@@ -5,7 +5,6 @@
 
 use std::collections::BTreeMap;
 
-use query_engine_execution::database_info;
 use tracing::{info_span, Instrument};
 
 use ndc_postgres_configuration as configuration;
@@ -43,24 +42,19 @@ pub async fn explain(
 
         // Execute an explain query.
         let (query, plan) = async {
-            let (pool, database_info) = match &state.pool {
-                state::Pool::Static {
-                    pool,
-                    database_info,
-                } => (pool, database_info),
-                _ => todo!("Dynamic connect for explain"),
+            let state::Pool::Static {
+                pool,
+                database_info,
+            } = &state.pool
+            else {
+                todo!("Dynamic connect for explain");
             };
-            query_engine_execution::query::explain(
-                &pool,
-                &database_info,
-                &state.query_metrics,
-                plan,
-            )
-            .await
-            .map_err(|err| {
-                record::execution_error(&err, &state.query_metrics);
-                convert::execution_error_to_response(err)
-            })
+            query_engine_execution::query::explain(pool, database_info, &state.query_metrics, plan)
+                .await
+                .map_err(|err| {
+                    record::execution_error(&err, &state.query_metrics);
+                    convert::execution_error_to_response(err)
+                })
         }
         .instrument(info_span!("Explain query"))
         .await?;

crates/connectors/ndc-postgres/src/state.rs

@@ -100,7 +100,7 @@ pub async fn create_state(
 
     // update pool metrics if static pool is available
     if let Pool::Static { ref pool, .. } = pool {
-        query_metrics.set_pool_options_metrics(&pool.options());
+        query_metrics.set_pool_options_metrics(pool.options());
     }
 
     configuration_metrics.set_configuration_version(version_tag);