From 014ee98fb75503329dd2e0c817eba040c6b29cd1 Mon Sep 17 00:00:00 2001
From: Ivan Enderlin <ivan@mnt.io>
Date: Wed, 9 Jul 2025 15:31:01 +0200
Subject: [PATCH] feat(sqlite): `SqliteStoreConfig::pool_size` sets a minimum
 to 2.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This patch updates `SqliteStoreConfig::pool_size` to be at least 2. We
need 2 connections: one for write operations, one for read operations.
This behaviour is coming in the next patches.
---
 crates/matrix-sdk-sqlite/src/lib.rs | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/crates/matrix-sdk-sqlite/src/lib.rs b/crates/matrix-sdk-sqlite/src/lib.rs
index a8ab210d1..7130e1503 100644
--- a/crates/matrix-sdk-sqlite/src/lib.rs
+++ b/crates/matrix-sdk-sqlite/src/lib.rs
@@ -25,6 +25,7 @@ mod event_cache_store;
 mod state_store;
 mod utils;
 use std::{
+    cmp::max,
     fmt,
     path::{Path, PathBuf},
 };
@@ -66,6 +67,12 @@ impl fmt::Debug for SqliteStoreConfig {
     }
 }
 
+/// The minimum size of the connections pool.
+///
+/// We need at least 2 connections: one connection for write operations, and one
+/// connection for read operations.
+const POOL_MINIMUM_SIZE: usize = 2;
+
 impl SqliteStoreConfig {
     /// Create a new [`SqliteStoreConfig`] with a path representing the
     /// directory containing the store database.
@@ -76,7 +83,7 @@ impl SqliteStoreConfig {
         Self {
             path: path.as_ref().to_path_buf(),
             passphrase: None,
-            pool_config: PoolConfig::new(num_cpus::get_physical() * 4),
+            pool_config: PoolConfig::new(max(POOL_MINIMUM_SIZE, num_cpus::get_physical() * 4)),
             runtime_config: RuntimeConfig::default(),
         }
     }
@@ -122,7 +129,7 @@ impl SqliteStoreConfig {
     ///
     /// See [`deadpool_sqlite::PoolConfig::max_size`] to learn more.
     pub fn pool_max_size(mut self, max_size: usize) -> Self {
-        self.pool_config.max_size = max_size;
+        self.pool_config.max_size = max(POOL_MINIMUM_SIZE, max_size);
         self
     }
 
@@ -218,7 +225,7 @@ mod tests {
         path::{Path, PathBuf},
     };
 
-    use super::SqliteStoreConfig;
+    use super::{SqliteStoreConfig, POOL_MINIMUM_SIZE};
 
     #[test]
     fn test_new() {
@@ -263,4 +270,11 @@ mod tests {
 
         assert_eq!(store_config.path, PathBuf::from("bar"));
     }
+
+    #[test]
+    fn test_pool_size_has_a_minimum() {
+        let store_config = SqliteStoreConfig::new(Path::new("foo")).pool_max_size(1);
+
+        assert_eq!(store_config.pool_config.max_size, POOL_MINIMUM_SIZE);
+    }
 }