Multithread db (#915)

* Open a new database connection for every query * Update open and close functions on ViewDatabase to support many connections * Update CHANGELOG * Set PRAGMAs on every connection * Fix codacy issue * Fix testMessageCount Co-authored-by: Martin Dutra <[email protected]> Co-authored-by: rabble <[email protected]>
planetary-social · Oct 24, 2022 · 1fd21cd · 1fd21cd
1 parent 2f1cc05
commit 1fd21cd
Show file tree

Hide file tree

Showing 11 changed files with 190 additions and 293 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Improved background syncing #833
 - Update to Xcode 14. #839
+- Speed up database using a many connections instead of one. #884
 - Fixed the Share Database button in the debug settings. #918
 - Fixed incorrect aspect ratio of avatar images. #753
 - Fixed an issue that could potentially freeze the UI on startup. #865

diff --git a/...cbaselines/5308168421C46A52005C48ED.xcbaseline/F4FEEB87-46B8-45A9-A507-1C8C8A7C28F6.plist b/...cbaselines/5308168421C46A52005C48ED.xcbaseline/F4FEEB87-46B8-45A9-A507-1C8C8A7C28F6.plist
@@ -19,24 +19,54 @@
 		</dict>
 		<key>ViewDatabasePerformanceTests</key>
 		<dict>
+			<key>testCurrentPostsAlgorithmGivenSmallDb()</key>
+			<dict>
+				<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
+				<dict>
+					<key>baselineAverage</key>
+					<real>0.152286</real>
+					<key>baselineIntegrationDisplayName</key>
+					<string>Sep 27, 2022 at 2:14:48 PM</string>
+				</dict>
+			</dict>
+			<key>testDiscoverAlgorithmGivenSmallDb()</key>
+			<dict>
+				<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
+				<dict>
+					<key>baselineAverage</key>
+					<real>0.137287</real>
+					<key>baselineIntegrationDisplayName</key>
+					<string>Sep 27, 2022 at 2:14:48 PM</string>
+				</dict>
+			</dict>
 			<key>testFeedForIdentity()</key>
 			<dict>
 				<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
 				<dict>
 					<key>baselineAverage</key>
-					<real>0.146236</real>
+					<real>0.010480</real>
 					<key>baselineIntegrationDisplayName</key>
-					<string>Jan 17, 2022 at 2:45:41 PM</string>
+					<string>Sep 27, 2022 at 2:14:48 PM</string>
+				</dict>
+			</dict>
+			<key>testFillMessagesGivenSmallDB()</key>
+			<dict>
+				<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
+				<dict>
+					<key>baselineAverage</key>
+					<real>0.229490</real>
+					<key>baselineIntegrationDisplayName</key>
+					<string>Sep 27, 2022 at 2:14:48 PM</string>
 				</dict>
 			</dict>
 			<key>testGetFollows()</key>
 			<dict>
 				<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
 				<dict>
 					<key>baselineAverage</key>
-					<real>0.125950</real>
+					<real>0.157553</real>
 					<key>baselineIntegrationDisplayName</key>
-					<string>Jan 17, 2022 at 2:45:41 PM</string>
+					<string>Sep 27, 2022 at 2:14:48 PM</string>
 				</dict>
 			</dict>
 			<key>testInsertBig()</key>
@@ -49,14 +79,24 @@
 					<string>Jan 17, 2022 at 2:45:41 PM</string>
 				</dict>
 			</dict>
+			<key>testPostsAndContactsAlgorithmGivenSmallDB()</key>
+			<dict>
+				<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
+				<dict>
+					<key>baselineAverage</key>
+					<real>0.375271</real>
+					<key>baselineIntegrationDisplayName</key>
+					<string>Sep 27, 2022 at 2:14:48 PM</string>
+				</dict>
+			</dict>
 			<key>testSimultanousReadsAndWrites()</key>
 			<dict>
 				<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
 				<dict>
 					<key>baselineAverage</key>
-					<real>2.046612</real>
+					<real>0.908602</real>
 					<key>baselineIntegrationDisplayName</key>
-					<string>Jan 17, 2022 at 2:45:41 PM</string>
+					<string>Sep 27, 2022 at 2:14:48 PM</string>
 				</dict>
 			</dict>
 		</dict>

diff --git a/Source/GoBot/FeedStrategy/NoHopFeedAlgorithm.swift b/Source/GoBot/FeedStrategy/NoHopFeedAlgorithm.swift
@@ -243,7 +243,7 @@ class NoHopFeedAlgorithm: NSObject, FeedStrategy {
     }
 
     func fetchMessages(database: ViewDatabase, userId: Int64, limit: Int, offset: Int?) throws -> [Message] {
-        guard let connection = database.getOpenDB() else {
+        guard let connection = try? database.checkoutConnection() else {
             Log.error("db is closed")
             return []
         }

diff --git a/Source/GoBot/FeedStrategy/OneHopFeedAlgorithm.swift b/Source/GoBot/FeedStrategy/OneHopFeedAlgorithm.swift
@@ -304,7 +304,7 @@ class OneHopFeedAlgorithm: NSObject, FeedStrategy {
     }
 
     func fetchMessages(database: ViewDatabase, userId: Int64, limit: Int, offset: Int?) throws -> [Message] {
-        guard let connection = database.getOpenDB() else {
+        guard let connection = try? database.checkoutConnection() else {
             Log.error("db is closed")
             return []
         }

diff --git a/Source/GoBot/FeedStrategy/PostsAlgorithm.swift b/Source/GoBot/FeedStrategy/PostsAlgorithm.swift
@@ -71,7 +71,7 @@ class PostsAlgorithm: NSObject, FeedStrategy {
     }
 
     func fetchMessages(database: ViewDatabase, userId: Int64, limit: Int, offset: Int?) throws -> [Message] {
-        guard let connection = database.getOpenDB() else {
+        guard let connection = try? database.checkoutConnection() else {
             Log.error("db is closed")
             return []
         }
@@ -219,7 +219,7 @@ class PostsAlgorithm: NSObject, FeedStrategy {
     }
 
     private func mapQueryToMessage(query: Table, database: ViewDatabase) throws -> [Message] {
-        guard let connection = database.getOpenDB() else {
+        guard let connection = try? database.checkoutConnection() else {
             Log.error("db is closed")
             return []
         }

diff --git a/Source/GoBot/FeedStrategy/PostsAndContactsAlgorithm.swift b/Source/GoBot/FeedStrategy/PostsAndContactsAlgorithm.swift
@@ -259,7 +259,7 @@ class PostsAndContactsAlgorithm: NSObject, FeedStrategy {
     }
 
     func fetchMessages(database: ViewDatabase, userId: Int64, limit: Int, offset: Int?) throws -> [Message] {
-        guard let connection = database.getOpenDB() else {
+        guard let connection = try? database.checkoutConnection() else {
             Log.error("db is closed")
             return []
         }

diff --git a/Source/GoBot/FeedStrategy/RandomAlgorithm.swift b/Source/GoBot/FeedStrategy/RandomAlgorithm.swift
@@ -320,7 +320,7 @@ class RandomAlgorithm: NSObject, FeedStrategy {
         offset: Int?,
         onlyUnread: Bool
     ) throws -> [Message] {
-        guard let connection = database.getOpenDB() else {
+        guard let connection = try? database.checkoutConnection() else {
             Log.error("db is closed")
             return []
         }

diff --git a/Source/GoBot/FeedStrategy/RecentlyActivePostsAndContactsAlgorithm.swift b/Source/GoBot/FeedStrategy/RecentlyActivePostsAndContactsAlgorithm.swift
@@ -200,7 +200,7 @@ class RecentlyActivePostsAndContactsAlgorithm: NSObject, FeedStrategy {
     }
 
     func fetchMessages(database: ViewDatabase, userId: Int64, limit: Int, offset: Int?) throws -> [Message] {
-        guard let connection = database.getOpenDB() else {
+        guard let connection = try? database.checkoutConnection() else {
             Log.error("db is closed")
             return []
         }

diff --git a/Source/GoBot/GoBotViewController.swift b/Source/GoBot/GoBotViewController.swift
@@ -252,9 +252,12 @@ extension GoBotViewController {
                 if GoBot.shared.bot.isRunning {
                     _ = GoBot.shared.bot.logout()
                 }
-                let dbPath = GoBot.shared.database.currentPath
-                GoBot.shared.database.close()
-                try FileManager.default.removeItem(atPath: dbPath)
+                if let dbPath = GoBot.shared.database.currentPath {
+                    GoBot.shared.database.close()
+                    try FileManager.default.removeItem(atPath: dbPath)
+                } else {
+                    throw ViewDatabaseError.notOpen
+                }
             } catch {
                 Log.unexpected(.apiError, "purge error")
                 Log.optional(error)