app/Desktop/Main/Pages/DebugPageModel.cs

@@ -53,12 +53,9 @@ namespace DHT.Desktop.Main.Pages {
 			await progressDialog.ShowDialog(window);
 		}
 		
-		private const int BatchSize = 500;
+		private const int BatchSize = 100;
 		
 		private async Task GenerateRandomData(int channelCount, int userCount, int messageCount, IProgressCallback callback) {
-			int batchCount = (messageCount + BatchSize - 1) / BatchSize;
-			await callback.Update("Adding messages in batches of " + BatchSize, 0, batchCount);
-
 			var rand = new Random();
 			var server = new DHT.Server.Data.Server {
 				Id = RandomId(rand),
@@ -90,6 +87,9 @@ namespace DHT.Desktop.Main.Pages {
 				db.AddChannel(channel);
 			}
 			
+			int batchCount = (messageCount + BatchSize - 1) / BatchSize;
+			await callback.Update("Adding messages in batches of 100", 0, batchCount);
+
 			var now = DateTimeOffset.Now;
 			int batchIndex = 0;
 			
@@ -119,8 +119,8 @@ namespace DHT.Desktop.Main.Pages {
 				
 				db.AddMessages(messages);
 				
-				messageCount -= BatchSize;
-				await callback.Update("Adding messages in batches of " + BatchSize, ++batchIndex, batchCount);
+				messageCount -= 100;
+				await callback.Update("Adding messages in batches of 100", ++batchIndex, batchCount);
 			}
 		}
 

app/Server/Database/Sqlite/SqliteDatabaseFile.cs

@@ -36,13 +36,10 @@ namespace DHT.Server.Database.Sqlite {
 
 		private readonly Log log;
 		private readonly SqliteConnectionPool pool;
-		private readonly SqliteMessageStatisticsThread messageStatisticsThread;
 
 		private SqliteDatabaseFile(string path, SqliteConnectionPool pool) {
 			this.log = Log.ForType(typeof(SqliteDatabaseFile), System.IO.Path.GetFileName(path));
 			this.pool = pool;
-			this.messageStatisticsThread = new SqliteMessageStatisticsThread(pool, UpdateMessageStatistics);
-
 			this.Path = path;
 			this.Statistics = new DatabaseStatistics();
 
@@ -54,7 +51,6 @@ namespace DHT.Server.Database.Sqlite {
 		}
 
 		public void Dispose() {
-			messageStatisticsThread.Dispose();
 			pool.Dispose();
 		}
 
@@ -303,7 +299,7 @@ namespace DHT.Server.Database.Sqlite {
 			}
 
 			tx.Commit();
-			messageStatisticsThread.RequestUpdate();
+			UpdateMessageStatistics(conn);
 		}
 
 		public int CountMessages(MessageFilter? filter = null) {

app/Server/Database/Sqlite/SqliteMessageStatisticsThread.cs

@@ -1,54 +0,0 @@
-using System;
-using System.Threading;
-using DHT.Server.Database.Sqlite.Utils;
-
-namespace DHT.Server.Database.Sqlite {
-	sealed class SqliteMessageStatisticsThread : IDisposable {
-		private readonly SqliteConnectionPool pool;
-		private readonly Action<ISqliteConnection> action;
-		
-		private readonly CancellationTokenSource cancellationTokenSource = new();
-		private readonly CancellationToken cancellationToken;
-		
-		private readonly AutoResetEvent requestEvent = new (false);
-
-		public SqliteMessageStatisticsThread(SqliteConnectionPool pool, Action<ISqliteConnection> action) {
-			this.pool = pool;
-			this.action = action;
-			
-			this.cancellationToken = cancellationTokenSource.Token;
-			
-			var thread = new Thread(RunThread) {
-				Name = "DHT message statistics thread",
-				IsBackground = true
-			};
-			thread.Start();
-		}
-
-		public void Dispose() {
-			try {
-				cancellationTokenSource.Cancel();
-			} catch (ObjectDisposedException) {}
-		}
-
-		public void RequestUpdate() {
-			try {
-				requestEvent.Set();
-			} catch (ObjectDisposedException) {}
-		}
-
-		private void RunThread() {
-			try {
-				while (!cancellationToken.IsCancellationRequested) {
-					if (requestEvent.WaitOne(TimeSpan.FromMilliseconds(100))) {
-						using var conn = pool.Take();
-						action(conn);
-					}
-				}
-			} finally {
-				cancellationTokenSource.Dispose();
-				requestEvent.Dispose();
-			}
-		}
-	}
-}

app/Server/Database/Sqlite/Utils/SqliteConnectionPool.cs

@@ -24,14 +24,7 @@ namespace DHT.Server.Database.Sqlite.Utils {
 			for (int i = 0; i < poolSize; i++) {
 				var conn = new SqliteConnection(connectionString);
 				conn.Open();
-				
-				var pooledConn = new PooledConnection(this, conn);
-				
-				using (var cmd = pooledConn.Command("PRAGMA journal_mode=WAL")) {
-					cmd.ExecuteNonQuery();
-				}
-				
-				free.Add(pooledConn);
+				free.Add(new PooledConnection(this, conn));
 			}
 
 			used = new List<PooledConnection>(poolSize);