core: improve database concurrency (#6541)

* core: improve database concurrency

* tests: prints on timeouts (#6546)

* update simplexmq

* fix test

* update simplexmq

---------

Co-authored-by: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com>

src/Simplex/Chat/Store/Groups.hs

@@ -1596,11 +1596,11 @@ setMemberVectorNewRelations db GroupMember {groupMemberId} relations = do
   v_ <- maybeFirstRow fromOnly $
     DB.query
       db
+      ( "SELECT member_relations_vector FROM group_members WHERE group_member_id = ?"
 #if defined(dbPostgres)
-      "SELECT member_relations_vector FROM group_members WHERE group_member_id = ? FOR UPDATE"
-#else
-      "SELECT member_relations_vector FROM group_members WHERE group_member_id = ?"
+          <> " FOR UPDATE"
 #endif
+      )
       (Only groupMemberId)
   let v' = setNewRelations relations $ fromMaybe B.empty v_
   currentTs <- getCurrentTime
@@ -1638,11 +1638,11 @@ setMemberVectorRelationConnected db GroupMember {groupMemberId} GroupMember {ind
     firstRow fromOnly (SEMemberRelationsVectorNotFound groupMemberId) $
       DB.query
         db
+        ( "SELECT member_relations_vector FROM group_members WHERE group_member_id = ? AND member_relations_vector IS NOT NULL"
 #if defined(dbPostgres)
-        "SELECT member_relations_vector FROM group_members WHERE group_member_id = ? AND member_relations_vector IS NOT NULL FOR UPDATE"
-#else
-        "SELECT member_relations_vector FROM group_members WHERE group_member_id = ? AND member_relations_vector IS NOT NULL"
+          <> " FOR UPDATE"
 #endif
+        )
         (Only groupMemberId)
   let v' = setRelationConnected indexInGroup newStatus v
   currentTs <- liftIO getCurrentTime

src/Simplex/Chat/Store/Messages.hs

@@ -52,7 +52,6 @@ module Simplex.Chat.Store.Messages
     getDirectChatItemLast,
     getAllChatItems,
     getAChatItem,
-    getAChatItemBySharedMsgId,
     updateDirectChatItem,
     updateDirectChatItem',
     addInitialAndNewCIVersions,
@@ -1235,13 +1234,17 @@ getDirectChatItemLast db user@User {userId} contactId = do
     ExceptT . firstRow fromOnly (SEChatItemNotFoundByContactId contactId) $
       DB.query
         db
-        [sql|
-          SELECT chat_item_id
-          FROM chat_items
-          WHERE user_id = ? AND contact_id = ?
-          ORDER BY created_at DESC, chat_item_id DESC
-          LIMIT 1
-        |]
+        ( [sql|
+            SELECT chat_item_id
+            FROM chat_items
+            WHERE user_id = ? AND contact_id = ?
+            ORDER BY created_at DESC, chat_item_id DESC
+            LIMIT 1
+          |]
+#if defined(dbPostgres)
+            <> " FOR UPDATE"
+#endif
+        )
         (userId, contactId)
   getDirectChatItem db user contactId chatItemId
 
@@ -1560,13 +1563,17 @@ getGroupMemberChatItemLast db user@User {userId} groupId groupMemberId = do
     ExceptT . firstRow fromOnly (SEChatItemNotFoundByGroupId groupId) $
       DB.query
         db
-        [sql|
-          SELECT chat_item_id
-          FROM chat_items
-          WHERE user_id = ? AND group_id = ? AND group_member_id = ?
-          ORDER BY item_ts DESC, chat_item_id DESC
-          LIMIT 1
-        |]
+        ( [sql|
+            SELECT chat_item_id
+            FROM chat_items
+            WHERE user_id = ? AND group_id = ? AND group_member_id = ?
+            ORDER BY item_ts DESC, chat_item_id DESC
+            LIMIT 1
+          |]
+#if defined(dbPostgres)
+          <> " FOR UPDATE"
+#endif
+        )
         (userId, groupId, groupMemberId)
   getGroupChatItem db user groupId chatItemId
 
@@ -3243,15 +3250,6 @@ getAChatItem db vr user (ChatRef cType chatId scope) itemId = do
     _ -> throwError $ SEChatItemNotFound itemId
   liftIO $ getACIReactions db aci
 
-getAChatItemBySharedMsgId :: ChatTypeQuotable c => DB.Connection -> User -> ChatDirection c 'MDRcv -> SharedMsgId -> ExceptT StoreError IO AChatItem
-getAChatItemBySharedMsgId db user cd sharedMsgId = case cd of
-  CDDirectRcv ct@Contact {contactId} -> do
-    (CChatItem msgDir ci) <- getDirectChatItemBySharedMsgId db user contactId sharedMsgId
-    pure $ AChatItem SCTDirect msgDir (DirectChat ct) ci
-  CDGroupRcv g scopeInfo GroupMember {groupMemberId} -> do
-    (CChatItem msgDir ci) <- getGroupChatItemBySharedMsgId db user g groupMemberId sharedMsgId
-    pure $ AChatItem SCTGroup msgDir (GroupChat g scopeInfo) ci
-
 getChatItemVersions :: DB.Connection -> ChatItemId -> IO [ChatItemVersion]
 getChatItemVersions db itemId = do
   map toChatItemVersion