f - Inline PostgreSQL internal runtime spawns

Keep PostgreSQL persistence on the isolated runtime without hiding each spawned task behind an extra helper, making the temporary runtime bridge easier to follow at each call site.

Co-Authored-By: HAL 9000

Author: tnull

src/io/postgres_store/mod.rs

@@ -42,18 +42,6 @@ const PAGE_SIZE: usize = 50;
 // Keep this small while still allowing progress if one runtime worker blocks on sync store access.
 const INTERNAL_RUNTIME_WORKERS: usize = 2;
 
-async fn run_on_internal_runtime<T>(
-	runtime: Arc<StoreRuntime>, future: impl Future<Output = io::Result<T>> + Send + 'static,
-) -> io::Result<T>
-where
-	T: Send + 'static,
-{
-	let task = runtime.spawn(future);
-	task.await.map_err(|e| {
-		io::Error::new(io::ErrorKind::Other, format!("PostgreSQL runtime task failed: {}", e))
-	})?
-}
-
 fn sql_identifier(identifier: &str) -> io::Result<String> {
 	if identifier.is_empty() || identifier.contains('\0') {
 		return Err(io::Error::new(
@@ -164,10 +152,12 @@ impl PostgresStore {
 			"PostgreSQL",
 		)?);
 		let tls = Self::build_tls_connector(certificate_pem)?;
-		let inner = run_on_internal_runtime(Arc::clone(&internal_runtime), async move {
+		let task = internal_runtime.spawn(async move {
 			PostgresStoreInner::new(connection_string, db_name, kv_table_name, tls, logger).await
-		})
-		.await?;
+		});
+		let inner = task.await.map_err(|e| {
+			io::Error::new(io::ErrorKind::Other, format!("PostgreSQL runtime task failed: {}", e))
+		})??;
 		let inner = Arc::new(inner);
 		let next_write_version = AtomicU64::new(1);
 		Ok(Self { inner, next_write_version, internal_runtime: Some(internal_runtime) })
@@ -239,10 +229,15 @@ impl KVStore for PostgresStore {
 		let inner = Arc::clone(&self.inner);
 		let runtime = self.internal_runtime();
 		async move {
-			run_on_internal_runtime(runtime, async move {
+			let task = runtime.spawn(async move {
 				inner.read_internal(&primary_namespace, &secondary_namespace, &key).await
-			})
-			.await
+			});
+			task.await.map_err(|e| {
+				io::Error::new(
+					io::ErrorKind::Other,
+					format!("PostgreSQL runtime task failed: {}", e),
+				)
+			})?
 		}
 	}
 
@@ -257,7 +252,7 @@ impl KVStore for PostgresStore {
 		let inner = Arc::clone(&self.inner);
 		let runtime = self.internal_runtime();
 		async move {
-			run_on_internal_runtime(runtime, async move {
+			let task = runtime.spawn(async move {
 				inner
 					.write_internal(
 						inner_lock_ref,
@@ -269,8 +264,13 @@ impl KVStore for PostgresStore {
 						buf,
 					)
 					.await
-			})
-			.await
+			});
+			task.await.map_err(|e| {
+				io::Error::new(
+					io::ErrorKind::Other,
+					format!("PostgreSQL runtime task failed: {}", e),
+				)
+			})?
 		}
 	}
 
@@ -285,7 +285,7 @@ impl KVStore for PostgresStore {
 		let inner = Arc::clone(&self.inner);
 		let runtime = self.internal_runtime();
 		async move {
-			run_on_internal_runtime(runtime, async move {
+			let task = runtime.spawn(async move {
 				inner
 					.remove_internal(
 						inner_lock_ref,
@@ -296,8 +296,13 @@ impl KVStore for PostgresStore {
 						&key,
 					)
 					.await
-			})
-			.await
+			});
+			task.await.map_err(|e| {
+				io::Error::new(
+					io::ErrorKind::Other,
+					format!("PostgreSQL runtime task failed: {}", e),
+				)
+			})?
 		}
 	}
 
@@ -309,10 +314,15 @@ impl KVStore for PostgresStore {
 		let inner = Arc::clone(&self.inner);
 		let runtime = self.internal_runtime();
 		async move {
-			run_on_internal_runtime(runtime, async move {
+			let task = runtime.spawn(async move {
 				inner.list_internal(&primary_namespace, &secondary_namespace).await
-			})
-			.await
+			});
+			task.await.map_err(|e| {
+				io::Error::new(
+					io::ErrorKind::Other,
+					format!("PostgreSQL runtime task failed: {}", e),
+				)
+			})?
 		}
 	}
 }
@@ -326,12 +336,17 @@ impl PaginatedKVStore for PostgresStore {
 		let inner = Arc::clone(&self.inner);
 		let runtime = self.internal_runtime();
 		async move {
-			run_on_internal_runtime(runtime, async move {
+			let task = runtime.spawn(async move {
 				inner
 					.list_paginated_internal(&primary_namespace, &secondary_namespace, page_token)
 					.await
-			})
-			.await
+			});
+			task.await.map_err(|e| {
+				io::Error::new(
+					io::ErrorKind::Other,
+					format!("PostgreSQL runtime task failed: {}", e),
+				)
+			})?
 		}
 	}
 }